From 419d6a244b8c059c447ce63c6e406de4b97dfc76 Mon Sep 17 00:00:00 2001 From: hrydgard Date: Fri, 28 Jan 2011 18:39:30 +0000 Subject: DSP plugin merge - the two DSP plugins are now gone and all the code has been merged into Dolphin. This WILL temporarily break the Linux and MacOSX builds but should be easy to fix. Things left to do: * The UI on the new Audio tab for the LLE/HLE choice is ugly * At times the code still look "plugin-y" and needs cleanup * The two plugins should be merged further. DSPHLE should use the emulated memory etc of DSPLLE as much as possible, so that simply saving the DSPLLE state is enough. This would also bring the possibility of savestate compatibility between the two plugins. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6947 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/AudioCommon/Src/AudioCommonConfig.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Source/Core/AudioCommon/Src/AudioCommonConfig.cpp') diff --git a/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp b/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp index 20369858ee..c3e35d05ed 100644 --- a/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp +++ b/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp @@ -16,8 +16,12 @@ // http://code.google.com/p/dolphin-emu/ #include "AudioCommon.h" + AudioCommonConfig ac_Config; +// This shouldn't be a global, at least not here. +SoundStream *soundStream; + // Load from given file void AudioCommonConfig::Load(IniFile &file) { file.Get("Config", "EnableDTKMusic", &m_EnableDTKMusic, true); -- cgit v1.2.3