piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-31 01:59:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

remove MusicMod

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3657 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman
2009-07-03 03:26:23 +00:00
parent 518d3854ba
commit 7e8a2fc136
125 changed files with 3 additions and 26571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Common/Src/Setup.h
View File

@ -57,9 +57,6 @@
// Build with playback rerecording options
//#define RERECORDING
// Build with music modification
//#define MUSICMOD
// -----------------------------------------------------------------------------------------------------
#endif // _SETUP_H_

11
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp
View File

@ -29,12 +29,6 @@
#include "VolumeCreator.h"
#include "Filesystem.h"
// Music mod
#include "Setup.h" // Define MUSICMOD here
#ifdef MUSICMOD
#include "../../../../Externals/MusicMod/Main/Src/Main.h"
#endif
using namespace DVDInterface;
@ -228,11 +222,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
}
break;

5
Source/Core/DiscIO/Src/FileSystemGCWii.h
View File

@ -37,12 +37,11 @@ public:
virtual bool ExportFile(const char* _rFullPath, const char* _rExportFilename) const;
virtual bool ExportAllFiles(const char* _rFullPath) const;
std::vector <SFileInfo> m_FileInfoVector; // Public for the music modification
private:
private:
bool m_Initialized;
u32 m_OffsetShift; // WII offsets are all shifted
std::vector <SFileInfo> m_FileInfoVector;
u32 Read32(u64 _Offset) const;
virtual size_t GetFileList(std::vector<const SFileInfo *> &_rFilenames) const;
void GetStringFromOffset(u64 _Offset, char* Filename) const;

16
Source/Core/DiscIO/Src/VolumeGC.cpp
View File

@ -20,14 +20,6 @@
#include "VolumeGC.h"
#include "StringUtil.h"
//////////////////////////////////////////////////
// Music mod
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#include "Setup.h" // Define MUSICMOD here
#ifdef MUSICMOD
#include "../../../../Externals/MusicMod/Main/Src/Main.h"
#endif
///////////////////////
namespace DiscIO
{
@ -45,13 +37,7 @@ bool CVolumeGC::Read(u64 _Offset, u64 _Length, u8* _pBuffer) const
{
if (m_pReader == NULL)
return false;
//////////////////////////////////////////////////
// Music mod
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#ifdef MUSICMOD
MusicMod::FindFilename(_Offset, _Length);
#endif
///////////////////////
return m_pReader->Read(_Offset, _Length, _pBuffer);
}

14
Source/Core/DolphinWX/Src/BootManager.cpp
View File

@ -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
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#ifdef MUSICMOD
MusicMod::Main(StartUp.m_strFilename);
#endif
// ===================
return true;
}

13
Source/Core/DolphinWX/Src/Frame.cpp
View File

@ -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);

21
Source/Core/DolphinWX/Src/Frame.h
View File

@ -100,22 +100,6 @@ class CFrame : public wxFrame
char **drives;
//////////////////////////////////////////////////////////////////////////////////////
// Music mod
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#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
};

32
Source/Core/DolphinWX/Src/FrameTools.cpp
View File

@ -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;

11
Source/Core/DolphinWX/Src/Globals.h
View File

@ -80,17 +80,6 @@ enum
IDM_HELPWEBSITE,
IDM_HELPGOOGLECODE,
//////////////////////////////////////////////////////
// Music modification
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#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,