commit dc1f03adb12d4dd19b3992d6333dac7391fdfc48
author Eric Laurent <elaurent@google.com> Tue Jul 07 09:36:06 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Tue Jul 07 09:36:06 2009 -0700
tree 10d76655060b42f20b5be1e6d2c37c587e72a230
parent f2d3b17ea91bbabc3b72be2367a7343b358a4657
parent 2a3dc2e2f753ea6574b30e1dc2ae1b1c84ba4c5a

am 2da0c930: Fix issue 1743700: AudioTrack: setPlaybackRate can not set the playback rate to twice of the ouputSR

Merge commit '2da0c93058920e7f0cc97038ea1be67096f78d90'

* commit '2da0c93058920e7f0cc97038ea1be67096f78d90':
  Fix issue 1743700: AudioTrack: setPlaybackRate can not set the playback rate to twice of the ouputSR

quake/src/WinQuake/snd_android.cpp

diff --git a/quake/src/WinQuake/snd_android.cpp b/quake/src/WinQuake/snd_android.cpp
index f8973b4..232fbf1 100644
--- a/quake/src/WinQuake/snd_android.cpp
+++ b/quake/src/WinQuake/snd_android.cpp
@@ -254,7 +254,7 @@
   if ( result == NO_ERROR ) {
     LOGI("AudioTrack latency = %u ms\n", gAudioTrack.latency());
     LOGI("AudioTrack format = %u bits\n", gAudioTrack.format() == AudioSystem::PCM_16_BIT ? 16 : 8);
-    LOGI("AudioTrack sample rate = %u Hz\n", gAudioTrack.sampleRate());
+    LOGI("AudioTrack sample rate = %u Hz\n", gAudioTrack.getSampleRate());
     LOGI("AudioTrack frame count = %d\n", int(gAudioTrack.frameCount()));
     LOGI("AudioTrack channel count = %d\n", gAudioTrack.channelCount());
 
@@ -265,7 +265,7 @@
 
     shm->splitbuffer = false;	// Not used.
     shm->samplebits = gAudioTrack.format() == AudioSystem::PCM_16_BIT ? 16 : 8;
-    shm->speed = gAudioTrack.sampleRate();
+    shm->speed = gAudioTrack.getSampleRate();
     shm->channels = gAudioTrack.channelCount();
     shm->samples = TOTAL_BUFFER_SIZE / BYTES_PER_SAMPLE;
     shm->samplepos = 0; // Not used.