piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 09:09:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove the __APPLE__ workaround for reading config files from a ctor.

Browse Source 
'#' is a fairly accepted comment character for .ini files along with
the more official ';', but '//' isn't.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6872 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2011-01-18 00:04:29 +00:00
parent d0805aef37
commit 1a3cd2d34c
14 changed files with 30 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Plugins/Plugin_DSP_HLE/Src/Config.cpp
View File

@ -24,11 +24,6 @@
CConfig g_Config;
CConfig::CConfig()
{
Load();
}
void CConfig::Load()
{
// first load defaults

2
Source/Plugins/Plugin_DSP_HLE/Src/Config.h
View File

@ -23,8 +23,6 @@
struct CConfig
{
bool m_EnableHLEAudio;
CConfig();
void Load();
void Save();

19
Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.cpp
View File

@ -92,11 +92,8 @@ DSPConfigDialogHLE::DSPConfigDialogHLE(wxWindow *parent, wxWindowID id,
m_FrequencySelection->Append(_("48,000 Hz"));
m_FrequencySelection->Append(_("32,000 Hz"));
#ifdef __APPLE__
int num = m_FrequencySelection->FindString(wxString::FromAscii(ac_Config.sFrequency));
#else
int num = m_FrequencySelection->FindString(wxString::FromAscii(ac_Config.sFrequency.c_str()));
#endif
int num = m_FrequencySelection->\
FindString(wxString::FromAscii(ac_Config.sFrequency.c_str()));
m_FrequencySelection->SetSelection(num);
sbSettings->Add(sFrequency, 0, wxALL, 7);
@ -127,11 +124,8 @@ void DSPConfigDialogHLE::AddBackend(const char* backend)
{
// Update values
m_BackendSelection->Append(wxString::FromAscii(backend));
#ifdef __APPLE__
int num = m_BackendSelection->FindString(wxString::FromAscii(ac_Config.sBackend));
#else
int num = m_BackendSelection->FindString(wxString::FromAscii(ac_Config.sBackend.c_str()));
#endif
int num = m_BackendSelection->\
FindString(wxString::FromAscii(ac_Config.sBackend.c_str()));
m_BackendSelection->SetSelection(num);
}
@ -158,13 +152,8 @@ void DSPConfigDialogHLE::SettingsChanged(wxCommandEvent& event)
ac_Config.m_EnableDTKMusic = m_buttonEnableDTKMusic->GetValue();
ac_Config.m_EnableThrottle = m_buttonEnableThrottle->GetValue();
#ifdef __APPLE__
strncpy(ac_Config.sBackend, m_BackendSelection->GetStringSelection().mb_str(), 128);
strncpy(ac_Config.sFrequency, m_FrequencySelection->GetStringSelection().mb_str(), 128);
#else
ac_Config.sBackend = m_BackendSelection->GetStringSelection().mb_str();
ac_Config.sFrequency = m_FrequencySelection->GetStringSelection().mb_str();
#endif
ac_Config.Update();
g_Config.Save();

5
Source/Plugins/Plugin_DSP_LLE/Src/Config.cpp
View File

@ -25,11 +25,6 @@
CConfig g_Config;
CConfig::CConfig()
{
Load();
}
void CConfig::Load()
{
// first load defaults

2
Source/Plugins/Plugin_DSP_LLE/Src/Config.h
View File

@ -22,8 +22,6 @@
struct CConfig
{
CConfig();
void Load();
void Save();
};

13
Source/Plugins/Plugin_DSP_LLE/Src/DSPConfigDlgLLE.cpp
View File

@ -95,13 +95,10 @@ DSPConfigDialogLLE::DSPConfigDialogLLE(wxWindow *parent, wxWindowID id, const wx
void DSPConfigDialogLLE::AddBackend(const char* backend)
{
// Update value
m_BackendSelection->Append(wxString::FromAscii(backend));
m_BackendSelection->Append(wxString::FromAscii(backend));
#ifdef __APPLE__
int num = m_BackendSelection->FindString(wxString::FromAscii(ac_Config.sBackend));
#else
int num = m_BackendSelection->FindString(wxString::FromAscii(ac_Config.sBackend.c_str()));
#endif
int num = m_BackendSelection->\
FindString(wxString::FromAscii(ac_Config.sBackend.c_str()));
m_BackendSelection->SetSelection(num);
}
@ -128,11 +125,7 @@ void DSPConfigDialogLLE::SettingsChanged(wxCommandEvent& event)
ac_Config.m_EnableThrottle = m_buttonEnableThrottle->GetValue();
ac_Config.m_EnableJIT = m_buttonEnableJIT->GetValue();
#ifdef __APPLE__
strncpy(ac_Config.sBackend, m_BackendSelection->GetStringSelection().mb_str(), 128);
#else
ac_Config.sBackend = m_BackendSelection->GetStringSelection().mb_str();
#endif
ac_Config.Update();
g_Config.Save();