diff options
| author | Matthew Parlane <parlane@gmail.com> | 2015-05-24 19:54:21 +1000 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2015-05-24 19:54:21 +1000 |
| commit | 5213d85118ea11f447f17528e523e2860a602c45 (patch) | |
| tree | a5b86f7b0312d1bc9306a6299503df75c91de0fa /Source/Core/AudioCommon/XAudio2Stream.cpp | |
| parent | a6e5fd1e27385bb68844584927d45ec32b99eb55 (diff) | |
| parent | 4695233c985143124000c45a50974bddf690c1d0 (diff) | |
Merge pull request #2445 from lioncash/mixer
AudioCommon: Construct the mixer inside the SoundStream base class.
Diffstat (limited to 'Source/Core/AudioCommon/XAudio2Stream.cpp')
| -rw-r--r-- | Source/Core/AudioCommon/XAudio2Stream.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/Core/AudioCommon/XAudio2Stream.cpp b/Source/Core/AudioCommon/XAudio2Stream.cpp index d0446cb4bb..f0fec703b7 100644 --- a/Source/Core/AudioCommon/XAudio2Stream.cpp +++ b/Source/Core/AudioCommon/XAudio2Stream.cpp @@ -155,9 +155,8 @@ bool XAudio2::InitLibrary() return true; } -XAudio2::XAudio2(CMixer *mixer) - : SoundStream(mixer) - , m_mastering_voice(nullptr) +XAudio2::XAudio2() + : m_mastering_voice(nullptr) , m_volume(1.0f) , m_cleanup_com(SUCCEEDED(CoInitializeEx(nullptr, COINIT_MULTITHREADED))) { @@ -197,7 +196,7 @@ bool XAudio2::Start() m_mastering_voice->SetVolume(m_volume); m_voice_context = std::unique_ptr<StreamingVoiceContext> - (new StreamingVoiceContext(m_xaudio2.get(), m_mixer, m_sound_sync_event)); + (new StreamingVoiceContext(m_xaudio2.get(), m_mixer.get(), m_sound_sync_event)); return true; } |