commit 24fc2fb1c541e954b83fd31ea9f786a5e9b45501
author Dima Zavin <dima@android.com> Tue Apr 19 22:30:36 2011 -0700
committer Dima Zavin <dima@android.com> Wed Apr 27 13:10:10 2011 -0700
tree e85b3ff86b73d56e16ab640919d251c046371c65
parent 4dc22e77cfd2a1c3671e5646ee87c5e4c15596a0

audio/media: convert to using the audio HAL and new audio defs

Change-Id: Ibc637918637329e4f2b62f4ac7781102fbc269f5
Signed-off-by: Dima Zavin <dima@android.com>

media/jni/soundpool/SoundPool.cpp

diff --git a/media/jni/soundpool/SoundPool.cpp b/media/jni/soundpool/SoundPool.cpp
index 1e2d6ce..bfbf04a 100644
--- a/media/jni/soundpool/SoundPool.cpp
+++ b/media/jni/soundpool/SoundPool.cpp
@@ -27,6 +27,8 @@
 #include <media/AudioTrack.h>
 #include <media/mediaplayer.h>
 
+#include <hardware/audio.h>
+
 #include "SoundPool.h"
 #include "SoundPoolThread.h"
 
@@ -584,7 +586,7 @@
 
         if (loop) {
             frameCount = sample->size()/numChannels/
-                ((sample->format() == AudioSystem::PCM_16_BIT) ? sizeof(int16_t) : sizeof(uint8_t));
+                ((sample->format() == AUDIO_FORMAT_PCM_16_BIT) ? sizeof(int16_t) : sizeof(uint8_t));
         }
 
 #ifndef USE_SHARED_MEM_BUFFER
@@ -602,7 +604,7 @@
         unsigned long toggle = mToggle ^ 1;
         void *userData = (void *)((unsigned long)this | toggle);
         uint32_t channels = (numChannels == 2) ?
-                AudioSystem::CHANNEL_OUT_STEREO : AudioSystem::CHANNEL_OUT_MONO;
+                AUDIO_CHANNEL_OUT_STEREO : AUDIO_CHANNEL_OUT_MONO;
 
         // do not create a new audio track if current track is compatible with sample parameters
 #ifdef USE_SHARED_MEM_BUFFER
@@ -865,7 +867,7 @@
     Mutex::Autolock lock(&mLock);
     if (mAudioTrack != 0 && mSample.get() != 0) {
         uint32_t loopEnd = mSample->size()/mNumChannels/
-            ((mSample->format() == AudioSystem::PCM_16_BIT) ? sizeof(int16_t) : sizeof(uint8_t));
+            ((mSample->format() == AUDIO_FORMAT_PCM_16_BIT) ? sizeof(int16_t) : sizeof(uint8_t));
         mAudioTrack->setLoop(0, loopEnd, loop);
         mLoop = loop;
     }