From 5fb56318edeaaad0727c2c1f008b0e5980299cb6 Mon Sep 17 00:00:00 2001
From: Glenn Rice <glennricster@gmail.com>
Date: Mon, 31 Jan 2011 05:19:29 +0000
Subject: [PATCH] Revert 7008 until I have time to figure out how to do that
 without including wxWidgets in the core.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7009 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/Core/Src/HW/DSPLLE/DSPHost.cpp | 14 ++++++++----
 Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp  | 26 +++++++++++++++++-----
 Source/Core/Core/Src/HW/DSPLLE/DSPLLE.h    |  1 -
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPHost.cpp b/Source/Core/Core/Src/HW/DSPLLE/DSPHost.cpp
index 75d74028ac..fa9341159b 100644
--- a/Source/Core/Core/Src/HW/DSPLLE/DSPHost.cpp
+++ b/Source/Core/Core/Src/HW/DSPLLE/DSPHost.cpp
@@ -24,10 +24,15 @@
 #include "../../ConfigManager.h"
 #include "../../PowerPC/PowerPC.h"
 
+/*
+ECTORTODO
 #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;
+
 #endif
+*/
 
 // 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
@@ -98,19 +103,20 @@ u32 DSPHost_CodeLoaded(const u8 *ptr, int size)
 
 	// Always add the ROM.
 	DSPSymbols::AutoDisassembly(0x8000, 0x9000);
-
+	/* ECTORTODO
 #if defined(HAVE_WX) && HAVE_WX
 	if (m_DebuggerFrame)
 		m_DebuggerFrame->Refresh();
 #endif
-
+		*/
 	return ector_crc;
 }
 
 void DSPHost_UpdateDebugger()
 {
+	/* ECTORTODO
 #if defined(HAVE_WX) && HAVE_WX
 	if (m_DebuggerFrame)
 		m_DebuggerFrame->Refresh();
-#endif
+#endif */
 }
diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp
index c94881c32d..3b217dea70 100644
--- a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp
+++ b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp
@@ -31,10 +31,6 @@
 #include "DSP/disassemble.h"
 #include "DSPSymbols.h"
 
-#if defined HAVE_WX && HAVE_WX
-#include "DSPDebugWindow.h"
-#endif
-
 #include "AudioCommon.h"
 #include "Mixer.h"
 
@@ -81,6 +77,19 @@ void DSPLLE::DoState(PointerWrap &p)
 	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
 void DSPLLE::dsp_thread(DSPLLE *lpParameter)
 {
@@ -100,6 +109,7 @@ void DSPLLE::dsp_thread(DSPLLE *lpParameter)
 	}
 }
 
+/* ECTORTODO
 void DSPLLE::DSP_DebugBreak()
 {
 #if defined(HAVE_WX) && HAVE_WX
@@ -107,6 +117,7 @@ void DSPLLE::DSP_DebugBreak()
 	//  	m_DebuggerFrame->DebugBreak();
 #endif
 }
+*/
 
 void DSPLLE::Initialize(void *hWnd, bool bWii, bool bDSPThread)
 {
@@ -146,12 +157,17 @@ void DSPLLE::Initialize(void *hWnd, bool bWii, bool bDSPThread)
 	InitInstructionTable();
 
 	if (m_bDSPThread)
+	{
+//		m_hDSPThread = new Common::Thread(dsp_thread, (void *)this);
 		m_hDSPThread = std::thread(dsp_thread, this);
-
+	}
+/*
+ECTORTODO
 #if defined(HAVE_WX) && HAVE_WX
 	if (m_DebuggerFrame)
 		m_DebuggerFrame->Refresh();
 #endif
+		*/
 }
 
 void DSPLLE::DSP_StopSoundStream()
diff --git a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.h b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.h
index 76cd9decb2..c41cf951e2 100644
--- a/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.h
+++ b/Source/Core/Core/Src/HW/DSPLLE/DSPLLE.h
@@ -43,7 +43,6 @@ public:
 	virtual void DSP_Update(int cycles);
 	virtual void DSP_StopSoundStream();
 	virtual void DSP_ClearAudioBuffer(bool mute);
-	void DSP_DebugBreak();
 
 private:
 	static void dsp_thread(DSPLLE* lpParameter);