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

Some more work on renaming variables and files to reflect that the plugins are no longer plugins.

Browse Source 
Fix another minor issue with frame dumping.
Add the graphics config dialog button back to the main config.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7041 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice
2011-02-02 16:34:12 +00:00
parent 6f93d77106
commit 5a800b765a
33 changed files with 161 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Source/Core/DolphinWX/Src/Main.cpp
View File

@ -98,11 +98,11 @@ bool DolphinApp::OnInit()
// Declarations and definitions
bool UseDebugger = false;
bool UseLogger = false;
bool selectVideoPlugin = false;
bool selectAudioPlugin = false;
bool selectVideoBackend = false;
bool selectAudioEmulation = false;
wxString videoPluginFilename;
wxString audioPluginFilename;
wxString videoBackendName;
wxString audioEmulationName;
#if wxUSE_CMDLINE_PARSER // Parse command lines
wxCmdLineEntryDesc cmdLineDesc[] =
@ -130,13 +130,13 @@ bool DolphinApp::OnInit()
_("Exit Dolphin with emulator")
},
{
wxCMD_LINE_OPTION, wxS("V"), wxS("video_plugin"),
_("Specify a video plugin"),
wxCMD_LINE_OPTION, wxS("V"), wxS("video_backend"),
_("Specify a video backend"),
wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
},
{
wxCMD_LINE_OPTION, wxS("A"), wxS("audio_plugin"),
_("Specify an audio plugin"),
wxCMD_LINE_OPTION, wxS("A"), wxS("audio_emulation"),
_("Specify low level (LLE) or high level (HLE) audio emulation"),
wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL
},
{
@ -155,10 +155,11 @@ bool DolphinApp::OnInit()
UseLogger = parser.Found(wxT("logger"));
LoadFile = parser.Found(wxT("exec"), &FileToLoad);
BatchMode = parser.Found(wxT("batch"));
selectVideoPlugin = parser.Found(wxT("video_plugin"),
&videoPluginFilename);
selectAudioPlugin = parser.Found(wxT("audio_plugin"),
&audioPluginFilename);
selectVideoBackend = parser.Found(wxT("video_backend"),
&videoBackendName);
// TODO: This currently has no effect. Implement or delete.
selectAudioEmulation = parser.Found(wxT("audio_emulation"),
&audioEmulationName);
#endif // wxUSE_CMDLINE_PARSER
#if defined _DEBUG && defined _WIN32
@ -287,11 +288,11 @@ bool DolphinApp::OnInit()
VideoBackend::PopulateList();
WiimoteReal::LoadSettings();
if (selectVideoPlugin && videoPluginFilename != wxEmptyString)
SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoPlugin =
std::string(videoPluginFilename.mb_str());
if (selectVideoBackend && videoBackendName != wxEmptyString)
SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend =
std::string(videoBackendName.mb_str());
VideoBackend::ActivateBackend(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoPlugin);
VideoBackend::ActivateBackend(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoBackend);
// Enable the PNG image handler for screenshots
wxImage::AddHandler(new wxPNGHandler);