summaryrefslogtreecommitdiff
path: root/Source/Core/AudioCommon/AudioCommon.cpp
diff options
context:
space:
mode:
authormagumagu <magumagu9@gmail.com>2014-03-27 16:00:14 -0700
committermagumagu <magumagu9@gmail.com>2014-03-29 11:19:30 -0700
commit102ea55f20c0795e72c03efdca5ada47af828d19 (patch)
tree7fa29d736fd9ee916de91b3c0719713a77693437 /Source/Core/AudioCommon/AudioCommon.cpp
parentaac42066645b44021ab12cb16991b63516b682f6 (diff)
Move mixer construction to AudioCommon.cpp.
Diffstat (limited to 'Source/Core/AudioCommon/AudioCommon.cpp')
-rw-r--r--Source/Core/AudioCommon/AudioCommon.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/Core/AudioCommon/AudioCommon.cpp b/Source/Core/AudioCommon/AudioCommon.cpp
index 874ef461b5..70ee8333c6 100644
--- a/Source/Core/AudioCommon/AudioCommon.cpp
+++ b/Source/Core/AudioCommon/AudioCommon.cpp
@@ -26,8 +26,13 @@ SoundStream *soundStream = nullptr;
namespace AudioCommon
{
- SoundStream *InitSoundStream(CMixer *mixer, void *hWnd)
+ SoundStream *InitSoundStream(void *hWnd)
{
+ unsigned int AISampleRate, DACSampleRate;
+ AudioInterface::Callback_GetSampleRate(AISampleRate, DACSampleRate);
+ delete soundStream;
+ CMixer *mixer = new CMixer(AISampleRate, DACSampleRate, 48000);
+
// TODO: possible memleak with mixer
std::string backend = SConfig::GetInstance().sBackend;