mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-09 23:59:27 +01:00
Only update the game list when there may be changes to it.
When just starting and stopping emulation, just hide/show it, but only if necessary because we are rendering to the main window. Fixes issue 3460. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6889 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
12249296a1
commit
4684417409
16
Readme.txt
16
Readme.txt
@ -1,9 +1,10 @@
|
|||||||
Dolphin-emu - The Gamecube / Wii Emulator
|
Dolphin-emu - The Gamecube / Wii Emulator
|
||||||
==========================================
|
==========================================
|
||||||
Homesite: http://dolphin-emu.com/
|
Homesite: http://dolphin-emulator.com/
|
||||||
Project Site: http://code.google.com/p/dolphin-emu
|
Project Site: http://code.google.com/p/dolphin-emu
|
||||||
|
|
||||||
About: Dolphin-emu is a emulator for Gamecube, Wii, Triforce that lets you run Wii/GCN/Tri games on your Windows/Linux/MacOSX PC system
|
Dolphin-emu is a emulator for Gamecube, Wii, Triforce that lets
|
||||||
|
you run Wii/GCN/Tri games on your Windows/Linux/Mac PC system.
|
||||||
|
|
||||||
Open Source Release under GPL 2
|
Open Source Release under GPL 2
|
||||||
|
|
||||||
@ -11,27 +12,28 @@ Project Leaders: F|RES, ector
|
|||||||
|
|
||||||
Team members: http://code.google.com/p/dolphin-emu/people/
|
Team members: http://code.google.com/p/dolphin-emu/people/
|
||||||
|
|
||||||
|
Please read the FAQ before use:
|
||||||
|
|
||||||
Please read the FAQ before use: http://code.google.com/p/dolphin-emu/wiki/Facts_And_Questions
|
http://code.google.com/p/dolphin-emu/wiki/Facts_And_Questions
|
||||||
|
|
||||||
System Requirements:
|
System Requirements:
|
||||||
* OS: Microsoft Windows (2000/XP/Vista or higher) or Linux or Apple Mac OS X.
|
* OS: Microsoft Windows (2000/XP/Vista or higher) or Linux or Apple Mac OS X.
|
||||||
* Processor: Fast CPU with SSE2 supported (recommended at least 2Ghz). Dual Core for speed boost.
|
* Processor: Fast CPU with SSE2 supported (recommended at least 2Ghz).
|
||||||
|
Dual Core for speed boost.
|
||||||
* Graphics: Any graphics card that supports Direct3D 9 or OpenGL 2.1.
|
* Graphics: Any graphics card that supports Direct3D 9 or OpenGL 2.1.
|
||||||
|
|
||||||
[Command line usage]
|
[Command line usage]
|
||||||
Usage: Dolphin [-h] [-d] [-l] [-e <str>] [-V <str>] [-A <str>] [-P <str>] [-W <str>]
|
Usage: Dolphin [-h] [-d] [-l] [-e <str>] [-b] [-V <str>] [-A <str>]
|
||||||
-h, --help Show this help message
|
-h, --help Show this help message
|
||||||
-d, --debugger Opens the debugger
|
-d, --debugger Opens the debugger
|
||||||
-l, --logger Opens the logger
|
-l, --logger Opens the logger
|
||||||
-e, --exec=<str> Loads the specified file (DOL, ELF, WAD, GCM, ISO)
|
-e, --exec=<str> Loads the specified file (DOL, ELF, WAD, GCM, ISO)
|
||||||
|
-b, --batch Exit Dolphin with emulator
|
||||||
-V, --video_plugin=<str> Specify a video plugin
|
-V, --video_plugin=<str> Specify a video plugin
|
||||||
-A, --audio_plugin=<str> Specify an audio plugin
|
-A, --audio_plugin=<str> Specify an audio plugin
|
||||||
|
|
||||||
[Libraries]
|
[Libraries]
|
||||||
Cg: Cg Shading API (http://developer.nvidia.com/object/cg_toolkit.html)
|
Cg: Cg Shading API (http://developer.nvidia.com/object/cg_toolkit.html)
|
||||||
WiiUse: Wiimote Bluetooth API (http://www.wiiuse.net/)
|
|
||||||
SDL: Simple DirectMedia Layer API (http://www.libsdl.org/)
|
|
||||||
*.pdb = Program Debug Database (use these symbols with a program debugger)
|
*.pdb = Program Debug Database (use these symbols with a program debugger)
|
||||||
|
|
||||||
[DSP Plugins]
|
[DSP Plugins]
|
||||||
|
@ -769,15 +769,12 @@ void CFrame::StartGame(const std::string& filename)
|
|||||||
m_ToolBar->EnableTool(IDM_PLAY, false);
|
m_ToolBar->EnableTool(IDM_PLAY, false);
|
||||||
GetMenuBar()->FindItem(IDM_PLAY)->Enable(false);
|
GetMenuBar()->FindItem(IDM_PLAY)->Enable(false);
|
||||||
|
|
||||||
// Game has been started, hide the game list
|
|
||||||
if (m_GameListCtrl->IsShown())
|
|
||||||
{
|
|
||||||
m_GameListCtrl->Disable();
|
|
||||||
m_GameListCtrl->Hide();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain)
|
if (SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain)
|
||||||
{
|
{
|
||||||
|
// Game has been started, hide the game list
|
||||||
|
m_GameListCtrl->Disable();
|
||||||
|
m_GameListCtrl->Hide();
|
||||||
|
|
||||||
m_RenderParent = m_Panel;
|
m_RenderParent = m_Panel;
|
||||||
m_RenderFrame = this;
|
m_RenderFrame = this;
|
||||||
}
|
}
|
||||||
@ -986,6 +983,13 @@ void CFrame::DoStop()
|
|||||||
|
|
||||||
// Clear wiimote connection status from the status bar.
|
// Clear wiimote connection status from the status bar.
|
||||||
GetStatusBar()->SetStatusText(wxT(" "), 1);
|
GetStatusBar()->SetStatusText(wxT(" "), 1);
|
||||||
|
|
||||||
|
// If batch mode was specified on the command-line, exit now.
|
||||||
|
if (m_bBatchMode)
|
||||||
|
Close(true);
|
||||||
|
|
||||||
|
m_GameListCtrl->Enable();
|
||||||
|
m_GameListCtrl->Show();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1017,12 +1021,6 @@ void CFrame::OnStop(wxCommandEvent& WXUNUSED (event))
|
|||||||
{
|
{
|
||||||
m_bGameLoading = false;
|
m_bGameLoading = false;
|
||||||
DoStop();
|
DoStop();
|
||||||
|
|
||||||
// If batch mode was specified on the command-line, exit now.
|
|
||||||
if (m_bBatchMode)
|
|
||||||
Close(true);
|
|
||||||
else
|
|
||||||
UpdateGameList();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void CFrame::OnReset(wxCommandEvent& WXUNUSED (event))
|
void CFrame::OnReset(wxCommandEvent& WXUNUSED (event))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user