From dd56f82f8249049d648a01ed2a091d7419aabe48 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Thu, 8 Jan 2009 00:00:21 +0000 Subject: [PATCH] remove unused variables from dsp hle and enable njoy test in windows debug build git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1826 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Dolphin.sln | 2 ++ Source/Plugins/Plugin_DSP_HLE/Src/Config.cpp | 3 --- Source/Plugins/Plugin_DSP_HLE/Src/Config.h | 2 -- Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.cpp | 5 ----- Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.h | 4 ---- Source/Plugins/Plugin_DSP_HLE/Src/resource.h | 17 +++-------------- 6 files changed, 5 insertions(+), 28 deletions(-) diff --git a/Source/Dolphin.sln b/Source/Dolphin.sln index 4096dfd526..36921f6f51 100644 --- a/Source/Dolphin.sln +++ b/Source/Dolphin.sln @@ -387,7 +387,9 @@ Global {C6CC7A52-0FDD-433A-B2CF-9C6F187DA807}.Release|x64.ActiveCfg = Release|x64 {C6CC7A52-0FDD-433A-B2CF-9C6F187DA807}.Release|x64.Build.0 = Release|x64 {ADF64291-57ED-4B7A-AB76-37B4A991504B}.Debug|Win32.ActiveCfg = Debug|Win32 + {ADF64291-57ED-4B7A-AB76-37B4A991504B}.Debug|Win32.Build.0 = Debug|Win32 {ADF64291-57ED-4B7A-AB76-37B4A991504B}.Debug|x64.ActiveCfg = Debug|x64 + {ADF64291-57ED-4B7A-AB76-37B4A991504B}.Debug|x64.Build.0 = Debug|x64 {ADF64291-57ED-4B7A-AB76-37B4A991504B}.DebugFast|Win32.ActiveCfg = DebugFast|Win32 {ADF64291-57ED-4B7A-AB76-37B4A991504B}.DebugFast|Win32.Build.0 = DebugFast|Win32 {ADF64291-57ED-4B7A-AB76-37B4A991504B}.DebugFast|x64.ActiveCfg = DebugFast|x64 diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/Config.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/Config.cpp index 5aaf2f3fcf..3a8039fb30 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/Config.cpp +++ b/Source/Plugins/Plugin_DSP_HLE/Src/Config.cpp @@ -30,7 +30,6 @@ void CConfig::LoadDefaults() { m_EnableHLEAudio = true; m_EnableDTKMusic = true; - m_Interpolation = true; } void CConfig::Load() @@ -43,7 +42,6 @@ void CConfig::Load() file.Get("Config", "EnableHLEAudio", &m_EnableHLEAudio, true); // Sound Settings file.Get("Config", "EnableDTKMusic", &m_EnableDTKMusic, true); file.Get("Config", "EnableThrottle", &m_EnableThrottle, true); - file.Get("Config", "Interpolation", &m_Interpolation, true); } void CConfig::Save() @@ -53,7 +51,6 @@ void CConfig::Save() file.Set("Config", "EnableHLEAudio", m_EnableHLEAudio); // Sound Settings file.Set("Config", "EnableDTKMusic", m_EnableDTKMusic); file.Set("Config", "EnableThrottle", m_EnableThrottle); - file.Set("Config", "Interpolation", m_Interpolation); file.Save(FULL_CONFIG_DIR "DSP.ini"); } diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/Config.h b/Source/Plugins/Plugin_DSP_HLE/Src/Config.h index 7877735fd9..4e771b16be 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/Config.h +++ b/Source/Plugins/Plugin_DSP_HLE/Src/Config.h @@ -25,8 +25,6 @@ struct CConfig bool m_EnableHLEAudio; bool m_EnableDTKMusic; bool m_EnableThrottle; - bool m_Interpolation; - int m_SampleRate; CConfig(); diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.cpp index 5e060db838..2044b42b08 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.cpp +++ b/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.cpp @@ -34,15 +34,11 @@ CConfigDlg::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BO m_buttonEnableHLEAudio = GetDlgItem(IDC_ENABLE_HLE_AUDIO); m_buttonEnableDTKMusic = GetDlgItem(IDC_ENABLE_DTK_MUSIC); m_buttonEnableThrottle = GetDlgItem(IDC_ENABLE_THROTTLE); - m_comboSampleRate = GetDlgItem(IDC_SAMPLERATE); // Update checkboxes m_buttonEnableHLEAudio.SetCheck(g_Config.m_EnableHLEAudio ? BST_CHECKED : BST_UNCHECKED); m_buttonEnableDTKMusic.SetCheck(g_Config.m_EnableDTKMusic ? BST_CHECKED : BST_UNCHECKED); m_buttonEnableThrottle.SetCheck(g_Config.m_EnableThrottle ? BST_CHECKED : BST_UNCHECKED); - m_comboSampleRate.AddString("44100"); - m_comboSampleRate.AddString("48000"); - m_comboSampleRate.SetCurSel(g_Config.m_SampleRate == 44100 ? 0 : 1); // Add tooltips CToolTipCtrl ToolTips; @@ -75,7 +71,6 @@ CConfigDlg::OnCloseCmd(WORD /*wNotifyCode*/, WORD wID, HWND /*hWndCtl*/, BOOL& / g_Config.m_EnableHLEAudio = (m_buttonEnableHLEAudio.GetCheck() == BST_CHECKED) ? true : false; g_Config.m_EnableDTKMusic = (m_buttonEnableDTKMusic.GetCheck() == BST_CHECKED) ? true : false; g_Config.m_EnableThrottle = (m_buttonEnableThrottle.GetCheck() == BST_CHECKED) ? true : false; - g_Config.m_SampleRate = (m_comboSampleRate.GetCurSel() == 0 ? 44100 : 48000); g_Config.Save(); } diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.h b/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.h index b40e3ced89..330ba53ef8 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.h +++ b/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.h @@ -35,10 +35,6 @@ class CConfigDlg CButton m_buttonEnableHLEAudio; CButton m_buttonEnableDTKMusic; CButton m_buttonEnableThrottle; - CButton m_buttonDumpSamples; - CButton m_buttonAntiGap; - CEdit m_editDumpSamplePath; - CComboBox m_comboSampleRate; // Handler prototypes (uncomment arguments if needed): // LRESULT MessageHandler(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/resource.h b/Source/Plugins/Plugin_DSP_HLE/Src/resource.h index 86e0b09704..a5315a0ee6 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/resource.h +++ b/Source/Plugins/Plugin_DSP_HLE/Src/resource.h @@ -3,20 +3,9 @@ // Used by resource.rc // #define IDD_SETTINGS 101 -#define IDD_DIALOG2 102 -#define IDC_COMBO1 1001 -#define IDC_SAMPLERATE 1001 -#define IDC_EDIT1 1002 -#define IDC_SAMPLEDUMPPATH 1002 -#define IDC_ENABLE_AUDIO 1003 -#define IDC_ENABLE_HLE_AUDIO 1003 -#define IDC_ENABLE_DTK_MUSIC 1004 -#define IDC_DUMPSAMPLES 1005 -#define IDC_SAMPLEMINLENGTH 1006 -#define IDC_BROWSE 1007 -#define IDC_ENABLE_THROTTLE 1008 -#define IDC_ANTIGAP 1009 -#define IDC_CHECK3 1010 +#define IDC_ENABLE_HLE_AUDIO 1000 +#define IDC_ENABLE_DTK_MUSIC 1001 +#define IDC_ENABLE_THROTTLE 1002 // Next default values for new objects //