summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorRyan Houdek <Sonicadvance1@gmail.com>2014-10-19 08:53:19 -0500
committerRyan Houdek <Sonicadvance1@gmail.com>2014-10-19 08:53:19 -0500
commitb769331f50c4884c529af0d582e5116e87ef38ca (patch)
tree93b62902c09608195bd4c598128c3746e9073db7 /Source/Core
parent939fa492c857929d48c2744cc7c570984ea130fb (diff)
parent73512ad38f62e530d73737740ae1d94b52b8b9c4 (diff)
Merge pull request #1325 from Sonicadvance1/Android-OpenSLES-race
Fix a race condition in our OpenSL ES audio backend.
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/AudioCommon/OpenSLESStream.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/Source/Core/AudioCommon/OpenSLESStream.cpp b/Source/Core/AudioCommon/OpenSLESStream.cpp
index afbaa00cdd..e4e11652e4 100644
--- a/Source/Core/AudioCommon/OpenSLESStream.cpp
+++ b/Source/Core/AudioCommon/OpenSLESStream.cpp
@@ -45,7 +45,6 @@ static void bqPlayerCallback(SLAndroidSimpleBufferQueueItf bq, void *context)
// which for this code example would indicate a programming error
_assert_msg_(AUDIO, SL_RESULT_SUCCESS == result, "Couldn't enqueue audio stream.");
-
curBuffer ^= 1; // Switch buffer
// Render to the fresh buffer
g_mixer->Mix(reinterpret_cast<short *>(buffer[curBuffer]), BUFFER_SIZE_IN_SAMPLES);
@@ -101,17 +100,14 @@ bool OpenSLESStream::Start()
result = (*bqPlayerPlay)->SetPlayState(bqPlayerPlay, SL_PLAYSTATE_PLAYING);
assert(SL_RESULT_SUCCESS == result);
- // Render and enqueue a first buffer. (or should we just play the buffer empty?)
- curBuffer = 0;
+ // Render and enqueue a first buffer.
+ curBuffer ^= 1;
+ g_mixer = m_mixer;
- result = (*bqPlayerBufferQueue)->Enqueue(bqPlayerBufferQueue, buffer[curBuffer], sizeof(buffer[curBuffer]));
+ result = (*bqPlayerBufferQueue)->Enqueue(bqPlayerBufferQueue, buffer[0], sizeof(buffer[0]));
if (SL_RESULT_SUCCESS != result)
- {
return false;
- }
- curBuffer ^= 1;
- g_mixer = m_mixer;
return true;
}