summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/AudioMixer.h
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2013-02-14 00:02:36 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-02-14 00:02:36 +0000
commit51eb3965caa8ba135bcdd8ffb7a2024a042ecdc0 (patch)
tree0444520a23aa61553f9cf8bb67ee0f8127096b6a /services/audioflinger/AudioMixer.h
parent0ddd56316262ac74a95e9edb595697c163136d6d (diff)
downloadframeworks_av-51eb3965caa8ba135bcdd8ffb7a2024a042ecdc0.zip
frameworks_av-51eb3965caa8ba135bcdd8ffb7a2024a042ecdc0.tar.gz
frameworks_av-51eb3965caa8ba135bcdd8ffb7a2024a042ecdc0.tar.bz2
Revert "Temporary additional logging to investigate bug"
This reverts commit 0ddd56316262ac74a95e9edb595697c163136d6d Change-Id: I180a928af6f5a38d15a5efe44cd1fe927b5d961c
Diffstat (limited to 'services/audioflinger/AudioMixer.h')
-rw-r--r--services/audioflinger/AudioMixer.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/services/audioflinger/AudioMixer.h b/services/audioflinger/AudioMixer.h
index f757351..fd21fda 100644
--- a/services/audioflinger/AudioMixer.h
+++ b/services/audioflinger/AudioMixer.h
@@ -76,7 +76,6 @@ public:
MAIN_BUFFER = 0x4002,
AUX_BUFFER = 0x4003,
DOWNMIX_TYPE = 0X4004,
- FAST_INDEX = 0x4005, // for debugging only
// for target RESAMPLE
SAMPLE_RATE = 0x4100, // Configure sample rate conversion on this track name;
// parameter 'value' is the new sample rate in Hz.
@@ -201,8 +200,7 @@ private:
int32_t sessionId;
- int32_t fastIndex;
- int32_t padding[1];
+ int32_t padding[2];
// 16-byte boundary