diff options
| author | flacs <tilkax@gmail.com> | 2015-09-27 03:18:03 +0200 |
|---|---|---|
| committer | flacs <tilkax@gmail.com> | 2015-09-27 03:18:03 +0200 |
| commit | 8ea9b07b59c8b45b6cbe1c559a228f5675dea71c (patch) | |
| tree | f14853056f7fd3edef2640eb9fc5b390ab4a6358 /Source/Core/AudioCommon/Mixer.cpp | |
| parent | a91810ba3bb583a14a3e278527f2b801ceb29367 (diff) | |
| parent | cc036ca86cdaf709e01221975da734cb64d54a94 (diff) | |
Merge pull request #3093 from lioncash/header_shuffle
Common: Trim Common.h
Diffstat (limited to 'Source/Core/AudioCommon/Mixer.cpp')
| -rw-r--r-- | Source/Core/AudioCommon/Mixer.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Source/Core/AudioCommon/Mixer.cpp b/Source/Core/AudioCommon/Mixer.cpp index 1bebe88595..56370ed350 100644 --- a/Source/Core/AudioCommon/Mixer.cpp +++ b/Source/Core/AudioCommon/Mixer.cpp @@ -18,6 +18,18 @@ #include <tmmintrin.h> #endif +CMixer::CMixer(unsigned int BackendSampleRate) + : m_dma_mixer(this, 32000) + , m_streaming_mixer(this, 48000) + , m_wiimote_speaker_mixer(this, 3000) + , m_sampleRate(BackendSampleRate) + , m_log_dtk_audio(false) + , m_log_dsp_audio(false) + , m_speed(0) +{ + INFO_LOG(AUDIO_INTERFACE, "Mixer is initialized"); +} + // Executed from sound stream thread unsigned int CMixer::MixerFifo::Mix(short* samples, unsigned int numSamples, bool consider_framelimit) { |