|
|
@ -19,14 +19,13 @@
|
|
|
|
#include "Config.h"
|
|
|
|
#include "Config.h"
|
|
|
|
#include "ConfigDlg.h"
|
|
|
|
#include "ConfigDlg.h"
|
|
|
|
|
|
|
|
|
|
|
|
BEGIN_EVENT_TABLE(DSPConfigDialogHLE, wxDialog)
|
|
|
|
BEGIN_EVENT_TABLE(ConfigDialog, wxDialog)
|
|
|
|
EVT_BUTTON(wxID_OK, DSPConfigDialogHLE::SettingsChanged)
|
|
|
|
EVT_BUTTON(wxID_OK, ConfigDialog::SettingsChanged)
|
|
|
|
EVT_CHECKBOX(ID_ENABLE_HLE_AUDIO, DSPConfigDialogHLE::SettingsChanged)
|
|
|
|
EVT_CHECKBOX(ID_ENABLE_HLE_AUDIO, ConfigDialog::SettingsChanged)
|
|
|
|
EVT_CHECKBOX(ID_ENABLE_DTK_MUSIC, DSPConfigDialogHLE::SettingsChanged)
|
|
|
|
EVT_CHECKBOX(ID_ENABLE_DTK_MUSIC, ConfigDialog::SettingsChanged)
|
|
|
|
EVT_CHECKBOX(ID_ENABLE_THROTTLE, DSPConfigDialogHLE::SettingsChanged)
|
|
|
|
EVT_CHECKBOX(ID_ENABLE_THROTTLE, ConfigDialog::SettingsChanged)
|
|
|
|
EVT_CHECKBOX(ID_ENABLE_RE0_FIX, DSPConfigDialogHLE::SettingsChanged)
|
|
|
|
EVT_CHECKBOX(ID_ENABLE_RE0_FIX, ConfigDialog::SettingsChanged)
|
|
|
|
EVT_CHECKBOX(ID_DISABLE_STREAMING, DSPConfigDialogHLE::SettingsChanged)
|
|
|
|
EVT_COMMAND_SCROLL(ID_VOLUME, ConfigDialog::VolumeChanged)
|
|
|
|
EVT_COMMAND_SCROLL(ID_VOLUME, DSPConfigDialogHLE::VolumeChanged)
|
|
|
|
|
|
|
|
END_EVENT_TABLE()
|
|
|
|
END_EVENT_TABLE()
|
|
|
|
|
|
|
|
|
|
|
|
DSPConfigDialogHLE::DSPConfigDialogHLE(wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &position, const wxSize& size, long style)
|
|
|
|
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_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_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_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);
|
|
|
|
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_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_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_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
|
|
|
|
// Update values
|
|
|
|
m_buttonEnableHLEAudio->SetValue(g_Config.m_EnableHLEAudio ? true : false);
|
|
|
|
m_buttonEnableHLEAudio->SetValue(g_Config.m_EnableHLEAudio ? true : false);
|
|
|
|
m_buttonEnableRE0Fix->SetValue(g_Config.m_EnableRE0Fix ? 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_buttonEnableDTKMusic->SetValue(ac_Config.m_EnableDTKMusic ? true : false);
|
|
|
|
m_buttonEnableThrottle->SetValue(ac_Config.m_EnableThrottle ? 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
|
|
|
|
// Create sizer and add items to dialog
|
|
|
|
wxBoxSizer *sMain = new wxBoxSizer(wxVERTICAL);
|
|
|
|
wxBoxSizer *sMain = new wxBoxSizer(wxVERTICAL);
|
|
|
|
wxBoxSizer *sSettings = new wxBoxSizer(wxHORIZONTAL);
|
|
|
|
wxBoxSizer *sSettings = new wxBoxSizer(wxHORIZONTAL);
|
|
|
|
wxBoxSizer *sbSettingsAndHacks = new wxBoxSizer(wxVERTICAL);
|
|
|
|
|
|
|
|
wxBoxSizer *sBackend = new wxBoxSizer(wxHORIZONTAL);
|
|
|
|
wxBoxSizer *sBackend = new wxBoxSizer(wxHORIZONTAL);
|
|
|
|
wxBoxSizer *sButtons = 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_buttonEnableHLEAudio, 0, wxALL, 5);
|
|
|
|
sbSettings->Add(m_buttonEnableDTKMusic, 0, wxALL, 5);
|
|
|
|
sbSettings->Add(m_buttonEnableDTKMusic, 0, wxALL, 5);
|
|
|
|
sbSettings->Add(m_buttonEnableThrottle, 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(BackendText, 0, wxALIGN_CENTER|wxALL, 5);
|
|
|
|
sBackend->Add(m_BackendSelection, 0, wxALL, 1);
|
|
|
|
sBackend->Add(m_BackendSelection, 0, wxALL, 1);
|
|
|
|
sbSettings->Add(sBackend, 0, wxALL, 2);
|
|
|
|
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"));
|
|
|
|
wxStaticBoxSizer *sbSettingsV = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Volume"));
|
|
|
|
sbSettingsV->Add(m_volumeSlider, 0, wxLEFT|wxRIGHT|wxALIGN_CENTER, 6);
|
|
|
|
sbSettingsV->Add(m_volumeSlider, 0, wxLEFT|wxRIGHT|wxALIGN_CENTER, 6);
|
|
|
|
sbSettingsV->Add(m_volumeText, 0, wxALL|wxALIGN_LEFT, 4);
|
|
|
|
sbSettingsV->Add(m_volumeText, 0, wxALL|wxALIGN_LEFT, 4);
|
|
|
|
|
|
|
|
|
|
|
|
sbSettingsAndHacks->Add(sbSettings, 0, wxALL|wxEXPAND, 4);
|
|
|
|
sSettings->Add(sbSettings, 0, wxALL|wxEXPAND, 4);
|
|
|
|
sbSettingsAndHacks->Add(sbHacks, 0, wxALL|wxEXPAND, 4);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
sSettings->Add(sbSettingsAndHacks, 0, wxALL|wxEXPAND, 4);
|
|
|
|
|
|
|
|
sSettings->Add(sbSettingsV, 0, wxALL|wxEXPAND, 4);
|
|
|
|
sSettings->Add(sbSettingsV, 0, wxALL|wxEXPAND, 4);
|
|
|
|
sMain->Add(sSettings, 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_EnableHLEAudio = m_buttonEnableHLEAudio->GetValue();
|
|
|
|
g_Config.m_EnableRE0Fix = m_buttonEnableRE0Fix->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_EnableDTKMusic = m_buttonEnableDTKMusic->GetValue();
|
|
|
|
ac_Config.m_EnableThrottle = m_buttonEnableThrottle->GetValue();
|
|
|
|
ac_Config.m_EnableThrottle = m_buttonEnableThrottle->GetValue();
|
|
|
|
|
|
|
|
|
|
|
|