Delete unused/no-effect settings from DSP_HLE plugin.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1261 8ced0084-cf51-0410-be5f-012b33b47a6e

5 files changed, 7 insertions, 53 deletions

diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/Config.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/Config.cpp
index 734cea624f..81b5941df0 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/Config.cpp
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/Config.cpp
@@ -31,9 +31,6 @@ void CConfig::LoadDefaults()
 	m_EnableHLEAudio = true;

 	m_EnableDTKMusic = true;

 	m_Interpolation = true;

-	m_DumpSampleMinLength = true;

-	m_DumpSamples = false;

-	m_AntiGap = false;

 }

 

 void CConfig::Load()

@@ -47,15 +44,6 @@ void CConfig::Load()
 	file.Get("Config", "EnableDTKMusic", &m_EnableDTKMusic, true);

 	file.Get("Config", "EnableThrottle", &m_EnableThrottle, true);

 	file.Get("Config", "Interpolation", &m_Interpolation, true);

-	file.Get("Config", "AntiGap", &m_AntiGap, false);

-

-	file.Get("Config", "DumpSamples", &m_DumpSamples, false); // Sample Dumping

-	file.Get("Config", "DumpSampleMinLength", &m_DumpSampleMinLength, true);

-#ifdef _WIN32

-	file.Get("Config", "DumpSamplePath", &m_szSamplePath, "C:\\");

-#else

-	file.Get("Config", "DumpSamplePath", &m_szSamplePath, "/dev/null/");

-#endif	

 }

 

 void CConfig::Save()

@@ -66,15 +54,6 @@ void CConfig::Save()
 	file.Set("Config", "EnableDTKMusic", m_EnableDTKMusic);

 	file.Set("Config", "EnableThrottle", m_EnableThrottle);

 	file.Set("Config", "Interpolation", m_Interpolation);

-	file.Set("Config", "AntiGap", m_AntiGap);

-

-	file.Set("Config", "DumpSamples", m_DumpSamples); // Sample Dumping

-	file.Set("Config", "DumpSampleMinLength", m_DumpSampleMinLength);

-#ifdef _WIN32

-	file.Set("Config", "DumpSamplePath", m_szSamplePath);

-#else

-	file.Set("Config", "DumpSamplePath", m_szSamplePath);

-#endif

 

 	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 ceab47c6e0..b41635b104 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/Config.h
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/Config.h
@@ -22,15 +22,11 @@
 

 struct CConfig

 {

-	bool m_AntiGap;

 	bool m_EnableHLEAudio;

 	bool m_EnableDTKMusic;

 	bool m_EnableThrottle;

 	bool m_Interpolation;

-	bool m_DumpSamples;

-	std::string m_szSamplePath;

 	int m_SampleRate;

-	bool m_DumpSampleMinLength;

 

 	CConfig();

 

diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.cpp
index 68cf0544f0..b24412117f 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.cpp
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.cpp
@@ -34,18 +34,12 @@ 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_buttonAntiGap = GetDlgItem(IDC_ANTIGAP);

-	m_buttonDumpSamples  = GetDlgItem(IDC_DUMPSAMPLES);

-	m_editDumpSamplePath = GetDlgItem(IDC_SAMPLEDUMPPATH);

 	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_buttonAntiGap.SetCheck(g_Config.m_AntiGap ? BST_CHECKED : BST_UNCHECKED);

-	m_buttonDumpSamples.SetCheck(g_Config.m_DumpSamples ? BST_CHECKED : BST_UNCHECKED);

-	m_editDumpSamplePath.SetWindowText(g_Config.m_szSamplePath.c_str());

 	m_comboSampleRate.AddString("44100");

 	m_comboSampleRate.AddString("48000");

 	m_comboSampleRate.SetCurSel(g_Config.m_SampleRate == 44100 ? 0 : 1);

@@ -81,11 +75,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_DumpSamples = (m_buttonDumpSamples.GetCheck() == BST_CHECKED) ? true : false;

-		g_Config.m_AntiGap = (m_buttonAntiGap.GetCheck() == BST_CHECKED) ? true : false;

-		char temp[MAX_PATH];

-		m_editDumpSamplePath.GetWindowText(temp, MAX_PATH);

-		g_Config.m_szSamplePath = temp;

 		g_Config.m_SampleRate = (m_comboSampleRate.GetCurSel() == 0 ? 44100 : 48000);

 		g_Config.Save();

 	}

diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/PCHW/Mixer.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/PCHW/Mixer.cpp
index 4f15257ab0..7e9505933f 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/PCHW/Mixer.cpp
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/PCHW/Mixer.cpp
@@ -56,7 +56,7 @@ void Mixer(short *buffer, int numSamples, int bits, int rate, int channels)
 	}

 

 	//if this was called directly from the HLE, and not by timeout

-	if (g_Config.m_EnableHLEAudio && (mixer_HLEready || g_Config.m_AntiGap))

+	if (g_Config.m_EnableHLEAudio && mixer_HLEready)

 	{

 		IUCode* pUCode = CDSPHandler::GetInstance().GetUCode();

 		if (pUCode != NULL)

diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/resource.rc b/Source/Plugins/Plugin_DSP_HLE/Src/resource.rc
index 70bfe28425..2ad5705768 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/resource.rc
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/resource.rc
@@ -52,24 +52,16 @@ END
 // Dialog

 //

 

-IDD_SETTINGS DIALOGEX 0, 0, 232, 147

+IDD_SETTINGS DIALOGEX 0, 0, 157, 86

 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU

 CAPTION "Dolphin DSP-HLE Plugin Settings"

 FONT 8, "MS Shell Dlg", 400, 0, 0x1

 BEGIN

-    DEFPUSHBUTTON   "OK",IDOK,122,126,50,14

-    PUSHBUTTON      "Cancel",IDCANCEL,176,126,50,14

-    GROUPBOX        "&Sound settings",IDC_STATIC,7,7,219,57

-    EDITTEXT        IDC_SAMPLEDUMPPATH,13,99,145,13,ES_AUTOHSCROLL | WS_DISABLED

+    DEFPUSHBUTTON   "OK",IDOK,45,65,50,14

+    PUSHBUTTON      "Cancel",IDCANCEL,101,65,50,14

+    GROUPBOX        "&Sound settings",IDC_STATIC,7,7,144,57

     CONTROL         "&Enable HLE Audio",IDC_ENABLE_HLE_AUDIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,22,84,8

-    GROUPBOX        "Sample d&umping",IDC_STATIC,7,69,219,51

     CONTROL         "Enab&le DTK Music",IDC_ENABLE_DTK_MUSIC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,36,90,8

-    CONTROL         "&Dump all samples longer than",IDC_DUMPSAMPLES,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,13,83,103,9

-    EDITTEXT        IDC_SAMPLEMINLENGTH,121,80,47,12,ES_AUTOHSCROLL | WS_DISABLED

-    LTEXT           "seconds to:",IDC_STATIC,174,83,40,10

-    PUSHBUTTON      "&Browse...",IDC_BROWSE,165,99,54,14

-    CONTROL         "&Anti-gap (dangerous!)",IDC_ANTIGAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,114,22,96,9

-    CONTROL         "&Reverb",IDC_CHECK3,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,114,36,89,10

     CONTROL         "Enable Other Audio",IDC_ENABLE_THROTTLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,50,94,10

 END

 

@@ -95,12 +87,10 @@ BEGIN
     IDD_SETTINGS, DIALOG

     BEGIN

         LEFTMARGIN, 7

-        RIGHTMARGIN, 226

+        RIGHTMARGIN, 151

         VERTGUIDE, 13

-        VERTGUIDE, 114

-        VERTGUIDE, 158

         TOPMARGIN, 7

-        BOTTOMMARGIN, 140

+        BOTTOMMARGIN, 79

         HORZGUIDE, 31

     END