diff --git a/Source/Core/Common/Src/Setup.h b/Source/Core/Common/Src/Setup.h index 0b9ed0a3fe..c32b5fe959 100644 --- a/Source/Core/Common/Src/Setup.h +++ b/Source/Core/Common/Src/Setup.h @@ -57,9 +57,6 @@ // Build with playback rerecording options //#define RERECORDING -// Build with music modification -//#define MUSICMOD - // ----------------------------------------------------------------------------------------------------- #endif // _SETUP_H_ diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp index c242a3e079..62bdb4ef01 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp @@ -29,13 +29,6 @@ #include "Filesystem.h" -// Music mod -#include "Setup.h" // Define MUSICMOD here -#ifdef MUSICMOD -#include "../../../../Externals/MusicMod/Main/Src/Main.h" -#endif - - CWII_IPC_HLE_Device_di::CWII_IPC_HLE_Device_di(u32 _DeviceID, const std::string& _rDeviceName ) : IWII_IPC_HLE_Device(_DeviceID, _rDeviceName) , m_pVolume(NULL) @@ -245,11 +238,6 @@ u32 CWII_IPC_HLE_Device_di::ExecuteCommand(u32 _BufferIn, u32 _BufferInSize, u32 PanicAlert("Cant read from DVD_Plugin - DVD-Interface: Fatal Error"); } - #ifdef MUSICMOD - std::string Tmp = pFilename; - MusicMod::CheckFile(Tmp); - #endif - return 1; } break; diff --git a/Source/Core/DolphinWX/Src/BootManager.cpp b/Source/Core/DolphinWX/Src/BootManager.cpp index 3ea75aae0d..f3f692e585 100644 --- a/Source/Core/DolphinWX/Src/BootManager.cpp +++ b/Source/Core/DolphinWX/Src/BootManager.cpp @@ -57,10 +57,7 @@ #include "ConfigMain.h" #include "Frame.h" #include "CodeWindow.h" - #include "Setup.h" - #ifdef MUSICMOD - #include "../../../Externals/MusicMod/Main/Src/Main.h" // MusicMod - #endif + #include "Setup.h" #endif @@ -200,17 +197,7 @@ bool BootCore(const std::string& _rFilename) #else Core::SetState(Core::CORE_RUN); #endif - // ===================== - - - // ================================================================= - // Music mod - // ¯¯¯¯¯¯¯¯¯¯ - #ifdef MUSICMOD - MusicMod::Main(StartUp.m_strFilename); - #endif - // =================== - + // ===================== return true; } diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index 840bf3ec9f..e40d8e328f 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -256,13 +256,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(IDS_VOLUME, CFrame::MM_OnVolume) -EVT_MENU(IDT_LOG, CFrame::MM_OnLog) -#endif - EVT_MENU(IDM_BROWSE, CFrame::OnBrowse) EVT_MENU(IDM_MEMCARD, CFrame::OnMemcard) EVT_MENU(IDM_CHEATS, CFrame::OnShow_CheatsWindow) diff --git a/Source/Core/DolphinWX/Src/Frame.h b/Source/Core/DolphinWX/Src/Frame.h index b5d1f9f912..7a2b0bfa55 100644 --- a/Source/Core/DolphinWX/Src/Frame.h +++ b/Source/Core/DolphinWX/Src/Frame.h @@ -108,23 +108,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(wxCommandEvent& event); - #endif - /////////////////////////////////// - - enum EToolbar { Toolbar_FileOpen, @@ -142,10 +125,6 @@ class CFrame : public wxFrame Toolbar_Wiimote, Toolbar_Help, - #ifdef MUSICMOD // Music modification - Toolbar_Log, Toolbar_PluginDSP_Dis, Toolbar_Log_Dis, - #endif - EToolbar_Max }; diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 43ca8f0839..205c1b9bf4 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -238,16 +238,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(); @@ -367,14 +357,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(); @@ -386,11 +368,6 @@ void CFrame::InitBitmaps() // ------------- void CFrame::BootGame() { - // Music modification - #ifdef MUSICMOD - MM_OnPlay(); - #endif - // Rerecording #ifdef RERECORDING Core::RerecordingStart(); @@ -567,11 +544,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(); @@ -808,10 +780,6 @@ void CFrame::ToggleConsole(bool check) // Update the enabled/disabled status void CFrame::UpdateGUI() { - #ifdef MUSICMOD - MM_UpdateGUI(); - #endif - // Save status bool initialized = Core::GetState() != Core::CORE_UNINITIALIZED; bool running = Core::GetState() == Core::CORE_RUN; diff --git a/Source/Core/DolphinWX/Src/Globals.h b/Source/Core/DolphinWX/Src/Globals.h index 89a8c67a5f..fdf0e002f7 100644 --- a/Source/Core/DolphinWX/Src/Globals.h +++ b/Source/Core/DolphinWX/Src/Globals.h @@ -76,13 +76,6 @@ enum IDM_HELPWEBSITE, IDM_HELPGOOGLECODE, - #ifdef MUSICMOD // Music modification - IDM_MUTE, - IDM_MUSIC_PLAY, - IDS_VOLUME, IDS_VOLUME_LABEL, IDS_VOLUME_PANEL, - IDT_LOG, - #endif - IDM_CONFIG_MAIN, IDM_CONFIG_GFX_PLUGIN, IDM_CONFIG_DSP_PLUGIN,