summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/AudioMixer.h
diff options
context:
space:
mode:
authorAndy Hung <hunga@google.com>2014-05-30 10:35:47 -0700
committerAndy Hung <hunga@google.com>2014-05-30 16:44:32 -0700
commit97ae82408469286426d8dc57a361350f74e24a8b (patch)
tree09d2ac62b57d06d0d100ce5bc93fb8a05a27398d /services/audioflinger/AudioMixer.h
parent5866a3b9689035580c31f1a02037b8176d7508a7 (diff)
downloadframeworks_av-97ae82408469286426d8dc57a361350f74e24a8b.zip
frameworks_av-97ae82408469286426d8dc57a361350f74e24a8b.tar.gz
frameworks_av-97ae82408469286426d8dc57a361350f74e24a8b.tar.bz2
Rename UNITY_GAIN to UNITY_GAIN_INT in AudioMixer
Change-Id: Ic040311305026f0b4c4280a5b3bef7a447ac1da3
Diffstat (limited to 'services/audioflinger/AudioMixer.h')
-rw-r--r--services/audioflinger/AudioMixer.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/audioflinger/AudioMixer.h b/services/audioflinger/AudioMixer.h
index 573ba96..43fe664 100644
--- a/services/audioflinger/AudioMixer.h
+++ b/services/audioflinger/AudioMixer.h
@@ -31,7 +31,7 @@
#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
+#define MAX_GAIN_INT AudioMixer::UNITY_GAIN_INT
namespace android {
@@ -58,7 +58,7 @@ public:
// maximum number of channels supported for the content
static const uint32_t MAX_NUM_CHANNELS_TO_DOWNMIX = 8;
- static const uint16_t UNITY_GAIN = 0x1000;
+ static const uint16_t UNITY_GAIN_INT = 0x1000;
enum { // names