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/DebuggerWX/Src/CodeWindowFunctions.cpp | 25 ++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) (limited to 'Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp') diff --git a/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp b/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp index 7c54859bdc..80d326d753 100644 --- a/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp +++ b/Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp @@ -512,6 +512,27 @@ void CCodeWindow::ToggleJitWindow(bool bShow) } } + +void CCodeWindow::ToggleSoundWindow(bool bShow) +{ + GetMenuBar()->FindItem(IDM_SOUNDWINDOW)->Check(bShow); + if (bShow) + { + /* TODO: Resurrect DSP debugger window. + if (!m_JitWindow) + m_JitWindow = new CJitWindow(Parent, IDM_SOUNDWINDOW); + Parent->DoAddPage(m_JitWindow, + iNbAffiliation[IDM_SOUNDWINDOW - IDM_LOGWINDOW], + Parent->bFloatWindow[IDM_SOUNDWINDOW - IDM_LOGWINDOW]); + */ + } + else // Close + { + //Parent->DoRemovePage(m_JitWindow, false); + // m_JitWindow = NULL; + } +} + // Notice: This windows docking will produce several wx debugging messages for plugin // windows when ::GetWindowRect and ::DestroyWindow fails in wxApp::CleanUp() for the // plugin. @@ -525,10 +546,6 @@ void CCodeWindow::ToggleDLLWindow(int Id, bool bShow) switch(Id) { - case IDM_SOUNDWINDOW: - DLLName = SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin.c_str(); - PluginType = PLUGIN_TYPE_DSP; - break; case IDM_VIDEOWINDOW: DLLName = SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoPlugin.c_str(); PluginType = PLUGIN_TYPE_VIDEO; -- cgit v1.2.3