diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-20 23:51:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-20 23:51:29 +0000 |
| commit | 8eeda89ae361ccd048d7bba0fd11291e05577e2a (patch) | |
| tree | d0d3caa349992dcf13355e512ba4e1da28d63f66 /services/audioflinger/AudioMixer.h | |
| parent | fb4dac55d0d3943e09680e779ba77310eedf011b (diff) | |
| parent | d0e12a161471823d1ab269cb608be3f3b0a71ed1 (diff) | |
| download | frameworks_av-8eeda89ae361ccd048d7bba0fd11291e05577e2a.zip frameworks_av-8eeda89ae361ccd048d7bba0fd11291e05577e2a.tar.gz frameworks_av-8eeda89ae361ccd048d7bba0fd11291e05577e2a.tar.bz2 | |
am d0e12a16: am 902dc42d: am 07715ac3: Merge "C++11 compatibility."
* commit 'd0e12a161471823d1ab269cb608be3f3b0a71ed1':
C++11 compatibility.
Diffstat (limited to 'services/audioflinger/AudioMixer.h')
| -rw-r--r-- | services/audioflinger/AudioMixer.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/services/audioflinger/AudioMixer.h b/services/audioflinger/AudioMixer.h index 88e94c5..c2ff985 100644 --- a/services/audioflinger/AudioMixer.h +++ b/services/audioflinger/AudioMixer.h @@ -21,15 +21,15 @@ #include <stdint.h> #include <sys/types.h> +#include <hardware/audio_effect.h> +#include <media/AudioBufferProvider.h> +#include <media/nbaio/NBLog.h> +#include <system/audio.h> +#include <utils/Compat.h> #include <utils/threads.h> -#include <media/AudioBufferProvider.h> #include "AudioResampler.h" -#include <hardware/audio_effect.h> -#include <system/audio.h> -#include <media/nbaio/NBLog.h> - // FIXME This is actually unity gain, which might not be max in future, expressed in U.12 #define MAX_GAIN_INT AudioMixer::UNITY_GAIN_INT @@ -58,7 +58,7 @@ public: static const uint32_t MAX_NUM_CHANNELS_TO_DOWNMIX = AUDIO_CHANNEL_COUNT_MAX; static const uint16_t UNITY_GAIN_INT = 0x1000; - static const float UNITY_GAIN_FLOAT = 1.0f; + static const CONSTEXPR float UNITY_GAIN_FLOAT = 1.0f; enum { // names |