commit 788207057ed4b8df4719ed8089f376ef52de9ca1
author Andy Hung <hunga@google.com> Fri Feb 28 16:23:02 2014 -0800
committer Andy Hung <hunga@google.com> Sat Mar 01 04:20:18 2014 +0000
tree 63659b6151de243ea608add08c3f5d2963c1bd3e
parent 7ed1873acbf43280c5afe51833c3d628fe34e258

Rename mSinkFormat to mMixerFormat for AudioMixer::track_t

AudioMixer::SINK_FORMAT also changes to AudioMixer::MIXER_FORMAT

Change-Id: Ic3f8be77d2c75c082c4fd140bc907e30c304d285
Signed-off-by: Andy Hung <hunga@google.com>

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index b3d1dbe..357ea22 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -3293,7 +3293,7 @@
                 mAudioMixer->setParameter(
                         name,
                         AudioMixer::TRACK,
-                        AudioMixer::SINK_FORMAT, (void *)mMixerBufferFormat);
+                        AudioMixer::MIXER_FORMAT, (void *)mMixerBufferFormat);
                 mAudioMixer->setParameter(
                         name,
                         AudioMixer::TRACK,
@@ -3304,7 +3304,7 @@
                 mAudioMixer->setParameter(
                         name,
                         AudioMixer::TRACK,
-                        AudioMixer::SINK_FORMAT, (void *)AUDIO_FORMAT_PCM_16_BIT);
+                        AudioMixer::MIXER_FORMAT, (void *)AUDIO_FORMAT_PCM_16_BIT);
                 mAudioMixer->setParameter(
                         name,
                         AudioMixer::TRACK,