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

VideoCommon: Drop GetConfigName.

Browse Source 
We're past 5.0 now, so there is no need to look for old inis.
This commit is contained in:
degasus
2016-06-26 08:06:23 +02:00
parent 5f2f462067
commit d79aeaa1e9
21 changed files with 16 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/DolphinWX/Main.cpp
View File

@ -555,17 +555,16 @@ void Host_ConnectWiimote(int wm_idx, bool connect)
}
}
void Host_ShowVideoConfig(void* parent, const std::string& backend_name,
const std::string& config_name)
void Host_ShowVideoConfig(void* parent, const std::string& backend_name)
{
if (backend_name == "Software Renderer")
{
SoftwareVideoConfigDialog diag((wxWindow*)parent, backend_name, config_name);
SoftwareVideoConfigDialog diag((wxWindow*)parent, backend_name);
diag.ShowModal();
}
else
{
VideoConfigDiag diag((wxWindow*)parent, backend_name, config_name);
VideoConfigDiag diag((wxWindow*)parent, backend_name);
diag.ShowModal();
}
}

2
Source/Core/DolphinWX/MainNoGUI.cpp
View File

@ -136,7 +136,7 @@ void Host_SetWiiMoteConnectionState(int _State)
{
}
void Host_ShowVideoConfig(void*, const std::string&, const std::string&)
void Host_ShowVideoConfig(void*, const std::string&)
{
}

8
Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp
View File

@ -31,17 +31,13 @@ IntegerSetting<T>::IntegerSetting(wxWindow* parent, const wxString& label, T& se
Bind(wxEVT_SPINCTRL, &IntegerSetting::UpdateValue, this);
}
SoftwareVideoConfigDialog::SoftwareVideoConfigDialog(wxWindow* parent, const std::string& title,
const std::string& ininame)
SoftwareVideoConfigDialog::SoftwareVideoConfigDialog(wxWindow* parent, const std::string& title)
: wxDialog(parent, wxID_ANY,
wxString(wxString::Format(_("Dolphin %s Graphics Configuration"), title)))
{
VideoConfig& vconfig = g_Config;
if (File::Exists(File::GetUserPath(D_CONFIG_IDX) + "GFX.ini"))
vconfig.Load(File::GetUserPath(D_CONFIG_IDX) + "GFX.ini");
else
vconfig.Load(File::GetUserPath(D_CONFIG_IDX) + ininame + ".ini");
vconfig.Load(File::GetUserPath(D_CONFIG_IDX) + "GFX.ini");
wxNotebook* const notebook = new wxNotebook(this, wxID_ANY);

2
Source/Core/DolphinWX/SoftwareVideoConfigDialog.h
View File

@ -19,7 +19,7 @@
class SoftwareVideoConfigDialog : public wxDialog
{
public:
SoftwareVideoConfigDialog(wxWindow* parent, const std::string& title, const std::string& ininame);
SoftwareVideoConfigDialog(wxWindow* parent, const std::string& title);
~SoftwareVideoConfigDialog();
void Event_Backend(wxCommandEvent& ev)

8
Source/Core/DolphinWX/VideoConfigDiag.cpp
View File

@ -329,16 +329,12 @@ static wxArrayString GetListOfResolutions()
}
#endif
VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string& title,
const std::string& ininame)
VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string& title)
: wxDialog(parent, wxID_ANY, wxString::Format(_("Dolphin %s Graphics Configuration"),
wxGetTranslation(StrToWxStr(title)))),
vconfig(g_Config)
{
if (File::Exists(File::GetUserPath(D_CONFIG_IDX) + "GFX.ini"))
vconfig.Load(File::GetUserPath(D_CONFIG_IDX) + "GFX.ini");
else
vconfig.Load(File::GetUserPath(D_CONFIG_IDX) + ininame + ".ini");
vconfig.Load(File::GetUserPath(D_CONFIG_IDX) + "GFX.ini");
Bind(wxEVT_UPDATE_UI, &VideoConfigDiag::OnUpdateUI, this);

2
Source/Core/DolphinWX/VideoConfigDiag.h
View File

@ -83,7 +83,7 @@ private:
class VideoConfigDiag : public wxDialog
{
public:
VideoConfigDiag(wxWindow* parent, const std::string& title, const std::string& ininame);
VideoConfigDiag(wxWindow* parent, const std::string& title);
protected:
void Event_Backend(wxCommandEvent& ev)