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

Remove PluginSpecs.h. Merge the few needed enums from that file into Common.h for now. I am up for suggestions on a better place for those.

Browse Source 
Fix frame dumping on linux.
Make sure that on screen messages get cleared between games.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7039 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice
2011-02-02 04:40:27 +00:00
parent ebc8f02885
commit 8b309e26dc
51 changed files with 221 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/Core/Src/Core.cpp
View File

@ -191,7 +191,7 @@ void Stop() // - Hammertime!
{
const SCoreStartupParameter& _CoreParameter = SConfig::GetInstance().m_LocalCoreStartupParameter;
g_bStopping = true;
g_video_backend->EmuStateChange(PLUGIN_EMUSTATE_STOP);
g_video_backend->EmuStateChange(EMUSTATE_CHANGE_STOP);
WARN_LOG(CONSOLE, "Stop [Main Thread]\t\t---- Shutting down ----");
@ -216,6 +216,9 @@ void Stop() // - Hammertime!
cpuRunloopQuit.Wait();
}
// Clear on screen messages that haven't expired
g_video_backend->Video_ClearMessages();
// Close the trace file
Core::StopTrace();

1
Source/Core/Core/Src/HLE/HLE_Misc.cpp
View File

@ -21,7 +21,6 @@
#include "../PowerPC/PowerPC.h"
#include "../HW/Memmap.h"
#include "PluginSpecs.h"
#include "../Host.h"
namespace HLE_Misc

4
Source/Core/Core/Src/HW/CPU.cpp
View File

@ -117,14 +117,14 @@ void CCPU::EnableStepping(const bool _bStepping)
if (_bStepping)
{
PowerPC::Pause();
g_video_backend->EmuStateChange(PLUGIN_EMUSTATE_PAUSE);
g_video_backend->EmuStateChange(EMUSTATE_CHANGE_PAUSE);
DSP::GetPlugin()->DSP_ClearAudioBuffer(true);
}
else
{
PowerPC::Start();
m_StepEvent.Set();
g_video_backend->EmuStateChange(PLUGIN_EMUSTATE_PLAY);
g_video_backend->EmuStateChange(EMUSTATE_CHANGE_PLAY);
DSP::GetPlugin()->DSP_ClearAudioBuffer(false);
}
}

2
Source/Core/Core/Src/HW/Wiimote.cpp
View File

@ -144,7 +144,7 @@ void DoState(unsigned char **ptr, int mode)
// input: newState
// output: none
//
void EmuStateChange(PLUGIN_EMUSTATE newState)
void EmuStateChange(EMUSTATE_CHANGE newState)
{
// TODO
WiimoteReal::StateChange(newState);

3
Source/Core/Core/Src/HW/Wiimote.h
View File

@ -2,7 +2,6 @@
#ifndef _WIIMOTE_H_
#define _WIIMOTE_H_
#include "PluginSpecs.h"
#include "../../InputCommon/Src/InputConfig.h"
#define MAX_WIIMOTES 4
@ -27,7 +26,7 @@ void Initialize(void* const hwnd);
unsigned int GetAttached();
void DoState(unsigned char **ptr, int mode);
void EmuStateChange(PLUGIN_EMUSTATE newState);
void EmuStateChange(EMUSTATE_CHANGE newState);
InputPlugin *GetPlugin();
void ControlChannel(int _number, u16 _channelID, const void* _pData, u32 _Size);

2
Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
View File

@ -509,7 +509,7 @@ void Update(int _WiimoteNumber)
g_refresh_critsec.Leave();
}
void StateChange(PLUGIN_EMUSTATE newState)
void StateChange(EMUSTATE_CHANGE newState)
{
//g_refresh_critsec.Enter(); // enter

2
Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h
View File

@ -108,7 +108,7 @@ void ControlChannel(int _WiimoteNumber, u16 _channelID, const void* _pData, u32
void Update(int _WiimoteNumber);
void DoState(PointerWrap &p);
void StateChange(PLUGIN_EMUSTATE newState);
void StateChange(EMUSTATE_CHANGE newState);
int FindWiimotes(Wiimote** wm, int max_wiimotes);