mirrors/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-01 02:21:26 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert 7008 until I have time to figure out how to do that without including wxWidgets in the core.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7009 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2011-01-31 05:19:29 +00:00
parent bbe8675923
commit 5fb56318ed
3 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/Core/Src/HW/DSPLLE/DSPHost.cpp
View File

@ -24,10 +24,15 @@
#include "../../ConfigManager.h" #include "../../ConfigManager.h"
#include "../../PowerPC/PowerPC.h" #include "../../PowerPC/PowerPC.h"
/*
ECTORTODO
#if defined(HAVE_WX) && HAVE_WX #if defined(HAVE_WX) && HAVE_WX
#include "DSPDebugWindow.h" // For the DSPDebuggerLLE class
#include "Debugger/DSPDebugWindow.h" // For the DSPDebuggerLLE class
extern DSPDebuggerLLE* m_DebuggerFrame; extern DSPDebuggerLLE* m_DebuggerFrame;
#endif #endif
*/
// The user of the DSPCore library must supply a few functions so that the // The user of the DSPCore library must supply a few functions so that the
// emulation core can access the environment it runs in. If the emulation // emulation core can access the environment it runs in. If the emulation
@ -98,19 +103,20 @@ u32 DSPHost_CodeLoaded(const u8 *ptr, int size)
// Always add the ROM. // Always add the ROM.
DSPSymbols::AutoDisassembly(0x8000, 0x9000); DSPSymbols::AutoDisassembly(0x8000, 0x9000);
/* ECTORTODO
#if defined(HAVE_WX) && HAVE_WX #if defined(HAVE_WX) && HAVE_WX
if (m_DebuggerFrame) if (m_DebuggerFrame)
m_DebuggerFrame->Refresh(); m_DebuggerFrame->Refresh();
#endif #endif
*/
return ector_crc; return ector_crc;
} }
void DSPHost_UpdateDebugger() void DSPHost_UpdateDebugger()
{ {
/* ECTORTODO
#if defined(HAVE_WX) && HAVE_WX #if defined(HAVE_WX) && HAVE_WX
if (m_DebuggerFrame) if (m_DebuggerFrame)
m_DebuggerFrame->Refresh(); m_DebuggerFrame->Refresh();
#endif #endif */
} }

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

@ -31,10 +31,6 @@
#include "DSP/disassemble.h" #include "DSP/disassemble.h"
#include "DSPSymbols.h" #include "DSPSymbols.h"
#if defined HAVE_WX && HAVE_WX
#include "DSPDebugWindow.h"
#endif
#include "AudioCommon.h" #include "AudioCommon.h"
#include "Mixer.h" #include "Mixer.h"
@ -81,6 +77,19 @@ void DSPLLE::DoState(PointerWrap &p)
p.Do(m_cycle_count); p.Do(m_cycle_count);
} }
/* ECTORTODO
void *DllDebugger(void *_hParent, bool Show)
{
#if defined(HAVE_WX) && HAVE_WX
m_DebuggerFrame = new DSPDebuggerLLE((wxWindow *)_hParent);
return (void *)m_DebuggerFrame;
#else
return NULL;
#endif
}
*/
// Regular thread // Regular thread
void DSPLLE::dsp_thread(DSPLLE *lpParameter) void DSPLLE::dsp_thread(DSPLLE *lpParameter)
{ {
@ -100,6 +109,7 @@ void DSPLLE::dsp_thread(DSPLLE *lpParameter)
} }
} }
/* ECTORTODO
void DSPLLE::DSP_DebugBreak() void DSPLLE::DSP_DebugBreak()
{ {
#if defined(HAVE_WX) && HAVE_WX #if defined(HAVE_WX) && HAVE_WX
@ -107,6 +117,7 @@ void DSPLLE::DSP_DebugBreak()
// m_DebuggerFrame->DebugBreak(); // m_DebuggerFrame->DebugBreak();
#endif #endif
} }
*/
void DSPLLE::Initialize(void *hWnd, bool bWii, bool bDSPThread) void DSPLLE::Initialize(void *hWnd, bool bWii, bool bDSPThread)
{ {
@ -146,12 +157,17 @@ void DSPLLE::Initialize(void *hWnd, bool bWii, bool bDSPThread)
InitInstructionTable(); InitInstructionTable();
if (m_bDSPThread) if (m_bDSPThread)
{
// m_hDSPThread = new Common::Thread(dsp_thread, (void *)this);
m_hDSPThread = std::thread(dsp_thread, this); m_hDSPThread = std::thread(dsp_thread, this);
}
/*
ECTORTODO
#if defined(HAVE_WX) && HAVE_WX #if defined(HAVE_WX) && HAVE_WX
if (m_DebuggerFrame) if (m_DebuggerFrame)
m_DebuggerFrame->Refresh(); m_DebuggerFrame->Refresh();
#endif #endif
*/
} }
void DSPLLE::DSP_StopSoundStream() void DSPLLE::DSP_StopSoundStream()

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

@ -43,7 +43,6 @@ public:
virtual void DSP_Update(int cycles); virtual void DSP_Update(int cycles);
virtual void DSP_StopSoundStream(); virtual void DSP_StopSoundStream();
virtual void DSP_ClearAudioBuffer(bool mute); virtual void DSP_ClearAudioBuffer(bool mute);
void DSP_DebugBreak();
private: private:
static void dsp_thread(DSPLLE* lpParameter); static void dsp_thread(DSPLLE* lpParameter);