diff options
Diffstat (limited to 'media/jni/soundpool/SoundPool.cpp')
| -rw-r--r-- | media/jni/soundpool/SoundPool.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/jni/soundpool/SoundPool.cpp b/media/jni/soundpool/SoundPool.cpp index 14a5309..0d51def 100644 --- a/media/jni/soundpool/SoundPool.cpp +++ b/media/jni/soundpool/SoundPool.cpp @@ -39,7 +39,7 @@ uint32_t kMaxSampleRate = 48000; uint32_t kDefaultSampleRate = 44100; uint32_t kDefaultFrameCount = 1200; -SoundPool::SoundPool(int maxChannels, int streamType, int srcQuality) +SoundPool::SoundPool(int maxChannels, audio_stream_type_t streamType, int srcQuality) { ALOGV("SoundPool constructor: maxChannels=%d, streamType=%d, srcQuality=%d", maxChannels, streamType, srcQuality); @@ -496,7 +496,7 @@ status_t Sample::doLoad() { uint32_t sampleRate; int numChannels; - int format; + audio_format_t format; sp<IMemory> p; ALOGV("Start decode"); if (mUrl) { @@ -570,7 +570,7 @@ void SoundChannel::play(const sp<Sample>& sample, int nextChannelID, float leftV // initialize track int afFrameCount; int afSampleRate; - int streamType = mSoundPool->streamType(); + audio_stream_type_t streamType = mSoundPool->streamType(); if (AudioSystem::getOutputFrameCount(&afFrameCount, streamType) != NO_ERROR) { afFrameCount = kDefaultFrameCount; } |