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

Clean some DSP code, Fixes issue 4011.

Browse Source 
Move some GUI code around for no apparent reason.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6995 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
sl1nk3.s
2011-01-31 00:33:09 +00:00
parent 216cf0fd6a
commit ae7c64ec13
8 changed files with 103 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,11 +18,13 @@
#include "Common.h"
#include "Thread.h"
#include "../PluginDSP.h"
#include "../PluginManager.h"
#include "../PowerPC/PowerPC.h"
#include "../Host.h"
#include "../Core.h"
#include "CPU.h"
#include "DSP.h"
namespace
{
@ -115,12 +117,14 @@ void CCPU::EnableStepping(const bool _bStepping)
{
PowerPC::Pause();
CPluginManager::GetInstance().EmuStateChange(PLUGIN_EMUSTATE_PAUSE);
DSP::GetPlugin()->DSP_ClearAudioBuffer(true);
}
else
{
PowerPC::Start();
m_StepEvent.Set();
CPluginManager::GetInstance().EmuStateChange(PLUGIN_EMUSTATE_PLAY);
DSP::GetPlugin()->DSP_ClearAudioBuffer(false);
}
}

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

@ -133,11 +133,6 @@ void DSPHLE::DoState(PointerWrap &p)
GetUCode()->DoState(p);
}
void DSPHLE::EmuStateChange(PLUGIN_EMUSTATE newState)
{
DSP_ClearAudioBuffer((newState == PLUGIN_EMUSTATE_PLAY) ? false : true);
}
// Mailbox fuctions
unsigned short DSPHLE::DSP_ReadMailBoxHigh(bool _CPUMailbox)
{

8
Source/Core/Core/Src/HW/DSPHLE/DSPHLE.h
View File

@ -33,15 +33,7 @@ public:
virtual void Shutdown();
virtual bool IsLLE() { return false; }
/*
GUI
virtual void Config(void *_hwnd);
virtual void About(void *_hwnd);
virtual void *Debug(void *Parent, bool Show);
*/
virtual void DoState(PointerWrap &p);
virtual void EmuStateChange(PLUGIN_EMUSTATE newState);
virtual void DSP_WriteMailBoxHigh(bool _CPUMailbox, unsigned short);
virtual void DSP_WriteMailBoxLow(bool _CPUMailbox, unsigned short);

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

@ -77,11 +77,6 @@ void DSPLLE::DoState(PointerWrap &p)
p.Do(m_cycle_count);
}
void DSPLLE::EmuStateChange(PLUGIN_EMUSTATE newState)
{
DSP_ClearAudioBuffer((newState == PLUGIN_EMUSTATE_PLAY) ? false : true);
}
/* ECTORTODO
void *DllDebugger(void *_hParent, bool Show)
{

11
Source/Core/Core/Src/HW/DSPLLE/DSPLLE.h
View File

@ -29,20 +29,9 @@ public:
virtual void Initialize(void *hWnd, bool bWii, bool bDSPThread);
virtual void Shutdown();
virtual bool IsLLE() { return true; }
void SetGlobals(PLUGIN_GLOBALS* _PluginGlobals);
/*
GUI
virtual void Config(void *_hwnd);
virtual void About(void *_hwnd);
virtual void *Debug(void *Parent, bool Show);
*/
virtual void DoState(PointerWrap &p);
virtual void EmuStateChange(PLUGIN_EMUSTATE newState);
virtual void DSP_WriteMailBoxHigh(bool _CPUMailbox, unsigned short);
virtual void DSP_WriteMailBoxLow(bool _CPUMailbox, unsigned short);

9
Source/Core/Core/Src/PluginDSP.h
View File

@ -19,7 +19,6 @@
#define _PLUGINDSP_H_
#include "Plugin.h" // TODO: Only here for EmuStateChange
#include "ChunkFile.h"
class PluginDSP
@ -32,15 +31,7 @@ public:
virtual void Initialize(void *hWnd, bool bWii, bool bDSPThread) = 0;
virtual void Shutdown() = 0;
/*
GUI
virtual void Config(void *_hwnd) = 0;
virtual void About(void *_hwnd) = 0;
virtual void *Debug(void *Parent, bool Show) = 0;
*/
virtual void DoState(PointerWrap &p) = 0;
virtual void EmuStateChange(PLUGIN_EMUSTATE newState) = 0;
virtual void DSP_WriteMailBoxHigh(bool _CPUMailbox, unsigned short) = 0;
virtual void DSP_WriteMailBoxLow(bool _CPUMailbox, unsigned short) = 0;