mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-31 01:59:52 -06:00
Core Stop and Start: Added alternative separate thread timer/loop based waiting, instead of same thread loop waiting. You can try it with the SETUP_TIMER_WAITING option in Setup.h.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2375 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@ -194,15 +194,29 @@ int abc = 0;
|
||||
Core::ReconnectWiimote();
|
||||
return 0;
|
||||
|
||||
// -----------------------------------------
|
||||
#ifdef RERECORDING
|
||||
case INPUT_FRAME_COUNTER:
|
||||
// Wind back the frame counter after a save state has been loaded
|
||||
Core::WindBack((int)lParam);
|
||||
return 0;
|
||||
// -----------------
|
||||
case INPUT_FRAME_COUNTER:
|
||||
// Wind back the frame counter after a save state has been loaded
|
||||
Core::WindBack((int)lParam);
|
||||
return 0;
|
||||
#endif
|
||||
// -----------------------------
|
||||
|
||||
// -----------------------------------------
|
||||
#ifdef SETUP_TIMER_WAITING
|
||||
// -----------------
|
||||
case OPENGL_VIDEO_STOP:
|
||||
// The Video thread has been shut down
|
||||
Core::VideoThreadEnd();
|
||||
//Console::Print("OPENGL_VIDEO_STOP\n");
|
||||
return 0;
|
||||
#endif
|
||||
// -----------------------------
|
||||
}
|
||||
break;
|
||||
|
||||
//default:
|
||||
// return wxPanel::MSWWindowProc(nMsg, wParam, lParam);
|
||||
}
|
||||
|
@ -71,6 +71,7 @@ class CFrame : public wxFrame
|
||||
void InitBitmaps();
|
||||
void DoStop();
|
||||
bool bRenderToMain;
|
||||
void UpdateGUI();
|
||||
|
||||
// ---------------------------------------
|
||||
// Wiimote leds
|
||||
@ -220,7 +221,6 @@ class CFrame : public wxFrame
|
||||
wxMenuItem* m_pMenuItemSave;
|
||||
wxToolBarToolBase* m_pToolPlay;
|
||||
|
||||
void UpdateGUI();
|
||||
void BootGame();
|
||||
|
||||
// Double click and mouse move options
|
||||
|
@ -31,16 +31,17 @@
|
||||
#include <sys/param.h>
|
||||
#endif
|
||||
|
||||
#include "Globals.h" // Core
|
||||
#include "Host.h"
|
||||
|
||||
#include "Common.h" // Common
|
||||
#include "CPUDetect.h"
|
||||
#include "IniFile.h"
|
||||
#include "FileUtil.h"
|
||||
#include "ConsoleWindow.h"
|
||||
#include "Setup.h"
|
||||
|
||||
#include "Main.h" // Local
|
||||
#include "Host.h" // Core
|
||||
|
||||
#include "Globals.h" // Local
|
||||
#include "Main.h"
|
||||
#include "Frame.h"
|
||||
#include "ConfigManager.h"
|
||||
#include "CodeWindow.h"
|
||||
@ -458,6 +459,13 @@ void Host_UpdateStatusBar(const char* _pText, int Field)
|
||||
wxPostEvent(main_frame, event);
|
||||
}
|
||||
|
||||
#ifdef SETUP_TIMER_WAITING
|
||||
void Host_UpdateGUI()
|
||||
{
|
||||
main_frame->UpdateGUI();
|
||||
}
|
||||
#endif
|
||||
|
||||
void Host_SysMessage(const char *fmt, ...)
|
||||
{
|
||||
va_list list;
|
||||
|
Reference in New Issue
Block a user