From b2c9d6d21746cc23ae092f772194346eadef7aa0 Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Mon, 26 Jun 2017 14:41:12 -0700 Subject: Rename CMixer to Mixer --- Source/Core/AudioCommon/XAudio2_7Stream.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/Core/AudioCommon/XAudio2_7Stream.cpp') diff --git a/Source/Core/AudioCommon/XAudio2_7Stream.cpp b/Source/Core/AudioCommon/XAudio2_7Stream.cpp index 1abf6d2096..938ce5109d 100644 --- a/Source/Core/AudioCommon/XAudio2_7Stream.cpp +++ b/Source/Core/AudioCommon/XAudio2_7Stream.cpp @@ -16,7 +16,7 @@ struct StreamingVoiceContext2_7 : public IXAudio2VoiceCallback { private: - CMixer* const m_mixer; + Mixer* const m_mixer; Common::Event& m_sound_sync_event; IXAudio2SourceVoice* m_source_voice; std::unique_ptr xaudio_buffer; @@ -24,7 +24,7 @@ private: void SubmitBuffer(PBYTE buf_data); public: - StreamingVoiceContext2_7(IXAudio2* pXAudio2, CMixer* pMixer, Common::Event& pSyncEvent); + StreamingVoiceContext2_7(IXAudio2* pXAudio2, Mixer* pMixer, Common::Event& pSyncEvent); virtual ~StreamingVoiceContext2_7(); void Stop(); @@ -56,7 +56,7 @@ void StreamingVoiceContext2_7::SubmitBuffer(PBYTE buf_data) m_source_voice->SubmitSourceBuffer(&buf); } -StreamingVoiceContext2_7::StreamingVoiceContext2_7(IXAudio2* pXAudio2, CMixer* pMixer, +StreamingVoiceContext2_7::StreamingVoiceContext2_7(IXAudio2* pXAudio2, Mixer* pMixer, Common::Event& pSyncEvent) : m_mixer(pMixer), m_sound_sync_event(pSyncEvent), xaudio_buffer(new BYTE[NUM_BUFFERS * BUFFER_SIZE_BYTES]()) -- cgit v1.2.3