diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-20 23:47:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-20 23:47:28 +0000 |
| commit | d0e12a161471823d1ab269cb608be3f3b0a71ed1 (patch) | |
| tree | f9a2f2ea19f528495278c1b651db5d75c8306869 /include/media | |
| parent | 75cfc881e25a9d7647701526484b5885dc43c574 (diff) | |
| parent | 902dc42d79b075395d484ce1c71f215b199aaa2a (diff) | |
| download | frameworks_av-d0e12a161471823d1ab269cb608be3f3b0a71ed1.zip frameworks_av-d0e12a161471823d1ab269cb608be3f3b0a71ed1.tar.gz frameworks_av-d0e12a161471823d1ab269cb608be3f3b0a71ed1.tar.bz2 | |
am 902dc42d: am 07715ac3: Merge "C++11 compatibility."
* commit '902dc42d79b075395d484ce1c71f215b199aaa2a':
C++11 compatibility.
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/ToneGenerator.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/media/ToneGenerator.h b/include/media/ToneGenerator.h index 98c4332..8406ed6 100644 --- a/include/media/ToneGenerator.h +++ b/include/media/ToneGenerator.h @@ -17,11 +17,12 @@ #ifndef ANDROID_TONEGENERATOR_H_ #define ANDROID_TONEGENERATOR_H_ -#include <utils/RefBase.h> -#include <utils/KeyedVector.h> -#include <utils/threads.h> #include <media/AudioSystem.h> #include <media/AudioTrack.h> +#include <utils/Compat.h> +#include <utils/KeyedVector.h> +#include <utils/RefBase.h> +#include <utils/threads.h> namespace android { @@ -207,7 +208,7 @@ private: static const unsigned int TONEGEN_MAX_WAVES = 3; // Maximun number of sine waves in a tone segment static const unsigned int TONEGEN_MAX_SEGMENTS = 12; // Maximun number of segments in a tone descriptor static const unsigned int TONEGEN_INF = 0xFFFFFFFF; // Represents infinite time duration - static const float TONEGEN_GAIN = 0.9; // Default gain passed to WaveGenerator(). + static const CONSTEXPR float TONEGEN_GAIN = 0.9; // Default gain passed to WaveGenerator(). // ToneDescriptor class contains all parameters needed to generate a tone: // - The array waveFreq[]: |