summaryrefslogtreecommitdiff
path: root/Source/Core/AudioCommon/OpenSLESStream.cpp
diff options
context:
space:
mode:
authorMatthew Parlane <parlane@gmail.com>2015-05-24 19:54:21 +1000
committerMatthew Parlane <parlane@gmail.com>2015-05-24 19:54:21 +1000
commit5213d85118ea11f447f17528e523e2860a602c45 (patch)
treea5b86f7b0312d1bc9306a6299503df75c91de0fa /Source/Core/AudioCommon/OpenSLESStream.cpp
parenta6e5fd1e27385bb68844584927d45ec32b99eb55 (diff)
parent4695233c985143124000c45a50974bddf690c1d0 (diff)
Merge pull request #2445 from lioncash/mixer
AudioCommon: Construct the mixer inside the SoundStream base class.
Diffstat (limited to 'Source/Core/AudioCommon/OpenSLESStream.cpp')
-rw-r--r--Source/Core/AudioCommon/OpenSLESStream.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/AudioCommon/OpenSLESStream.cpp b/Source/Core/AudioCommon/OpenSLESStream.cpp
index c53af9aff5..6d5434fb46 100644
--- a/Source/Core/AudioCommon/OpenSLESStream.cpp
+++ b/Source/Core/AudioCommon/OpenSLESStream.cpp
@@ -102,7 +102,7 @@ bool OpenSLESStream::Start()
// Render and enqueue a first buffer.
curBuffer ^= 1;
- g_mixer = m_mixer;
+ g_mixer = m_mixer.get();
result = (*bqPlayerBufferQueue)->Enqueue(bqPlayerBufferQueue, buffer[0], sizeof(buffer[0]));
if (SL_RESULT_SUCCESS != result)