remove MusicMod

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3657 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Core/DolphinWX/Src/BootManager.cpp

@@ -58,10 +58,6 @@
 	#include "Frame.h"
 	#include "CodeWindow.h"
 	#include "Setup.h"
-	// MusicMod
-	#ifdef MUSICMOD
-		#include "../../../Externals/MusicMod/Main/Src/Main.h"
-	#endif
 #endif
 
 
@@ -204,16 +200,6 @@ bool BootCore(const std::string& _rFilename)
 #endif
 	// =====================	
 
-
-	// =================================================================
-	// Init MusicMod
-	// ¯¯¯¯¯¯¯¯¯¯
-	#ifdef MUSICMOD
-		MusicMod::Main(StartUp.m_strFilename);
-	#endif
-	// ===================
-
-
 	return true;
 }
 

Source/Core/DolphinWX/Src/Frame.cpp

@@ -254,13 +254,6 @@ EVT_MENU(IDM_CONFIG_DSP_PLUGIN, CFrame::OnPluginDSP)
 EVT_MENU(IDM_CONFIG_PAD_PLUGIN, CFrame::OnPluginPAD)
 EVT_MENU(IDM_CONFIG_WIIMOTE_PLUGIN, CFrame::OnPluginWiimote)
 
-#ifdef MUSICMOD
-EVT_MENU(IDM_MUTE, CFrame::MM_OnMute)
-EVT_MENU(IDM_MUSIC_PLAY, CFrame::MM_OnPause)
-EVT_COMMAND_SCROLL(IDM_VOLUME, CFrame::MM_OnVolume)
-//EVT_MENU(IDM_MM_LOG, CFrame::MM_OnLog)
-#endif
-
 #if defined(HAVE_SFML) && HAVE_SFML
 EVT_MENU(IDM_NETPLAY, CFrame::OnNetPlay)
 #endif
@@ -354,12 +347,6 @@ CFrame::CFrame(bool showLogWindow,
 	ConsoleListener *console = LogManager::GetInstance()->getConsoleListener();
 	if (SConfig::GetInstance().m_InterfaceConsole)
 		console->Open();
-	//////////////////////////////////////////
-	// Init MusicMod and the console window in the dll
-	#ifdef MUSICMOD
-		MM_OnLog(SConfig::GetInstance().m_InterfaceConsole);
-	#endif
-	//////////////////////////////////////////
 
 	// This panel is the parent for rendering and it holds the gamelistctrl
 	//m_Panel = new wxPanel(this, IDM_MPANEL);

Source/Core/DolphinWX/Src/Frame.h

@@ -100,22 +100,6 @@ class CFrame : public wxFrame
 
 		char **drives;
 
-		//////////////////////////////////////////////////////////////////////////////////////
-		// Music mod
-		// ¯¯¯¯¯¯¯¯¯¯
-		#ifdef MUSICMOD
-			wxToolBarToolBase* mm_ToolMute, * mm_ToolPlay, * mm_ToolLog;
-			wxSlider * mm_Slider;
-
-			void MM_UpdateGUI(); void MM_PopulateGUI(); void MM_InitBitmaps(int Theme);
-			void MM_OnPlay(); void MM_OnStop();
-			void MM_OnMute(wxCommandEvent& event);
-			void MM_OnPause(wxCommandEvent& event);
-			void MM_OnVolume(wxScrollEvent& event);
-			void MM_OnLog(bool);
-		#endif
-		///////////////////////////////////
-
 		enum EToolbar
 		{
 			Toolbar_FileOpen,
@@ -132,11 +116,6 @@ class CFrame : public wxFrame
 			Toolbar_PluginPAD,
 			Toolbar_Wiimote,			
 			Toolbar_Help,
-
-			#ifdef MUSICMOD  // Music modification
-				Toolbar_Log, Toolbar_PluginDSP_Dis, Toolbar_Log_Dis,
-			#endif
-
 			EToolbar_Max
 		};
 

Source/Core/DolphinWX/Src/FrameTools.cpp

@@ -256,13 +256,6 @@ void CFrame::PopulateToolbar(wxToolBar* toolBar)
 	toolBar->AddSeparator();
 	toolBar->AddTool(IDM_HELPABOUT, _T("About"), m_Bitmaps[Toolbar_Help], _T("About Dolphin"));
 
-
-	// Music mod
-	#ifdef MUSICMOD
-		MM_PopulateGUI();
-	#endif
-
-
 	// after adding the buttons to the toolbar, must call Realize() to reflect
 	// the changes
 	toolBar->Realize();
@@ -383,12 +376,6 @@ void CFrame::InitBitmaps()
 	default: PanicAlert("Theme selection went wrong");
 	}
 
-	// Music modification
-	#ifdef MUSICMOD
-		MM_InitBitmaps(Theme);
-	#endif
-
-
 	// Update in case the bitmap has been updated
 	if (GetToolBar() != NULL)
 		RecreateToolbar();
@@ -398,11 +385,6 @@ void CFrame::InitBitmaps()
 // Start the game or change the disc
 void CFrame::BootGame()
 {
-	// Music modification
-	#ifdef MUSICMOD
-		MM_OnPlay();
-	#endif
-
 	// Rerecording
 	#ifdef RERECORDING
 		Core::RerecordingStart();
@@ -529,11 +511,6 @@ void CFrame::OnScreenshot(wxCommandEvent& WXUNUSED (event))
 // Stop the emulation
 void CFrame::DoStop()
 {
-	// Music modification
-	#ifdef MUSICMOD
-		MM_OnStop();
-	#endif
-
 	// Rerecording
 	#ifdef RERECORDING
 		Core::RerecordingStop();
@@ -815,11 +792,6 @@ void CFrame::ToggleConsole(bool check)
 	else
 		console->Close();
 
-	// Music mod
-	#ifdef MUSICMOD
-		MM_OnLog(SConfig::GetInstance().m_InterfaceConsole);
-	#endif
-
 	// Make sure the check is updated (if wxw isn't calling this func)
 	GetMenuBar()->FindItem(IDM_TOGGLE_CONSOLE)->Check(check);
 }
@@ -827,10 +799,6 @@ void CFrame::ToggleConsole(bool check)
 // Update the enabled/disabled status
 void CFrame::UpdateGUI()
 {
-	#ifdef MUSICMOD
-		MM_UpdateGUI();
-	#endif
-
 	// Save status
 	bool initialized = Core::isRunning();
 	bool running = Core::GetState() == Core::CORE_RUN;

Source/Core/DolphinWX/Src/Globals.h

@@ -80,17 +80,6 @@ enum
 	IDM_HELPWEBSITE,
 	IDM_HELPGOOGLECODE,
 
-	//////////////////////////////////////////////////////
-	// Music modification
-	// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
-	#ifdef MUSICMOD 
-		IDM_MUTE,
-		IDM_MUSIC_PLAY,
-		IDM_VOLUME, IDM_VOLUME_LABEL, IDM_VOLUME_PANEL,
-		IDM_MM_LOG,
-	#endif
-	//////////////////////////////////////////////////////
-
 	IDM_CONFIG_MAIN,
 	IDM_CONFIG_GFX_PLUGIN,
 	IDM_CONFIG_DSP_PLUGIN,