finally getting some squeaks from SSBM on linux

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

Source/Plugins/Plugin_DSP_LLE-testing/Src/Config.cpp

@@ -18,6 +18,7 @@
 #include "Common.h"
 #include "IniFile.h"
 #include "Config.h"
+#define LLE_CONFIG_FILE "DSPLLE.ini"
 
 CConfig g_Config;
 
@@ -29,11 +30,10 @@ CConfig::CConfig()
 void CConfig::Load()
 {
 	// first load defaults
-        std::string temp;
+	std::string temp;
-        
+    
 	IniFile file;
-	file.Load(FULL_CONFIG_DIR "DSP.ini");
+	file.Load(FULL_CONFIG_DIR LLE_CONFIG_FILE);
-	file.Get("Config", "EnableHLEAudio", &m_EnableHLEAudio, false);
 	file.Get("Config", "EnableThrottle", &m_EnableThrottle, true);
 #ifdef _WIN32
 	file.Get("Config", "Backend", &sBackend, "DSound");
@@ -45,10 +45,9 @@ void CConfig::Load()
 void CConfig::Save()
 {
 	IniFile file;
-	file.Load(FULL_CONFIG_DIR "DSP.ini");
+	file.Load(FULL_CONFIG_DIR LLE_CONFIG_FILE);
-	file.Set("Config", "EnableHLEAudio", m_EnableHLEAudio); // Sound Settings
 	file.Set("Config", "EnableThrottle", m_EnableThrottle);
 	file.Set("Config", "Backend", sBackend.c_str());
         
-	file.Save(FULL_CONFIG_DIR "DSP.ini");
+	file.Save(FULL_CONFIG_DIR LLE_CONFIG_FILE);
 }

Source/Plugins/Plugin_DSP_LLE-testing/Src/DSPConfigDlgLLE.cpp

@@ -21,8 +21,6 @@
 
 BEGIN_EVENT_TABLE(DSPConfigDialogLLE, wxDialog)
 EVT_BUTTON(wxID_OK, DSPConfigDialogLLE::SettingsChanged)
-EVT_CHECKBOX(ID_ENABLE_HLE_AUDIO, DSPConfigDialogLLE::SettingsChanged)
-EVT_CHECKBOX(ID_ENABLE_DTK_MUSIC, DSPConfigDialogLLE::SettingsChanged)
 EVT_CHECKBOX(ID_ENABLE_THROTTLE, DSPConfigDialogLLE::SettingsChanged)
 END_EVENT_TABLE()
 
@@ -38,17 +36,14 @@ DSPConfigDialogLLE::DSPConfigDialogLLE(wxWindow *parent, wxWindowID id, const wx
 	m_OK = new wxButton(this, wxID_OK, wxT("OK"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
 
 	// Create items
-	m_buttonEnableHLEAudio = new wxCheckBox(this, ID_ENABLE_HLE_AUDIO, wxT("Enable HLE Audio"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
 	m_buttonEnableThrottle = new wxCheckBox(this, ID_ENABLE_THROTTLE, wxT("Enable Other Audio (Throttle)"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
 	wxStaticText *BackendText = new wxStaticText(this, wxID_ANY, wxT("Audio Backend"), wxDefaultPosition, wxDefaultSize, 0);
 	m_BackendSelection = new wxComboBox(this, ID_BACKEND, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxArrayBackends, wxCB_READONLY, wxDefaultValidator);
 
 	// Update values
-	m_buttonEnableHLEAudio->SetValue(g_Config.m_EnableHLEAudio ? true : false);
 	m_buttonEnableThrottle->SetValue(g_Config.m_EnableThrottle ? true : false);
 
 	// Add tooltips
-	m_buttonEnableHLEAudio->SetToolTip(wxT("This is the most common sound type"));
 	m_buttonEnableThrottle->SetToolTip(wxT("This is sometimes used together with pre-rendered movies.\n"
 		"Disabling this also disables the speed throttle which this causes,\n"
 		"meaning that there will be no upper limit on your FPS."));
@@ -57,7 +52,6 @@ DSPConfigDialogLLE::DSPConfigDialogLLE(wxWindow *parent, wxWindowID id, const wx
 	// Create sizer and add items to dialog
 	wxBoxSizer *sMain = new wxBoxSizer(wxVERTICAL);
 	wxStaticBoxSizer *sbSettings = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Sound Settings"));
-	sbSettings->Add(m_buttonEnableHLEAudio, 0, wxALL, 5);
 	sbSettings->Add(m_buttonEnableThrottle, 0, wxALL, 5);
 	wxBoxSizer *sBackend = new wxBoxSizer(wxHORIZONTAL);
 	sBackend->Add(BackendText, 0, wxALIGN_CENTRE_VERTICAL|wxALL, 5);
@@ -86,7 +80,6 @@ DSPConfigDialogLLE::~DSPConfigDialogLLE()
 
 void DSPConfigDialogLLE::SettingsChanged(wxCommandEvent& event)
 {
-	g_Config.m_EnableHLEAudio = m_buttonEnableHLEAudio->GetValue();
 	g_Config.m_EnableThrottle = m_buttonEnableThrottle->GetValue();
 	g_Config.sBackend = m_BackendSelection->GetValue().mb_str();
 	g_Config.Save();

Source/Plugins/Plugin_DSP_LLE-testing/Src/DSPConfigDlgLLE.h

@@ -39,8 +39,6 @@ private:
     DECLARE_EVENT_TABLE();
     
     wxButton *m_OK;
-    wxCheckBox *m_buttonEnableHLEAudio;
-    wxCheckBox *m_buttonEnableDTKMusic;
     wxCheckBox *m_buttonEnableThrottle;
     wxArrayString wxArrayBackends;
     wxComboBox  *m_BackendSelection;
@@ -48,8 +46,6 @@ private:
     enum
 	{
 	    wxID_OK,
-	    ID_ENABLE_HLE_AUDIO,
-	    ID_ENABLE_DTK_MUSIC,
 	    ID_ENABLE_THROTTLE,
 	    ID_BACKEND
 	};

Source/Plugins/Plugin_DSP_LLE-testing/Src/Globals.cpp

@@ -68,7 +68,7 @@ void ProfilerInit()
 
 void ProfilerDump(uint64 count)
 {
-	FILE* pFile = fopen("c:\\_\\DSP_Prof.txt", "wt");
+	FILE* pFile = fopen("DSP_Prof.txt", "wt");
 	if (pFile != NULL)
 	{
 		fprintf(pFile, "Number of DSP steps: %llu\n\n", count);

Source/Plugins/Plugin_DSP_LLE-testing/Src/Globals.h

@@ -23,7 +23,7 @@
 
 #define WITH_DSP_ON_THREAD		1
 #define DUMP_DSP_IMEM			0
-#define PROFILE					1
+#define PROFILE					0
 
 
 void DSP_DebugBreak();

Source/Plugins/Plugin_DSP_LLE-testing/Src/main.cpp

@@ -218,17 +218,6 @@ void Initialize(void *init)
 	if(!bCanWork)
 		return; // TODO: Don't let it work
 	
-	/*/ First create DSP_UCode.bin by setting "#define DUMP_DSP_IMEM 1" in
-	// Globals.h. Then make the disassembled file here.  Dump UCode to file...
-	
-   	FILE* t = fopen("C:\\_\\DSP_UC_09CD143F.txt", "wb");
-	if (t != NULL)
-	{
-   		gd_globals_t gdg;
-   		gd_dis_file(&gdg, (char *)"C:\\_\\DSP_UC_09CD143F.bin", t);
-   		fclose(t);   
-	}
-		*/
 	g_hDSPThread = new Common::Thread(dsp_thread, NULL);
 	
 	soundStream = AudioCommon::InitSoundStream(g_Config.sBackend);