From d3d65d20305580cd427330e2ca78904734498595 Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Sun, 5 Jul 2009 07:30:42 +0000 Subject: [PATCH] Revert R3511 (MusicMod was removed) git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3678 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_DSP_HLE/Src/Config.cpp | 2 -- Source/Plugins/Plugin_DSP_HLE/Src/Config.h | 2 +- .../Plugins/Plugin_DSP_HLE/Src/ConfigDlg.cpp | 32 ++++++------------- Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.h | 4 +-- .../Src/UCodes/UCode_AX_Voice.h | 8 ----- 5 files changed, 13 insertions(+), 35 deletions(-) diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/Config.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/Config.cpp index 2763ec8e9d..68930bf337 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/Config.cpp +++ b/Source/Plugins/Plugin_DSP_HLE/Src/Config.cpp @@ -37,7 +37,6 @@ void CConfig::Load() file.Load(FULL_CONFIG_DIR "DSP.ini"); file.Get("Config", "EnableHLEAudio", &m_EnableHLEAudio, true); // Sound Settings file.Get("Config", "EnableRE0AudioFix", &m_EnableRE0Fix, false); // RE0 Hack - file.Get("Config", "DisableStreaming", &m_DisableStreaming, false); // Music hack ac_Config.Load(file); } @@ -47,7 +46,6 @@ void CConfig::Save() file.Load(FULL_CONFIG_DIR "DSP.ini"); file.Set("Config", "EnableHLEAudio", m_EnableHLEAudio); // Sound Settings file.Set("Config", "EnableRE0AudioFix", m_EnableRE0Fix); // RE0 Hack - file.Set("Config", "DisableStreaming", m_DisableStreaming); // Music hack ac_Config.Set(file); 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 03a4e9ce14..182e9fba70 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/Config.h +++ b/Source/Plugins/Plugin_DSP_HLE/Src/Config.h @@ -23,7 +23,7 @@ struct CConfig { bool m_EnableHLEAudio; - bool m_EnableRE0Fix, m_DisableStreaming; + bool m_EnableRE0Fix; CConfig(); diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.cpp index 721b2cdf28..e0ba705ab9 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.cpp +++ b/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.cpp @@ -19,14 +19,13 @@ #include "Config.h" #include "ConfigDlg.h" -BEGIN_EVENT_TABLE(DSPConfigDialogHLE, wxDialog) -EVT_BUTTON(wxID_OK, DSPConfigDialogHLE::SettingsChanged) -EVT_CHECKBOX(ID_ENABLE_HLE_AUDIO, DSPConfigDialogHLE::SettingsChanged) -EVT_CHECKBOX(ID_ENABLE_DTK_MUSIC, DSPConfigDialogHLE::SettingsChanged) -EVT_CHECKBOX(ID_ENABLE_THROTTLE, DSPConfigDialogHLE::SettingsChanged) -EVT_CHECKBOX(ID_ENABLE_RE0_FIX, DSPConfigDialogHLE::SettingsChanged) -EVT_CHECKBOX(ID_DISABLE_STREAMING, DSPConfigDialogHLE::SettingsChanged) -EVT_COMMAND_SCROLL(ID_VOLUME, DSPConfigDialogHLE::VolumeChanged) +BEGIN_EVENT_TABLE(ConfigDialog, wxDialog) +EVT_BUTTON(wxID_OK, ConfigDialog::SettingsChanged) +EVT_CHECKBOX(ID_ENABLE_HLE_AUDIO, ConfigDialog::SettingsChanged) +EVT_CHECKBOX(ID_ENABLE_DTK_MUSIC, ConfigDialog::SettingsChanged) +EVT_CHECKBOX(ID_ENABLE_THROTTLE, ConfigDialog::SettingsChanged) +EVT_CHECKBOX(ID_ENABLE_RE0_FIX, ConfigDialog::SettingsChanged) +EVT_COMMAND_SCROLL(ID_VOLUME, ConfigDialog::VolumeChanged) END_EVENT_TABLE() DSPConfigDialogHLE::DSPConfigDialogHLE(wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &position, const wxSize& size, long style) @@ -45,19 +44,16 @@ DSPConfigDialogHLE::DSPConfigDialogHLE(wxWindow *parent, wxWindowID id, const wx m_buttonEnableHLEAudio = new wxCheckBox(this, ID_ENABLE_HLE_AUDIO, wxT("Enable HLE Audio"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); m_buttonEnableDTKMusic = new wxCheckBox(this, ID_ENABLE_DTK_MUSIC, wxT("Enable DTK Music"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); m_buttonEnableThrottle = new wxCheckBox(this, ID_ENABLE_THROTTLE, wxT("Enable Other Audio (Throttle)"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); + m_buttonEnableRE0Fix = new wxCheckBox(this, ID_ENABLE_RE0_FIX, wxT("Enable RE0 Audio Fix"), 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, wxSize(90, 20), wxArrayBackends, wxCB_READONLY, wxDefaultValidator); m_volumeSlider = new wxSlider(this, ID_VOLUME, ac_Config.m_Volume, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_VERTICAL|wxSL_INVERSE); m_volumeText = new wxStaticText(this, wxID_ANY, wxString::Format(wxT("%d %%"), ac_Config.m_Volume), wxDefaultPosition, wxDefaultSize, 0); - m_buttonEnableRE0Fix = new wxCheckBox(this, ID_ENABLE_RE0_FIX, wxT("Enable RE0 Audio Fix"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); - m_buttonDisableStreaming = new wxCheckBox(this, ID_DISABLE_STREAMING, wxT("Disable Streaming Music"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); - // Update values m_buttonEnableHLEAudio->SetValue(g_Config.m_EnableHLEAudio ? true : false); m_buttonEnableRE0Fix->SetValue(g_Config.m_EnableRE0Fix ? true : false); - m_buttonDisableStreaming->SetValue(g_Config.m_DisableStreaming ? true : false); m_buttonEnableDTKMusic->SetValue(ac_Config.m_EnableDTKMusic ? true : false); m_buttonEnableThrottle->SetValue(ac_Config.m_EnableThrottle ? true : false); @@ -73,7 +69,6 @@ DSPConfigDialogHLE::DSPConfigDialogHLE(wxWindow *parent, wxWindowID id, const wx // Create sizer and add items to dialog wxBoxSizer *sMain = new wxBoxSizer(wxVERTICAL); wxBoxSizer *sSettings = new wxBoxSizer(wxHORIZONTAL); - wxBoxSizer *sbSettingsAndHacks = new wxBoxSizer(wxVERTICAL); wxBoxSizer *sBackend = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *sButtons = new wxBoxSizer(wxHORIZONTAL); @@ -81,22 +76,16 @@ DSPConfigDialogHLE::DSPConfigDialogHLE(wxWindow *parent, wxWindowID id, const wx sbSettings->Add(m_buttonEnableHLEAudio, 0, wxALL, 5); sbSettings->Add(m_buttonEnableDTKMusic, 0, wxALL, 5); sbSettings->Add(m_buttonEnableThrottle, 0, wxALL, 5); + sbSettings->Add(m_buttonEnableRE0Fix, 0, wxALL, 5); sBackend->Add(BackendText, 0, wxALIGN_CENTER|wxALL, 5); sBackend->Add(m_BackendSelection, 0, wxALL, 1); sbSettings->Add(sBackend, 0, wxALL, 2); - wxStaticBoxSizer *sbHacks = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Hacks")); - sbHacks->Add(m_buttonEnableRE0Fix, 0, wxALL, 5); - sbHacks->Add(m_buttonDisableStreaming, 0, wxALL, 5); - wxStaticBoxSizer *sbSettingsV = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Volume")); sbSettingsV->Add(m_volumeSlider, 0, wxLEFT|wxRIGHT|wxALIGN_CENTER, 6); sbSettingsV->Add(m_volumeText, 0, wxALL|wxALIGN_LEFT, 4); - sbSettingsAndHacks->Add(sbSettings, 0, wxALL|wxEXPAND, 4); - sbSettingsAndHacks->Add(sbHacks, 0, wxALL|wxEXPAND, 4); - - sSettings->Add(sbSettingsAndHacks, 0, wxALL|wxEXPAND, 4); + sSettings->Add(sbSettings, 0, wxALL|wxEXPAND, 4); sSettings->Add(sbSettingsV, 0, wxALL|wxEXPAND, 4); sMain->Add(sSettings, 0, wxALL|wxEXPAND, 4); @@ -140,7 +129,6 @@ void DSPConfigDialogHLE::SettingsChanged(wxCommandEvent& event) { g_Config.m_EnableHLEAudio = m_buttonEnableHLEAudio->GetValue(); g_Config.m_EnableRE0Fix = m_buttonEnableRE0Fix->GetValue(); - g_Config.m_DisableStreaming = m_buttonDisableStreaming->GetValue(); ac_Config.m_EnableDTKMusic = m_buttonEnableDTKMusic->GetValue(); ac_Config.m_EnableThrottle = m_buttonEnableThrottle->GetValue(); diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.h b/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.h index 853874cd37..37a1292783 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.h +++ b/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.h @@ -45,7 +45,7 @@ private: wxCheckBox *m_buttonEnableHLEAudio; wxCheckBox *m_buttonEnableDTKMusic; wxCheckBox *m_buttonEnableThrottle; - wxCheckBox *m_buttonEnableRE0Fix, *m_buttonDisableStreaming; + wxCheckBox *m_buttonEnableRE0Fix; wxArrayString wxArrayBackends; wxComboBox *m_BackendSelection; @@ -55,7 +55,7 @@ private: ID_ENABLE_HLE_AUDIO, ID_ENABLE_DTK_MUSIC, ID_ENABLE_THROTTLE, - ID_ENABLE_RE0_FIX, ID_DISABLE_STREAMING, + ID_ENABLE_RE0_FIX, ID_BACKEND, ID_VOLUME }; diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX_Voice.h b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX_Voice.h index e1b099d618..c89b278468 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX_Voice.h +++ b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX_Voice.h @@ -22,7 +22,6 @@ #include "UCode_AX.h" #include "../main.h" #include "Mixer.h" -#include "../Config.h" // ---------------------------------------------------- // Externals @@ -167,13 +166,6 @@ inline void MixAddVoice(ParamBlockType &pb, int *templbuffer, int *temprbuffer, } // ============= - - // ======================================================================================= - // If the no streaming hack is on, do nothing - // -------------- - if (g_Config.m_DisableStreaming && pb.audio_addr.looping) return; - // ============= - // Top Spin 3 Wii if(pb.audio_addr.sample_format > 25) pb.audio_addr.sample_format = 0;