ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some changes to MusicMod replacing the old debugging stuff. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3174 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
death2droid 2009-05-08 07:10:26 +00:00
parent 439523163e
commit 84cd78d9c7
14 changed files with 179 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Externals/MusicMod/Main/Src/Frame.cpp vendored
View File

@ -24,7 +24,7 @@
#include "Core.h" // Core #include "Core.h" // Core
#include "IniFile.h" // Common #include "IniFile.h" // Common
#include "ConsoleWindow.h" #include "Log.h"
#include "../../../../Source/Core/DolphinWX/Src/Globals.h" // DolphinWX #include "../../../../Source/Core/DolphinWX/Src/Globals.h" // DolphinWX
#include "../../../../Source/Core/DolphinWX/Src/Frame.h" #include "../../../../Source/Core/DolphinWX/Src/Frame.h"
@ -282,7 +282,7 @@ CFrame::MM_UpdateGUI()
void void
CFrame::MM_OnPlay() CFrame::MM_OnPlay()
{ {
//Console::Print("\nCFrame::OnPlayMusicMod > Begin\n"); //INFO_LOG(AUDIO,"\nCFrame::OnPlayMusicMod > Begin\n");
// Save the volume // Save the volume
MusicMod::GlobalVolume = mm_Slider->GetValue(); MusicMod::GlobalVolume = mm_Slider->GetValue();
@ -296,7 +296,7 @@ CFrame::MM_OnPlay()
{ {
if (Core::GetState() == Core::CORE_RUN) if (Core::GetState() == Core::CORE_RUN)
{ {
//Console::Print("CFrame::OnPlayMusicMod > Pause\n"); //INFO_LOG(AUDIO,"CFrame::OnPlayMusicMod > Pause\n");
if(!MusicMod::GlobalPause) // we may has set this elsewhere if(!MusicMod::GlobalPause) // we may has set this elsewhere
{ {
MusicMod::GlobalPause = true; MusicMod::GlobalPause = true;
@ -308,7 +308,7 @@ CFrame::MM_OnPlay()
} }
else else
{ {
//Console::Print("CFrame::OnPlayMusicMod > Play\n"); //INFO_LOG(AUDIO,"CFrame::OnPlayMusicMod > Play\n");
if(MusicMod::GlobalPause) // we may has set this elsewhere if(MusicMod::GlobalPause) // we may has set this elsewhere
{ {
MusicMod::GlobalPause = false; MusicMod::GlobalPause = false;
@ -336,7 +336,7 @@ CFrame::MM_OnStop()
void void
CFrame::MM_OnMute(wxCommandEvent& WXUNUSED (event)) CFrame::MM_OnMute(wxCommandEvent& WXUNUSED (event))
{ {
//Console::Print("CFrame::OnMute > Begin\n"); //INFO_LOG(AUDIO,"CFrame::OnMute > Begin\n");
//MessageBox(0, "", "", 0); //MessageBox(0, "", "", 0);
if(!MusicMod::GlobalMute) if(!MusicMod::GlobalMute)
@ -368,7 +368,7 @@ CFrame::MM_OnMute(wxCommandEvent& WXUNUSED (event))
void void
CFrame::MM_OnPause(wxCommandEvent& WXUNUSED (event)) CFrame::MM_OnPause(wxCommandEvent& WXUNUSED (event))
{ {
Console::Print("CFrame::OnPause > Begin\n"); INFO_LOG(AUDIO,"CFrame::OnPause > Begin\n");
//MessageBox(0, "", "", 0); //MessageBox(0, "", "", 0);
if(!MusicMod::GlobalPause) if(!MusicMod::GlobalPause)
@ -399,7 +399,7 @@ CFrame::MM_OnPause(wxCommandEvent& WXUNUSED (event))
// --------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------
void CFrame::MM_OnVolume(wxScrollEvent& event) void CFrame::MM_OnVolume(wxScrollEvent& event)
{ {
//Console::Print("CFrame::OnVolume > Begin <%i>\n", event.GetPosition()); //INFO_LOG(AUDIO,"CFrame::OnVolume > Begin <%i>\n", event.GetPosition());
//MessageBox(0, "", "", 0); //MessageBox(0, "", "", 0);
//if(event.GetEventType() == wxEVT_SCROLL_PAGEUP || event.GetEventType() == wxEVT_SCROLL_PAGEDOWN) //if(event.GetEventType() == wxEVT_SCROLL_PAGEUP || event.GetEventType() == wxEVT_SCROLL_PAGEDOWN)
@ -434,7 +434,7 @@ void CFrame::MM_OnVolume(wxScrollEvent& event)
// --------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------
void CFrame::MM_OnLog(wxCommandEvent& event) void CFrame::MM_OnLog(wxCommandEvent& event)
{ {
//Console::Print("CFrame::OnLog > Begin\n"); //INFO_LOG(AUDIO,"CFrame::OnLog > Begin\n");
//MessageBox(0, "", "", 0); //MessageBox(0, "", "", 0);
if(!MusicMod::dllloaded) return; // Avoid crash if(!MusicMod::dllloaded) return; // Avoid crash

33
Externals/MusicMod/Main/Src/Main.cpp vendored
View File

@ -26,7 +26,7 @@
#include "Common.h" // Common #include "Common.h" // Common
#include "IniFile.h" #include "IniFile.h"
#include "ConsoleWindow.h" #include "Log.h"
#include "PowerPC/PowerPc.h" // Core #include "PowerPC/PowerPc.h" // Core
@ -98,7 +98,7 @@ void StructSort (std::vector <MyFilesStructure> &MyFiles)
{ {
MyFilesStructure temp; MyFilesStructure temp;
//Console::Print("StructSort > Begin\n"); //INFO_LOG(AUDIO,"StructSort > Begin\n");
for(int i = 0; i < MyFiles.size() - 1; i++) for(int i = 0; i < MyFiles.size() - 1; i++)
{ {
@ -119,7 +119,7 @@ void StructSort (std::vector <MyFilesStructure> &MyFiles)
std::cout << i << " " << MyFiles[i].path.c_str() << "#" << MyFiles[i].offset << "\n"; std::cout << i << " " << MyFiles[i].path.c_str() << "#" << MyFiles[i].offset << "\n";
} }
//Console::Print("StructSort > Done\n"); //INFO_LOG(AUDIO,"StructSort > Done\n");
} }
// ============================ // ============================
@ -129,7 +129,7 @@ void StructSort (std::vector <MyFilesStructure> &MyFiles)
// ------------------------ // ------------------------
void ShowConsole() void ShowConsole()
{ {
Console::Open(100, 2000, "MusicMod", true); // Give room for 2000 rows // Console::Open(100, 2000, "MusicMod", true); // Give room for 2000 rows
} }
void Init() void Init()
@ -153,9 +153,9 @@ void Init()
// Write version // Write version
#ifdef _M_X64 #ifdef _M_X64
Console::Print("64 bit version\n"); INFO_LOG(AUDIO,"64 bit version\n");
#else #else
Console::Print("32 bit version\n"); INFO_LOG(AUDIO,"32 bit version\n");
#endif #endif
// ----------- // -----------
@ -165,7 +165,7 @@ void Init()
// Show DLL status // Show DLL status
Player_Main(MusicMod::bShowConsole); Player_Main(MusicMod::bShowConsole);
//play_file("c:\\demo36_02.ast"); //play_file("c:\\demo36_02.ast");
//Console::Print("DLL loaded\n"); //INFO_LOG(AUDIO,"DLL loaded\n");
dllloaded = true; // Do this once dllloaded = true; // Do this once
} }
@ -202,7 +202,7 @@ void Main(std::string FileName)
LPSECURITY_ATTRIBUTES attr; LPSECURITY_ATTRIBUTES attr;
attr = NULL; attr = NULL;
MusicPath = "Music\\"; MusicPath = "Music\\";
Console::Print("Created a Music directory\n"); INFO_LOG(AUDIO,"Created a Music directory\n");
CreateDirectory(MusicPath.c_str(), attr); CreateDirectory(MusicPath.c_str(), attr);
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
} }
@ -216,7 +216,7 @@ void CheckFile(std::string File, int FileNumber)
// Do nothing if we found the same file again // Do nothing if we found the same file again
if (CurrentFile == File) return; if (CurrentFile == File) return;
//Console::Print(">>>> (%i)Current read %s <%u = %ux%i> <block %u>\n", i, CurrentFiles[i].path.c_str(), offset, CurrentFiles[i].offset, size); //INFO_LOG(AUDIO,">>>> (%i)Current read %s <%u = %ux%i> <block %u>\n", i, CurrentFiles[i].path.c_str(), offset, CurrentFiles[i].offset, size);
// Check if it's a music file // Check if it's a music file
if (CheckFileEnding(File.c_str())) if (CheckFileEnding(File.c_str()))
@ -227,7 +227,7 @@ void CheckFile(std::string File, int FileNumber)
if (CurrentPlayFile == File) return; if (CurrentPlayFile == File) return;
// Notify the user // Notify the user
Console::Print("\n >>> (%i/%i) Match %s\n\n", FileNumber, MyFiles.size(), File.c_str()); INFO_LOG(AUDIO,"\n >>> (%i/%i) Match %s\n\n", FileNumber, MyFiles.size(), File.c_str());
// Save the matched file // Save the matched file
CurrentPlayFile = File; CurrentPlayFile = File;
@ -245,7 +245,7 @@ void CheckFile(std::string File, int FileNumber)
std::string FilePath = (MusicPath + fragment); std::string FilePath = (MusicPath + fragment);
WritingFile = true; // Avoid detecting the file we are writing WritingFile = true; // Avoid detecting the file we are writing
Console::Print("Writing <%s> to <%s>\n", File.c_str(), FilePath.c_str()); INFO_LOG(AUDIO,"Writing <%s> to <%s>\n", File.c_str(), FilePath.c_str());
my_pFileSystem->ExportFile(File.c_str(), FilePath.c_str()); my_pFileSystem->ExportFile(File.c_str(), FilePath.c_str());
WritingFile = false; WritingFile = false;
@ -256,7 +256,7 @@ void CheckFile(std::string File, int FileNumber)
{ {
Player_Play((char*)FilePath.c_str()); // retype it from const char* to char* Player_Play((char*)FilePath.c_str()); // retype it from const char* to char*
} else { } else {
Console::Print("Warning > Music DLL is not loaded"); INFO_LOG(AUDIO,"Warning > Music DLL is not loaded");
} }
// --------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------
@ -266,9 +266,9 @@ void CheckFile(std::string File, int FileNumber)
{ {
if(!remove(CurrentPlayFilePath.c_str())) if(!remove(CurrentPlayFilePath.c_str()))
{ {
Console::Print("The program failed to remove <%s>\n", CurrentPlayFilePath.c_str()); INFO_LOG(AUDIO,"The program failed to remove <%s>\n", CurrentPlayFilePath.c_str());
} else { } else {
Console::Print("The program removed <%s>\n", CurrentPlayFilePath.c_str()); INFO_LOG(AUDIO,"The program removed <%s>\n", CurrentPlayFilePath.c_str());
} }
} }
@ -279,7 +279,7 @@ void CheckFile(std::string File, int FileNumber)
} }
// Tell the user about the files we ignored // Tell the user about the files we ignored
Console::Print("(%i/%i) Ignored %s\n", FileNumber, MyFiles.size(), File.c_str()); INFO_LOG(AUDIO,"(%i/%i) Ignored %s\n", FileNumber, MyFiles.size(), File.c_str());
// Update the current file // Update the current file
CurrentFile = File; CurrentFile = File;
@ -297,9 +297,10 @@ void FindFilename(u64 offset, u64 size)
2. Not if offset = 0. 2. Not if offset = 0.
3. Not when WritingFile. We will lead to calls back to here (Read) and it will mess 3. Not when WritingFile. We will lead to calls back to here (Read) and it will mess
upp the scanning */ upp the scanning */
if(PowerPC::state == PowerPC::CPUState::CPU_RUNNING && offset != 0 && !WritingFile) if(PowerPC::GetState() == PowerPC::CPUState::CPU_RUNNING && offset != 0 && !WritingFile)
{ {
////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////
/* Get the filename. Here we go through all files until we come to the file that has /* Get the filename. Here we go through all files until we come to the file that has
the matching offset. Before MyFiles has data this loop will go nowhere. We have to the matching offset. Before MyFiles has data this loop will go nowhere. We have to

22
Externals/MusicMod/Player/Src/Config.cpp vendored
View File

@ -34,7 +34,7 @@ const TCHAR * SECTION = TEXT( "Plainamp" );
ConfVar::ConfVar( TCHAR * szKey, ConfMode mode ) ConfVar::ConfVar( TCHAR * szKey, ConfMode mode )
{ {
// MessageBox( 0, TEXT( "no const @ ConfVar" ), TEXT( "" ), 0 ); // MessageBox( 0, TEXT( "no const @ ConfVar" ), TEXT( "" ), 0 );
//Console::Print("ConfVar::ConfVar(TCHAR) > Got <%s>\n", szKey); //INFO_LOG(AUDIO,"ConfVar::ConfVar(TCHAR) > Got <%s>\n", szKey);
// Init // Init
const int iLen = ( int )_tcslen( szKey ); const int iLen = ( int )_tcslen( szKey );
@ -59,7 +59,7 @@ ConfVar::ConfVar( TCHAR * szKey, ConfMode mode )
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
ConfVar::ConfVar( const TCHAR * szKey, ConfMode mode ) ConfVar::ConfVar( const TCHAR * szKey, ConfMode mode )
{ {
//Console::Print("ConfVar::ConfVar(const TCHAR) > Got <%s>\n", szKey); //INFO_LOG(AUDIO,"ConfVar::ConfVar(const TCHAR) > Got <%s>\n", szKey);
// Init // Init
m_szKey = ( TCHAR * )szKey; m_szKey = ( TCHAR * )szKey;
@ -73,7 +73,7 @@ ConfVar::ConfVar( const TCHAR * szKey, ConfMode mode )
if( !conf_map ) conf_map = new map<TCHAR *, ConfVar *>; if( !conf_map ) conf_map = new map<TCHAR *, ConfVar *>;
conf_map->insert( pair<TCHAR *, ConfVar *>( m_szKey, this ) ); conf_map->insert( pair<TCHAR *, ConfVar *>( m_szKey, this ) );
//Console::Print("ConfVar::ConfVar(const TCHAR) > Insert <%s>\n", ConfVar::m_szKey); //INFO_LOG(AUDIO,"ConfVar::ConfVar(const TCHAR) > Insert <%s>\n", ConfVar::m_szKey);
} }
@ -96,7 +96,7 @@ ConfVar::~ConfVar()
ConfBool::ConfBool( bool * pbData, TCHAR * szKey, ConfMode mode, bool bDefault ) : ConfVar( szKey, mode ) ConfBool::ConfBool( bool * pbData, TCHAR * szKey, ConfMode mode, bool bDefault ) : ConfVar( szKey, mode )
{ {
// MessageBox( 0, TEXT( "no const @ ConfBool" ), TEXT( "" ), 0 ); // MessageBox( 0, TEXT( "no const @ ConfBool" ), TEXT( "" ), 0 );
//Console::Print("ConfBool(TCHAR) > Get <%s>\n", szKey); //INFO_LOG(AUDIO,"ConfBool(TCHAR) > Get <%s>\n", szKey);
m_pbData = pbData; m_pbData = pbData;
m_bDefault = bDefault; m_bDefault = bDefault;
@ -112,7 +112,7 @@ ConfBool::ConfBool( bool * pbData, TCHAR * szKey, ConfMode mode, bool bDefault )
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
ConfBool::ConfBool( bool * pbData, const TCHAR * szKey, ConfMode mode, bool bDefault ) : ConfVar( szKey, mode ) ConfBool::ConfBool( bool * pbData, const TCHAR * szKey, ConfMode mode, bool bDefault ) : ConfVar( szKey, mode )
{ {
//Console::Print("ConfBool(TCHAR) > Get <%s>\n", szKey); //INFO_LOG(AUDIO,"ConfBool(TCHAR) > Get <%s>\n", szKey);
m_pbData = pbData; m_pbData = pbData;
m_bDefault = bDefault; m_bDefault = bDefault;
@ -127,7 +127,7 @@ ConfBool::ConfBool( bool * pbData, const TCHAR * szKey, ConfMode mode, bool bDef
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
void ConfBool::Read() void ConfBool::Read()
{ {
//Console::Print("ConfBool::Read() > Begin <m_bRead:%i> and <szIniPath:%s>\n", m_bRead, szIniPath); //INFO_LOG(AUDIO,"ConfBool::Read() > Begin <m_bRead:%i> and <szIniPath:%s>\n", m_bRead, szIniPath);
if( m_bRead || !szIniPath ) return; if( m_bRead || !szIniPath ) return;
@ -507,13 +507,13 @@ ConfString::ConfString( TCHAR * szData, const TCHAR * szKey, ConfMode mode, TCHA
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
void ConfString::Read() void ConfString::Read()
{ {
//Console::Print( "ConfString::Read() > Begin\n"); //INFO_LOG(AUDIO, "ConfString::Read() > Begin\n");
if( m_bRead || !szIniPath ) return; if( m_bRead || !szIniPath ) return;
GetPrivateProfileString( SECTION, m_szKey, m_szDefault, m_szData, m_iMaxLen, szIniPath ); GetPrivateProfileString( SECTION, m_szKey, m_szDefault, m_szData, m_iMaxLen, szIniPath );
//Console::Print( "ConfString::Read() > GetPrivateProfileString <%s> <%s> <%s>\n", m_szKey, m_szData, szIniPath); //INFO_LOG(AUDIO, "ConfString::Read() > GetPrivateProfileString <%s> <%s> <%s>\n", m_szKey, m_szData, szIniPath);
m_bRead = true; m_bRead = true;
} }
@ -567,7 +567,7 @@ void ConfCurDir::Read()
// Apply // Apply
//SetCurrentDirectory( m_szData ); //SetCurrentDirectory( m_szData );
//Console::Print("ConfCurDir::Read > End <%s>\n", m_szData); //INFO_LOG(AUDIO,"ConfCurDir::Read > End <%s>\n", m_szData);
} }
// ============================================================================== // ==============================================================================
@ -581,7 +581,7 @@ void ConfCurDir::Write()
GetCurrentDirectory( MAX_PATH, m_szData ); // Note: without trailing slash GetCurrentDirectory( MAX_PATH, m_szData ); // Note: without trailing slash
// MessageBox( 0, m_szData, TEXT( "CurDir" ), 0 ); // MessageBox( 0, m_szData, TEXT( "CurDir" ), 0 );
//Console::Print("ConfCurDir::Read <%s>\n", m_szData); //INFO_LOG(AUDIO,"ConfCurDir::Read <%s>\n", m_szData);
ConfString::Write(); ConfString::Write();
} }
@ -645,7 +645,7 @@ void Conf::Init()
//_sntprintf( szIniPath, _MAX_PATH, TEXT( "%s%s%s" ), szDrive, szDir, fd.cFileName ); //_sntprintf( szIniPath, _MAX_PATH, TEXT( "%s%s%s" ), szDrive, szDir, fd.cFileName );
_sntprintf( szIniPath, _MAX_PATH, TEXT( "%s%s%s" ), szDrive, szDir, TEXT( "Plainamp.ini" ) ); _sntprintf( szIniPath, _MAX_PATH, TEXT( "%s%s%s" ), szDrive, szDir, TEXT( "Plainamp.ini" ) );
Console::Print("DLL > Ini path <%s>\n", szIniPath); INFO_LOG(AUDIO,"DLL > Ini path <%s>\n", szIniPath);
// ======================================================================================= // =======================================================================================

2
Externals/MusicMod/Player/Src/Global.h vendored
View File

@ -22,7 +22,7 @@
////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////
// Include // Include
// ¯¯¯¯¯¯¯¯¯¯ // ¯¯¯¯¯¯¯¯¯¯
#include "../../../../Source/Core/Common/Src/ConsoleWindow.h" // Global common #include "../../../../Source/Core/Common/Src/Log.h" // Global common
///////////////////////// /////////////////////////

2
Externals/MusicMod/Player/Src/InputPlugin.cpp vendored
View File

@ -37,7 +37,7 @@ InputPlugin::InputPlugin( TCHAR * szDllpath, bool bKeepLoaded ) : Plugin( szDllp
iFiltersLen = 0; iFiltersLen = 0;
plugin = NULL; plugin = NULL;
//Console::Print("\InputPlugin::InputPlugin > Begin\n"); //INFO_LOG(AUDIO,"\InputPlugin::InputPlugin > Begin\n");
if( !Load() ) if( !Load() )
{ {

2
Externals/MusicMod/Player/Src/Main.cpp vendored
View File

@ -371,7 +371,7 @@ LRESULT CALLBACK WndprocMain( HWND hwnd, UINT message, WPARAM wp, LPARAM lp )
static bool bRemoveIcon = false; static bool bRemoveIcon = false;
#ifdef NOGUI #ifdef NOGUI
//Console::Print("DLL > Main.cpp:WndprocMain() was called. But nothing will be done. \n"); //INFO_LOG(AUDIO,"DLL > Main.cpp:WndprocMain() was called. But nothing will be done. \n");
#else #else
Console::Append( TEXT( "Main.cpp:WndprocMain was called" ) ); Console::Append( TEXT( "Main.cpp:WndprocMain was called" ) );
#endif #endif

2
Externals/MusicMod/Player/Src/Output.cpp vendored
View File

@ -266,7 +266,7 @@ void Output_SetVolume( int volume )
//_stprintf( szBuffer, TEXT( "DLL > Output_SetVolume <%i>" ), volume ); //_stprintf( szBuffer, TEXT( "DLL > Output_SetVolume <%i>" ), volume );
//Console::Append( szBuffer ); //Console::Append( szBuffer );
//Console::Append( TEXT( " " ) ); //Console::Append( TEXT( " " ) );
//Console::Print( "DLL > Output_SetVolume <%i>\n", volume ); //INFO_LOG(AUDIO, "DLL > Output_SetVolume <%i>\n", volume );
// ======================================================================================= // =======================================================================================
for( int i = 0; i < active_output_count; i++ ) for( int i = 0; i < active_output_count; i++ )

4
Externals/MusicMod/Player/Src/OutputPlugin.cpp vendored
View File

@ -248,7 +248,7 @@ bool OutputPlugin::Config( HWND hParent )
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
bool OutputPlugin::Start() bool OutputPlugin::Start()
{ {
//Console::Print( "OutputPlugin::Start() > Begin <IsLoaded():%i> <bActive:%i> <active_output_count:%i>\n", //INFO_LOG(AUDIO, "OutputPlugin::Start() > Begin <IsLoaded():%i> <bActive:%i> <active_output_count:%i>\n",
// IsLoaded(), bActive, active_output_count ); // IsLoaded(), bActive, active_output_count );
if( !IsLoaded() ) return false; if( !IsLoaded() ) return false;
@ -275,7 +275,7 @@ bool OutputPlugin::Start()
Console::Append( szBuffer ); Console::Append( szBuffer );
Console::Append( TEXT( " " ) ); Console::Append( TEXT( " " ) );
#else #else
Console::Print( "\n >>> Output plugin '%s' activated\n\n" , GetFilename() ); INFO_LOG(AUDIO, "\n >>> Output plugin '%s' activated\n\n" , GetFilename() );
#endif #endif
bActive = true; bActive = true;

24
Externals/MusicMod/Player/Src/Playback.cpp vendored
View File

@ -60,14 +60,14 @@ void EnableTimer( bool bEnabled )
if( bEnabled ) if( bEnabled )
{ {
SetTimer( WindowMain, TIMER_SEEK_UPDATE, 1000, NULL ); SetTimer( WindowMain, TIMER_SEEK_UPDATE, 1000, NULL );
Console::Print( "EnableTimer > Activated\n" ); INFO_LOG(AUDIO, "EnableTimer > Activated\n" );
} }
else else
{ {
KillTimer( WindowMain, TIMER_SEEK_UPDATE ); KillTimer( WindowMain, TIMER_SEEK_UPDATE );
StatusReset(); StatusReset();
Console::Print( "EnableTimer > Killed\n" ); INFO_LOG(AUDIO, "EnableTimer > Killed\n" );
} }
bTimerRunning = bEnabled; bTimerRunning = bEnabled;
@ -82,7 +82,7 @@ bool OpenPlay( TCHAR * szFilename, int iNumber )
{ {
// ======================================================================================= // =======================================================================================
#ifdef NOGUI #ifdef NOGUI
//Console::Print( "Playback.cpp: OpenPlay > Begin <%i> <%s>\n" , iNumber, szFilename ); //INFO_LOG(AUDIO, "Playback.cpp: OpenPlay > Begin <%i> <%s>\n" , iNumber, szFilename );
#else #else
TCHAR sszBuffer[ 5000 ]; TCHAR sszBuffer[ 5000 ];
_stprintf( sszBuffer, TEXT( "Playback.cpp: OpenPlay was called <%i> <%s>" ), iNumber, szFilename ); _stprintf( sszBuffer, TEXT( "Playback.cpp: OpenPlay was called <%i> <%s>" ), iNumber, szFilename );
@ -121,14 +121,14 @@ bool OpenPlay( TCHAR * szFilename, int iNumber )
{ {
Console::Append( TEXT( "ERROR: Extension not supported" ) ); Console::Append( TEXT( "ERROR: Extension not supported" ) );
Console::Append( " " ); Console::Append( " " );
Console::Print("OpenPlay > ERROR: Extension not supported\n"); INFO_LOG(AUDIO,"OpenPlay > ERROR: Extension not supported\n");
return false; return false;
} }
// --------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------
// Now that we know which input pugin to use we set that one as active // Now that we know which input pugin to use we set that one as active
InputPlugin * old_input = active_input_plugin; // Save the last one, if any InputPlugin * old_input = active_input_plugin; // Save the last one, if any
active_input_plugin = iter->second; active_input_plugin = iter->second;
Console::Print("OpenPlay > Input plugin '%s' activated\n", active_input_plugin->GetFilename()); INFO_LOG(AUDIO,"OpenPlay > Input plugin '%s' activated\n", active_input_plugin->GetFilename());
// ======================================================================================= // =======================================================================================
if( old_input ) if( old_input )
@ -145,12 +145,12 @@ bool OpenPlay( TCHAR * szFilename, int iNumber )
{ {
Console::Append( TEXT( "ERROR: Input plugin is NULL" ) ); Console::Append( TEXT( "ERROR: Input plugin is NULL" ) );
Console::Append( " " ); Console::Append( " " );
Console::Print("OpenPlay > ERROR: Input plugin is NULL\n"); INFO_LOG(AUDIO,"OpenPlay > ERROR: Input plugin is NULL\n");
return false; return false;
} }
// Connect // Connect
//Console::Print( "OpenPlay > OutMod\n" ); //INFO_LOG(AUDIO, "OpenPlay > OutMod\n" );
active_input_plugin->plugin->outMod = &output_server; // output->plugin; active_input_plugin->plugin->outMod = &output_server; // output->plugin;
// ======================================================================================= // =======================================================================================
@ -190,10 +190,10 @@ bool OpenPlay( TCHAR * szFilename, int iNumber )
TCHAR szTitle[ 2000 ] = TEXT( "\0" ); TCHAR szTitle[ 2000 ] = TEXT( "\0" );
int length_in_ms; int length_in_ms;
//Console::Print( "OpenPlay > GetFileInfo\n" ); //INFO_LOG(AUDIO, "OpenPlay > GetFileInfo\n" );
active_input_plugin->plugin->GetFileInfo( szFilename, szTitle, &length_in_ms ); active_input_plugin->plugin->GetFileInfo( szFilename, szTitle, &length_in_ms );
//Console::Print( "OpenPlay > Play\n" ); //INFO_LOG(AUDIO, "OpenPlay > Play\n" );
active_input_plugin->plugin->Play( szFilename ); active_input_plugin->plugin->Play( szFilename );
// ======================================================================================= // =======================================================================================
#endif #endif
@ -218,7 +218,7 @@ bool OpenPlay( TCHAR * szFilename, int iNumber )
// Timer ON // Timer ON
//EnableTimer( true ); //EnableTimer( true );
//Console::Print( "OpenPlay > End\n" ); //INFO_LOG(AUDIO, "OpenPlay > End\n" );
return true; return true;
} }
@ -298,7 +298,7 @@ bool Playback::Play()
Console::Append( sszBuffer ); Console::Append( sszBuffer );
Console::Append( TEXT( " " ) ); Console::Append( TEXT( " " ) );
#else #else
//Console::Print( "Playback::Play() > Begin <%i>\n" , bPlaying ); //INFO_LOG(AUDIO, "Playback::Play() > Begin <%i>\n" , bPlaying );
#endif #endif
// --------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------
@ -393,7 +393,7 @@ bool Playback::Play()
Console::Append( szBuffer ); Console::Append( szBuffer );
//Console::Append( TEXT( " " ) ); //Console::Append( TEXT( " " ) );
#else #else
//Console::Print( "Playback::Play() > Filename <%s>\n", szFilename); //INFO_LOG(AUDIO, "Playback::Play() > Filename <%s>\n", szFilename);
#endif #endif
// Play // Play

40
Externals/MusicMod/Player/Src/Player.cpp vendored
View File

@ -125,9 +125,9 @@ void Player_Main(bool Console)
//MessageBox(0, "main() opened", "", 0); //MessageBox(0, "main() opened", "", 0);
//printf( "main() opened\n" ); //printf( "main() opened\n" );
Console::Print( "\n=========================================================\n\n\n" ); INFO_LOG(AUDIO,"\n=========================================================\n\n\n" );
//Console::Print( "DLL > Player_Main() > Begin\n" ); //INFO_LOG(AUDIO, "DLL > Player_Main() > Begin\n" );
Console::Print( "DLL > Settings:\n", bLoop); INFO_LOG(AUDIO, "DLL > Settings:\n", bLoop);
// ======================================================================================= // =======================================================================================
@ -137,8 +137,8 @@ void Player_Main(bool Console)
// --------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------
Console::Print( "DLL > Loop: %i\n", bLoop); INFO_LOG(AUDIO, "DLL > Loop: %i\n", bLoop);
Console::Print( "DLL > WarnPluginsMissing: %i\n", bWarnPluginsMissing); INFO_LOG(AUDIO, "DLL > WarnPluginsMissing: %i\n", bWarnPluginsMissing);
// --------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------
// ======================================================================================= // =======================================================================================
@ -170,7 +170,7 @@ void Player_Main(bool Console)
memcpy( szPluginDir, szHomeDir, iHomeDirLen * sizeof( TCHAR ) ); memcpy( szPluginDir, szHomeDir, iHomeDirLen * sizeof( TCHAR ) );
memcpy( szPluginDir + iHomeDirLen, TEXT( "PluginsMusic" ), 12 * sizeof( TCHAR ) ); memcpy( szPluginDir + iHomeDirLen, TEXT( "PluginsMusic" ), 12 * sizeof( TCHAR ) );
szPluginDir[ iHomeDirLen + 12 ] = TEXT( '\0' ); szPluginDir[ iHomeDirLen + 12 ] = TEXT( '\0' );
Console::Print("DLL > Plugindir: %s\n", szPluginDir); INFO_LOG(AUDIO,"DLL > Plugindir: %s\n", szPluginDir);
// ======================================================================================= // =======================================================================================
#ifndef NOGUI #ifndef NOGUI
Font::Create(); Font::Create();
@ -183,7 +183,7 @@ void Player_Main(bool Console)
//GlobalVolume = Playback::Volume::Get(); // Don't bother with this for now //GlobalVolume = Playback::Volume::Get(); // Don't bother with this for now
//GlobalCurrentVolume = GlobalVolume; //GlobalCurrentVolume = GlobalVolume;
//Output_SetVolume( GlobalVolume ); //Output_SetVolume( GlobalVolume );
Console::Print("DLL > Volume: %i\n\n", GlobalVolume); INFO_LOG(AUDIO,"DLL > Volume: %i\n\n", GlobalVolume);
// --------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------
@ -206,10 +206,10 @@ void Player_Main(bool Console)
Plugin::FindAll<DspPlugin> ( szPluginDir, TEXT( "dsp_*.dll" ), false ); Plugin::FindAll<DspPlugin> ( szPluginDir, TEXT( "dsp_*.dll" ), false );
Plugin::FindAll<GenPlugin> ( szPluginDir, TEXT( "gen_*.dll" ), true ); Plugin::FindAll<GenPlugin> ( szPluginDir, TEXT( "gen_*.dll" ), true );
//Console::Print( "Winmain.cpp > PluginManager::Fill()\n" ); //INFO_LOG(AUDIO, "Winmain.cpp > PluginManager::Fill()\n" );
PluginManager::Fill(); PluginManager::Fill();
//Console::Print( "Winmain.cpp > PluginManager::Fill()\n" ); //INFO_LOG(AUDIO, "Winmain.cpp > PluginManager::Fill()\n" );
@ -251,26 +251,26 @@ void Player_Main(bool Console)
// Check the plugins // Check the plugins
if( input_plugins.empty() ) if( input_plugins.empty() )
{ {
Console::Print("\n *** Warning: No valid input plugins found\n\n"); INFO_LOG(AUDIO,"\n *** Warning: No valid input plugins found\n\n");
} }
else else
{ {
Console::Print(" >>> These valid input plugins were found:\n"); INFO_LOG(AUDIO," >>> These valid input plugins were found:\n");
for(int i = 0; i < input_plugins.size(); i++) for(int i = 0; i < input_plugins.size(); i++)
Console::Print(" %i: %s\n", (i + 1), input_plugins.at(i)->GetFilename()); INFO_LOG(AUDIO," %i: %s\n", (i + 1), input_plugins.at(i)->GetFilename());
Console::Print("\n"); INFO_LOG(AUDIO,"\n");
} }
// The input plugins are never activated here, they are activate for each file // The input plugins are never activated here, they are activate for each file
if( !active_input_plugin || !active_input_plugin->plugin ) if( !active_input_plugin || !active_input_plugin->plugin )
{ {
// Console::Print("The input plugin is not activated yet\n"); // INFO_LOG(AUDIO,"The input plugin is not activated yet\n");
} }
else else
{ {
//const int ms_len = active_input_plugin->plugin->GetLength(); //const int ms_len = active_input_plugin->plugin->GetLength();
//const int ms_cur = active_input_plugin->plugin->GetOutputTime(); //const int ms_cur = active_input_plugin->plugin->GetOutputTime();
//Console::Print("We are at <%i of %i>\n", ms_cur, ms_len); //INFO_LOG(AUDIO,"We are at <%i of %i>\n", ms_cur, ms_len);
} }
// --------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------
if( active_output_count > 0 ) if( active_output_count > 0 )
@ -281,11 +281,11 @@ void Player_Main(bool Console)
{ {
res_temp = active_output_plugins[ i ]->plugin->GetOutputTime(); res_temp = active_output_plugins[ i ]->plugin->GetOutputTime();
} }
Console::Print("Playback progress <%i>\n", res_temp);*/ INFO_LOG(AUDIO,"Playback progress <%i>\n", res_temp);*/
} }
else else
{ {
Console::Print("\n *** Warning: The output plugin is not working\n\n"); INFO_LOG(AUDIO,"\n *** Warning: The output plugin is not working\n\n");
} }
// ======================================================================================= // =======================================================================================
@ -293,14 +293,14 @@ void Player_Main(bool Console)
// Start the timer // Start the timer
if(!TimerCreated && bLoop) // Only create this the first time if(!TimerCreated && bLoop) // Only create this the first time
{ {
//Console::Print("Created the timer\n"); //INFO_LOG(AUDIO,"Created the timer\n");
MakeTime(); MakeTime();
TimerCreated = true; TimerCreated = true;
} }
// ======================================================================================= // =======================================================================================
Console::Print( "\n=========================================================\n\n" ); INFO_LOG(AUDIO, "\n=========================================================\n\n" );
//Console::Print( "DLL > main_dll() > End\n\n\n" ); //INFO_LOG(AUDIO, "DLL > main_dll() > End\n\n\n" );
//std::cin.get(); //std::cin.get();
} }

34
Externals/MusicMod/Player/Src/PlayerExport.cpp vendored
View File

@ -5,7 +5,7 @@
#include <iostream> // System #include <iostream> // System
#include "Common.h" // Global common #include "Common.h" // Global common
#include "ConsoleWindow.h" #include "Log.h"
//#include "../../Common/Src/Console.h" // Local common //#include "../../Common/Src/Console.h" // Local common
@ -60,21 +60,21 @@ void AddFileToPlaylist(char * a)
void Player_Play(char * FileName) void Player_Play(char * FileName)
{ {
Console::Print("Play file <%s>\n", FileName); INFO_LOG(AUDIO,"Play file <%s>\n", FileName);
// Check if the file exists // Check if the file exists
if(GetFileAttributes(FileName) == INVALID_FILE_ATTRIBUTES) if(GetFileAttributes(FileName) == INVALID_FILE_ATTRIBUTES)
{ {
Console::Print("Warning: The file <%s> does not exist. Something is wrong.\n", FileName); INFO_LOG(AUDIO,"Warning: The file <%s> does not exist. Something is wrong.\n", FileName);
return; return;
} }
Playback::Stop(); Playback::Stop();
//Console::Print("Stop\n"); //INFO_LOG(AUDIO,"Stop\n");
playlist->RemoveAll(); playlist->RemoveAll();
//Console::Print("RemoveAll\n"); //INFO_LOG(AUDIO,"RemoveAll\n");
AddFileToPlaylist(FileName); AddFileToPlaylist(FileName);
//Console::Print("addfiletoplaylist\n"); //INFO_LOG(AUDIO,"addfiletoplaylist\n");
// Play the file // Play the file
Playback::Play(); Playback::Play();
@ -84,7 +84,7 @@ void Player_Play(char * FileName)
// --------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------
// Set volume. This must probably be done after the dll is loaded. // Set volume. This must probably be done after the dll is loaded.
//Output_SetVolume( Playback::Volume::Get() ); //Output_SetVolume( Playback::Volume::Get() );
//Console::Print("Volume(%i)\n", Playback::Volume::Get()); //INFO_LOG(AUDIO,"Volume(%i)\n", Playback::Volume::Get());
// --------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------
GlobalPause = false; GlobalPause = false;
@ -93,7 +93,7 @@ void Player_Play(char * FileName)
void Player_Stop() void Player_Stop()
{ {
Playback::Stop(); Playback::Stop();
//Console::Print("Stop\n"); //INFO_LOG(AUDIO,"Stop\n");
playlist->RemoveAll(); playlist->RemoveAll();
CurrentlyPlayingFile = ""; CurrentlyPlayingFile = "";
@ -106,13 +106,13 @@ void Player_Pause()
{ {
if (!GlobalPause) if (!GlobalPause)
{ {
Console::Print("DLL > Pause\n"); INFO_LOG(AUDIO,"DLL > Pause\n");
Playback::Pause(); Playback::Pause();
GlobalPause = true; GlobalPause = true;
} }
else else
{ {
Console::Print("DLL > UnPause from Pause\n"); INFO_LOG(AUDIO,"DLL > UnPause from Pause\n");
Player_Unpause(); Player_Unpause();
GlobalPause = false; GlobalPause = false;
} }
@ -120,7 +120,7 @@ void Player_Pause()
void Player_Unpause() void Player_Unpause()
{ {
Console::Print("DLL > UnPause\n"); INFO_LOG(AUDIO,"DLL > UnPause\n");
Playback::Play(); Playback::Play();
GlobalPause = false; GlobalPause = false;
} }
@ -136,7 +136,7 @@ void Player_Unpause()
void Player_Mute(int Vol) void Player_Mute(int Vol)
{ {
if(GlobalVolume == -1) GlobalVolume = Vol; if(GlobalVolume == -1) GlobalVolume = Vol;
Console::Print("DLL > Mute <%i> <%i>\n", GlobalVolume, GlobalMute); INFO_LOG(AUDIO,"DLL > Mute <%i> <%i>\n", GlobalVolume, GlobalMute);
GlobalMute = !GlobalMute; GlobalMute = !GlobalMute;
@ -144,15 +144,15 @@ void Player_Mute(int Vol)
if(GlobalMute) if(GlobalMute)
{ {
Output_SetVolume( 0 ); Output_SetVolume( 0 );
Console::Print("DLL > Volume <%i>\n", GlobalMute); INFO_LOG(AUDIO,"DLL > Volume <%i>\n", GlobalMute);
} }
else else
{ {
Output_SetVolume( GlobalVolume ); Output_SetVolume( GlobalVolume );
Console::Print("DLL > Volume <%i>\n", GlobalMute); INFO_LOG(AUDIO,"DLL > Volume <%i>\n", GlobalMute);
} }
//Console::Print("Volume(%i)\n", Playback::Volume::Get()); //INFO_LOG(AUDIO,"Volume(%i)\n", Playback::Volume::Get());
} }
/////////////////////////////////////// ///////////////////////////////////////
@ -161,12 +161,12 @@ void Player_Volume(int Vol)
{ {
GlobalVolume = Vol; GlobalVolume = Vol;
Output_SetVolume( GlobalVolume ); Output_SetVolume( GlobalVolume );
//Console::Print("DLL > Volume <%i> <%i>\n", GlobalVolume, GlobalCurrentVolume); //INFO_LOG(AUDIO,"DLL > Volume <%i> <%i>\n", GlobalVolume, GlobalCurrentVolume);
} }
void ShowConsole() void ShowConsole()
{ {
Console::Open(100, 2000, "MusicMod", true); // give room for 2000 rows // Console::Open(100, 2000, "MusicMod", true); // give room for 2000 rows
} }

2
Externals/MusicMod/Player/Src/PlaylistModel.h vendored
View File

@ -105,7 +105,7 @@ public:
if( 0 > iIndex || iIndex >= ( int )_database.size() ) if( 0 > iIndex || iIndex >= ( int )_database.size() )
{ {
Console::Print("SetCurIndex > Return"); INFO_LOG(AUDIO,"SetCurIndex > Return");
return; return;
} }

12
Externals/MusicMod/Player/Src/Timer.cpp vendored
View File

@ -48,7 +48,7 @@ extern bool GlobalPause;
void CALLBACK Update(unsigned int,unsigned int,unsigned long,unsigned long,unsigned long) void CALLBACK Update(unsigned int,unsigned int,unsigned long,unsigned long,unsigned long)
#endif #endif
{ {
//Console::Print("DLL > Update() > Begin (%i)\n", active_input_plugin); //INFO_LOG(AUDIO,"DLL > Update() > Begin (%i)\n", active_input_plugin);
// -------------------------------- // --------------------------------
// Manage restart when playback for a file has reached the end of the file // Manage restart when playback for a file has reached the end of the file
@ -56,7 +56,7 @@ extern bool GlobalPause;
// Check if the input plugin is activated // Check if the input plugin is activated
if(!active_input_plugin || !active_input_plugin->plugin) if(!active_input_plugin || !active_input_plugin->plugin)
{ {
//Console::Print("The input plugin is not activated yet\n"); //INFO_LOG(AUDIO,"The input plugin is not activated yet\n");
} }
else else
{ {
@ -73,20 +73,20 @@ extern bool GlobalPause;
if ( progress > 0.7 ) // Only show this if we are getting close to the end, for bugtesting if ( progress > 0.7 ) // Only show this if we are getting close to the end, for bugtesting
// basically // basically
{ {
//Console::Print("Playback progress <%i of %i>\n", ms_cur, ms_len); //INFO_LOG(AUDIO,"Playback progress <%i of %i>\n", ms_cur, ms_len);
} }
// Because cur never go all the way to len we can't use a == comparison. Insted of this // Because cur never go all the way to len we can't use a == comparison. Insted of this
// we could also check if the location is the same as right before. // we could also check if the location is the same as right before.
if(ms_cur > ms_len - 1000 && !GlobalPause) // avoid restarting in cases where we just pressed pause if(ms_cur > ms_len - 1000 && !GlobalPause) // avoid restarting in cases where we just pressed pause
{ {
Console::Print("Restart <%s>\n", CurrentlyPlayingFile.c_str()); INFO_LOG(AUDIO,"Restart <%s>\n", CurrentlyPlayingFile.c_str());
Player_Play((char *)CurrentlyPlayingFile.c_str()); Player_Play((char *)CurrentlyPlayingFile.c_str());
} }
} }
// -------------- // --------------
//Console::Print("Make new time\n"); //INFO_LOG(AUDIO,"Make new time\n");
MakeTime(); // Make a new one MakeTime(); // Make a new one
} }
@ -119,7 +119,7 @@ int MainTimer()
// cout << "."; // cout << ".";
//} //}
//Console::Print("MakeTime\n"); //INFO_LOG(AUDIO,"MakeTime\n");
return 0; return 0;
} }

183
Source/MusicMod.sln
View File

@ -1,11 +1,11 @@
Microsoft Visual Studio Solution File, Format Version 10.00 Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008 # Visual C++ Express 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "Core\Core\Core.vcproj", "{F0B874CB-4476-4199-9315-8343D05AE684}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "Core\Core\Core.vcproj", "{F0B874CB-4476-4199-9315-8343D05AE684}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{48AD7E0A-25B1-4974-A1E3-03F8C438D34F} = {48AD7E0A-25B1-4974-A1E3-03F8C438D34F} {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}
{C7E5D50A-2916-464B-86A7-E10B3CC88ADA} = {C7E5D50A-2916-464B-86A7-E10B3CC88ADA} {C7E5D50A-2916-464B-86A7-E10B3CC88ADA} = {C7E5D50A-2916-464B-86A7-E10B3CC88ADA}
{0318BA30-EF48-441A-9E10-DC85EFAE39F0} = {0318BA30-EF48-441A-9E10-DC85EFAE39F0} {11F55366-12EC-4C44-A8CB-1D4E315D61ED} = {11F55366-12EC-4C44-A8CB-1D4E315D61ED}
{71B16F46-0B00-4EDA-B253-D6D9D03A215C} = {71B16F46-0B00-4EDA-B253-D6D9D03A215C} {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}
{95CCAABC-7062-47C4-B8C1-A064DD5F16FF} = {95CCAABC-7062-47C4-B8C1-A064DD5F16FF} {95CCAABC-7062-47C4-B8C1-A064DD5F16FF} = {95CCAABC-7062-47C4-B8C1-A064DD5F16FF}
{29C2ABC1-ADA5-42CD-A5FC-96022D52A510} = {29C2ABC1-ADA5-42CD-A5FC-96022D52A510} {29C2ABC1-ADA5-42CD-A5FC-96022D52A510} = {29C2ABC1-ADA5-42CD-A5FC-96022D52A510}
{C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}
@ -21,10 +21,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_VideoDX9", "Plugins\
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_PadSimple", "Plugins\Plugin_PadSimple\Plugin_PadSimple.vcproj", "{9A183B48-ECC2-4121-876A-9B3793686073}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_PadSimple", "Plugins\Plugin_PadSimple\Plugin_PadSimple.vcproj", "{9A183B48-ECC2-4121-876A-9B3793686073}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{48AD7E0A-25B1-4974-A1E3-03F8C438D34F} = {48AD7E0A-25B1-4974-A1E3-03F8C438D34F} {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}
{C7E5D50A-2916-464B-86A7-E10B3CC88ADA} = {C7E5D50A-2916-464B-86A7-E10B3CC88ADA} {C7E5D50A-2916-464B-86A7-E10B3CC88ADA} = {C7E5D50A-2916-464B-86A7-E10B3CC88ADA}
{0318BA30-EF48-441A-9E10-DC85EFAE39F0} = {0318BA30-EF48-441A-9E10-DC85EFAE39F0} {11F55366-12EC-4C44-A8CB-1D4E315D61ED} = {11F55366-12EC-4C44-A8CB-1D4E315D61ED}
{71B16F46-0B00-4EDA-B253-D6D9D03A215C} = {71B16F46-0B00-4EDA-B253-D6D9D03A215C} {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}
{C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}
EndProjectSection EndProjectSection
EndProject EndProject
@ -32,7 +32,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Bochs_disasm", "..\External
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\Externals\zlib\zlib.vcproj", "{3E03C179-8251-46E4-81F4-466F114BAC63}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\Externals\zlib\zlib.vcproj", "{3E03C179-8251-46E4-81F4-466F114BAC63}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_DSP_LLE", "Plugins\Plugin_DSP_LLE\Plugin_DSP_LLE.vcproj", "{C60D0E7A-ED05-4C67-9EE7-3A6C0D7801C8}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_DSP_LLE", "Plugins\Plugin_DSP_LLE\Plugin_DSP_LLE.vcproj", "{3D8156A9-64D1-4C8E-ADBE-1B319030E4A4}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}
EndProjectSection EndProjectSection
@ -45,9 +45,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DiscIO", "Core\DiscIO\DiscI
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_VideoOGL", "Plugins\Plugin_VideoOGL\Plugin_VideoOGL.vcproj", "{CFDCEE0E-FA45-4F72-9FCC-0B88F5A75160}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_VideoOGL", "Plugins\Plugin_VideoOGL\Plugin_VideoOGL.vcproj", "{CFDCEE0E-FA45-4F72-9FCC-0B88F5A75160}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{48AD7E0A-25B1-4974-A1E3-03F8C438D34F} = {48AD7E0A-25B1-4974-A1E3-03F8C438D34F} {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}
{0318BA30-EF48-441A-9E10-DC85EFAE39F0} = {0318BA30-EF48-441A-9E10-DC85EFAE39F0} {11F55366-12EC-4C44-A8CB-1D4E315D61ED} = {11F55366-12EC-4C44-A8CB-1D4E315D61ED}
{71B16F46-0B00-4EDA-B253-D6D9D03A215C} = {71B16F46-0B00-4EDA-B253-D6D9D03A215C} {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}
{E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA} = {E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA} {E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA} = {E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA}
{C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}
EndProjectSection EndProjectSection
@ -56,11 +56,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Core\Common\Commo
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dolphin", "Core\DolphinWX\DolphinWX.vcproj", "{A72606EF-C5C1-4954-90AD-F0F93A8D97D9}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dolphin", "Core\DolphinWX\DolphinWX.vcproj", "{A72606EF-C5C1-4954-90AD-F0F93A8D97D9}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{48AD7E0A-25B1-4974-A1E3-03F8C438D34F} = {48AD7E0A-25B1-4974-A1E3-03F8C438D34F} {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}
{CFDCEE0E-FA45-4F72-9FCC-0B88F5A75160} = {CFDCEE0E-FA45-4F72-9FCC-0B88F5A75160} {CFDCEE0E-FA45-4F72-9FCC-0B88F5A75160} = {CFDCEE0E-FA45-4F72-9FCC-0B88F5A75160}
{0318BA30-EF48-441A-9E10-DC85EFAE39F0} = {0318BA30-EF48-441A-9E10-DC85EFAE39F0} {11F55366-12EC-4C44-A8CB-1D4E315D61ED} = {11F55366-12EC-4C44-A8CB-1D4E315D61ED}
{8D612734-FAA5-4B8A-804F-4DEA2367D495} = {8D612734-FAA5-4B8A-804F-4DEA2367D495} {8D612734-FAA5-4B8A-804F-4DEA2367D495} = {8D612734-FAA5-4B8A-804F-4DEA2367D495}
{71B16F46-0B00-4EDA-B253-D6D9D03A215C} = {71B16F46-0B00-4EDA-B253-D6D9D03A215C} {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}
{33546D62-7F34-4EA6-A88E-D538B36E16BF} = {33546D62-7F34-4EA6-A88E-D538B36E16BF} {33546D62-7F34-4EA6-A88E-D538B36E16BF} = {33546D62-7F34-4EA6-A88E-D538B36E16BF}
{3E03C179-8251-46E4-81F4-466F114BAC63} = {3E03C179-8251-46E4-81F4-466F114BAC63} {3E03C179-8251-46E4-81F4-466F114BAC63} = {3E03C179-8251-46E4-81F4-466F114BAC63}
{95CCAABC-7062-47C4-B8C1-A064DD5F16FF} = {95CCAABC-7062-47C4-B8C1-A064DD5F16FF} {95CCAABC-7062-47C4-B8C1-A064DD5F16FF} = {95CCAABC-7062-47C4-B8C1-A064DD5F16FF}
@ -68,18 +68,19 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dolphin", "Core\DolphinWX\D
{29C2ABC1-ADA5-42CD-A5FC-96022D52A510} = {29C2ABC1-ADA5-42CD-A5FC-96022D52A510} {29C2ABC1-ADA5-42CD-A5FC-96022D52A510} = {29C2ABC1-ADA5-42CD-A5FC-96022D52A510}
{4D3CD4C5-412B-4B49-9B1B-A68A2A129C77} = {4D3CD4C5-412B-4B49-9B1B-A68A2A129C77} {4D3CD4C5-412B-4B49-9B1B-A68A2A129C77} = {4D3CD4C5-412B-4B49-9B1B-A68A2A129C77}
{F0B874CB-4476-4199-9315-8343D05AE684} = {F0B874CB-4476-4199-9315-8343D05AE684} {F0B874CB-4476-4199-9315-8343D05AE684} = {F0B874CB-4476-4199-9315-8343D05AE684}
{0B72B5D6-5D72-4391-84A7-9CCA5392668A} = {0B72B5D6-5D72-4391-84A7-9CCA5392668A}
{B7F1A9FB-BEA8-416E-9460-AE35A6A5165C} = {B7F1A9FB-BEA8-416E-9460-AE35A6A5165C} {B7F1A9FB-BEA8-416E-9460-AE35A6A5165C} = {B7F1A9FB-BEA8-416E-9460-AE35A6A5165C}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxBase28", "..\Externals\wxWidgets\build\msw\wx_base.vcproj", "{48AD7E0A-25B1-4974-A1E3-03F8C438D34F}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxBase28", "..\Externals\wxWidgets\build\msw\wx_base.vcproj", "{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxCore28", "..\Externals\wxWidgets\build\msw\wx_core.vcproj", "{0318BA30-EF48-441A-9E10-DC85EFAE39F0}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxCore28", "..\Externals\wxWidgets\build\msw\wx_core.vcproj", "{11F55366-12EC-4C44-A8CB-1D4E315D61ED}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Debugger", "Core\DebuggerWX\DebuggerWX.vcproj", "{4D3CD4C5-412B-4B49-9B1B-A68A2A129C77}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Debugger", "Core\DebuggerWX\DebuggerWX.vcproj", "{4D3CD4C5-412B-4B49-9B1B-A68A2A129C77}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{48AD7E0A-25B1-4974-A1E3-03F8C438D34F} = {48AD7E0A-25B1-4974-A1E3-03F8C438D34F} {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}
{0318BA30-EF48-441A-9E10-DC85EFAE39F0} = {0318BA30-EF48-441A-9E10-DC85EFAE39F0} {11F55366-12EC-4C44-A8CB-1D4E315D61ED} = {11F55366-12EC-4C44-A8CB-1D4E315D61ED}
{71B16F46-0B00-4EDA-B253-D6D9D03A215C} = {71B16F46-0B00-4EDA-B253-D6D9D03A215C} {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}
{29C2ABC1-ADA5-42CD-A5FC-96022D52A510} = {29C2ABC1-ADA5-42CD-A5FC-96022D52A510} {29C2ABC1-ADA5-42CD-A5FC-96022D52A510} = {29C2ABC1-ADA5-42CD-A5FC-96022D52A510}
{F0B874CB-4476-4199-9315-8343D05AE684} = {F0B874CB-4476-4199-9315-8343D05AE684} {F0B874CB-4476-4199-9315-8343D05AE684} = {F0B874CB-4476-4199-9315-8343D05AE684}
{C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}
@ -92,9 +93,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoCommon", "Core\VideoCo
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_DSP_HLE", "Plugins\Plugin_DSP_HLE\Plugin_DSP_HLE.vcproj", "{D6E56527-BBB9-4EAD-A6EC-49D4BF6AFCD8}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_DSP_HLE", "Plugins\Plugin_DSP_HLE\Plugin_DSP_HLE.vcproj", "{D6E56527-BBB9-4EAD-A6EC-49D4BF6AFCD8}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{48AD7E0A-25B1-4974-A1E3-03F8C438D34F} = {48AD7E0A-25B1-4974-A1E3-03F8C438D34F} {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}
{0318BA30-EF48-441A-9E10-DC85EFAE39F0} = {0318BA30-EF48-441A-9E10-DC85EFAE39F0} {11F55366-12EC-4C44-A8CB-1D4E315D61ED} = {11F55366-12EC-4C44-A8CB-1D4E315D61ED}
{71B16F46-0B00-4EDA-B253-D6D9D03A215C} = {71B16F46-0B00-4EDA-B253-D6D9D03A215C} {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}
{C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}
EndProjectSection EndProjectSection
EndProject EndProject
@ -102,44 +103,34 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LZO", "..\Externals\LZO\LZO
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_Wiimote", "Plugins\Plugin_Wiimote\Plugin_Wiimote.vcproj", "{8D612734-FAA5-4B8A-804F-4DEA2367D495}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_Wiimote", "Plugins\Plugin_Wiimote\Plugin_Wiimote.vcproj", "{8D612734-FAA5-4B8A-804F-4DEA2367D495}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{48AD7E0A-25B1-4974-A1E3-03F8C438D34F} = {48AD7E0A-25B1-4974-A1E3-03F8C438D34F} {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}
{C7E5D50A-2916-464B-86A7-E10B3CC88ADA} = {C7E5D50A-2916-464B-86A7-E10B3CC88ADA} {C7E5D50A-2916-464B-86A7-E10B3CC88ADA} = {C7E5D50A-2916-464B-86A7-E10B3CC88ADA}
{0318BA30-EF48-441A-9E10-DC85EFAE39F0} = {0318BA30-EF48-441A-9E10-DC85EFAE39F0} {11F55366-12EC-4C44-A8CB-1D4E315D61ED} = {11F55366-12EC-4C44-A8CB-1D4E315D61ED}
{71B16F46-0B00-4EDA-B253-D6D9D03A215C} = {71B16F46-0B00-4EDA-B253-D6D9D03A215C} {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}
{C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_nJoy_SDL_Test", "Plugins\Plugin_nJoy_Testing\Plugin_nJoy_SDL_Test.vcproj", "{ADF64291-57ED-4B7A-AB76-37B4A991504B}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_nJoy_SDL_Test", "Plugins\Plugin_nJoy_Testing\Plugin_nJoy_SDL_Test.vcproj", "{ADF64291-57ED-4B7A-AB76-37B4A991504B}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{48AD7E0A-25B1-4974-A1E3-03F8C438D34F} = {48AD7E0A-25B1-4974-A1E3-03F8C438D34F} {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}
{0318BA30-EF48-441A-9E10-DC85EFAE39F0} = {0318BA30-EF48-441A-9E10-DC85EFAE39F0} {11F55366-12EC-4C44-A8CB-1D4E315D61ED} = {11F55366-12EC-4C44-A8CB-1D4E315D61ED}
{71B16F46-0B00-4EDA-B253-D6D9D03A215C} = {71B16F46-0B00-4EDA-B253-D6D9D03A215C} {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}
{C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxAdv28", "..\Externals\wxWidgets\build\msw\wx_adv.vcproj", "{71B16F46-0B00-4EDA-B253-D6D9D03A215C}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxAdv28", "..\Externals\wxWidgets\build\msw\wx_adv.vcproj", "{0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_nJoy_SDL", "Plugins\Plugin_nJoy_SDL\Plugin_nJoy_SDL.vcproj", "{521498BE-6089-4780-8223-E67C22F4E068}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_nJoy_SDL", "Plugins\Plugin_nJoy_SDL\Plugin_nJoy_SDL.vcproj", "{521498BE-6089-4780-8223-E67C22F4E068}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{48AD7E0A-25B1-4974-A1E3-03F8C438D34F} = {48AD7E0A-25B1-4974-A1E3-03F8C438D34F} {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}
{C7E5D50A-2916-464B-86A7-E10B3CC88ADA} = {C7E5D50A-2916-464B-86A7-E10B3CC88ADA} {C7E5D50A-2916-464B-86A7-E10B3CC88ADA} = {C7E5D50A-2916-464B-86A7-E10B3CC88ADA}
{0318BA30-EF48-441A-9E10-DC85EFAE39F0} = {0318BA30-EF48-441A-9E10-DC85EFAE39F0} {11F55366-12EC-4C44-A8CB-1D4E315D61ED} = {11F55366-12EC-4C44-A8CB-1D4E315D61ED}
{71B16F46-0B00-4EDA-B253-D6D9D03A215C} = {71B16F46-0B00-4EDA-B253-D6D9D03A215C} {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}
{C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MusicMod", "MusicMod", "{77CF6E34-3038-4B23-A2E7-90AD17801609}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{5C17B1EB-6C76-438A-A503-8F3C7831023B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Externals", "Externals", "{4F427D1B-8C90-4D9C-B23D-A51493A1C471}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dolphin", "Dolphin", "{61C7F431-0623-4A8D-9C4B-EDE35696554A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InputCommon", "Core\InputCommon\InputCommon.vcproj", "{C7E5D50A-2916-464B-86A7-E10B3CC88ADA}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InputCommon", "Core\InputCommon\InputCommon.vcproj", "{C7E5D50A-2916-464B-86A7-E10B3CC88ADA}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "..\Externals\MusicMod\Common\Common.vcproj", "{DE7C596C-CBC4-4278-8909-146D63990803}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Main", "..\Externals\MusicMod\Main\Main.vcproj", "{95CCAABC-7062-47C4-B8C1-A064DD5F16FF}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Main", "..\Externals\MusicMod\Main\Main.vcproj", "{95CCAABC-7062-47C4-B8C1-A064DD5F16FF}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{0B72B5D6-5D72-4391-84A7-9CCA5392668A} = {0B72B5D6-5D72-4391-84A7-9CCA5392668A} {0B72B5D6-5D72-4391-84A7-9CCA5392668A} = {0B72B5D6-5D72-4391-84A7-9CCA5392668A}
@ -152,6 +143,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Player", "..\Externals\Musi
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestPlayer", "..\Externals\MusicMod\TestPlayer\TestPlayer.vcproj", "{0D14F1E9-490B-4A2D-A4EF-0535E8B3C718}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestPlayer", "..\Externals\MusicMod\TestPlayer\TestPlayer.vcproj", "{0D14F1E9-490B-4A2D-A4EF-0535E8B3C718}"
ProjectSection(ProjectDependencies) = postProject
{0B72B5D6-5D72-4391-84A7-9CCA5392668A} = {0B72B5D6-5D72-4391-84A7-9CCA5392668A}
EndProjectSection
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -227,15 +221,15 @@ Global
{3E03C179-8251-46E4-81F4-466F114BAC63}.Release|Win32.ActiveCfg = Release|Win32 {3E03C179-8251-46E4-81F4-466F114BAC63}.Release|Win32.ActiveCfg = Release|Win32
{3E03C179-8251-46E4-81F4-466F114BAC63}.Release|x64.ActiveCfg = Release|x64 {3E03C179-8251-46E4-81F4-466F114BAC63}.Release|x64.ActiveCfg = Release|x64
{3E03C179-8251-46E4-81F4-466F114BAC63}.Release|x64.Build.0 = Release|x64 {3E03C179-8251-46E4-81F4-466F114BAC63}.Release|x64.Build.0 = Release|x64
{C60D0E7A-ED05-4C67-9EE7-3A6C0D7801C8}.Debug|Win32.ActiveCfg = Debug|Win32 {3D8156A9-64D1-4C8E-ADBE-1B319030E4A4}.Debug|Win32.ActiveCfg = Debug|Win32
{C60D0E7A-ED05-4C67-9EE7-3A6C0D7801C8}.Debug|x64.ActiveCfg = Debug|x64 {3D8156A9-64D1-4C8E-ADBE-1B319030E4A4}.Debug|x64.ActiveCfg = Debug|x64
{C60D0E7A-ED05-4C67-9EE7-3A6C0D7801C8}.DebugFast|Win32.ActiveCfg = DebugFast|Win32 {3D8156A9-64D1-4C8E-ADBE-1B319030E4A4}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
{C60D0E7A-ED05-4C67-9EE7-3A6C0D7801C8}.DebugFast|x64.ActiveCfg = DebugFast|x64 {3D8156A9-64D1-4C8E-ADBE-1B319030E4A4}.DebugFast|x64.ActiveCfg = DebugFast|x64
{C60D0E7A-ED05-4C67-9EE7-3A6C0D7801C8}.DebugFast|x64.Build.0 = DebugFast|x64 {3D8156A9-64D1-4C8E-ADBE-1B319030E4A4}.DebugFast|x64.Build.0 = DebugFast|x64
{C60D0E7A-ED05-4C67-9EE7-3A6C0D7801C8}.Release JITIL|Win32.ActiveCfg = Release|x64 {3D8156A9-64D1-4C8E-ADBE-1B319030E4A4}.Release JITIL|Win32.ActiveCfg = Release|x64
{C60D0E7A-ED05-4C67-9EE7-3A6C0D7801C8}.Release JITIL|x64.ActiveCfg = Release|x64 {3D8156A9-64D1-4C8E-ADBE-1B319030E4A4}.Release JITIL|x64.ActiveCfg = Release|x64
{C60D0E7A-ED05-4C67-9EE7-3A6C0D7801C8}.Release|Win32.ActiveCfg = Release|Win32 {3D8156A9-64D1-4C8E-ADBE-1B319030E4A4}.Release|Win32.ActiveCfg = Release|Win32
{C60D0E7A-ED05-4C67-9EE7-3A6C0D7801C8}.Release|x64.ActiveCfg = Release|x64 {3D8156A9-64D1-4C8E-ADBE-1B319030E4A4}.Release|x64.ActiveCfg = Release|x64
{B7F1A9FB-BEA8-416E-9460-AE35A6A5165C}.Debug|Win32.ActiveCfg = Debug|Win32 {B7F1A9FB-BEA8-416E-9460-AE35A6A5165C}.Debug|Win32.ActiveCfg = Debug|Win32
{B7F1A9FB-BEA8-416E-9460-AE35A6A5165C}.Debug|Win32.Build.0 = Debug|Win32 {B7F1A9FB-BEA8-416E-9460-AE35A6A5165C}.Debug|Win32.Build.0 = Debug|Win32
{B7F1A9FB-BEA8-416E-9460-AE35A6A5165C}.Debug|x64.ActiveCfg = Debug|x64 {B7F1A9FB-BEA8-416E-9460-AE35A6A5165C}.Debug|x64.ActiveCfg = Debug|x64
@ -293,28 +287,28 @@ Global
{A72606EF-C5C1-4954-90AD-F0F93A8D97D9}.Release|Win32.Build.0 = Release|Win32 {A72606EF-C5C1-4954-90AD-F0F93A8D97D9}.Release|Win32.Build.0 = Release|Win32
{A72606EF-C5C1-4954-90AD-F0F93A8D97D9}.Release|x64.ActiveCfg = Release|x64 {A72606EF-C5C1-4954-90AD-F0F93A8D97D9}.Release|x64.ActiveCfg = Release|x64
{A72606EF-C5C1-4954-90AD-F0F93A8D97D9}.Release|x64.Build.0 = Release|x64 {A72606EF-C5C1-4954-90AD-F0F93A8D97D9}.Release|x64.Build.0 = Release|x64
{48AD7E0A-25B1-4974-A1E3-03F8C438D34F}.Debug|Win32.ActiveCfg = Debug|Win32 {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Debug|Win32.ActiveCfg = Debug|Win32
{48AD7E0A-25B1-4974-A1E3-03F8C438D34F}.Debug|Win32.Build.0 = Debug|Win32 {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Debug|Win32.Build.0 = Debug|Win32
{48AD7E0A-25B1-4974-A1E3-03F8C438D34F}.Debug|x64.ActiveCfg = Debug|x64 {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Debug|x64.ActiveCfg = Debug|x64
{48AD7E0A-25B1-4974-A1E3-03F8C438D34F}.Debug|x64.Build.0 = Debug|x64 {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Debug|x64.Build.0 = Debug|x64
{48AD7E0A-25B1-4974-A1E3-03F8C438D34F}.DebugFast|Win32.ActiveCfg = DebugFast|Win32 {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
{48AD7E0A-25B1-4974-A1E3-03F8C438D34F}.DebugFast|x64.ActiveCfg = DebugFast|x64 {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.DebugFast|x64.ActiveCfg = DebugFast|x64
{48AD7E0A-25B1-4974-A1E3-03F8C438D34F}.Release JITIL|Win32.ActiveCfg = Release|Win32 {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Release JITIL|Win32.ActiveCfg = Release|Win32
{48AD7E0A-25B1-4974-A1E3-03F8C438D34F}.Release JITIL|x64.ActiveCfg = Release|x64 {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Release JITIL|x64.ActiveCfg = Release|x64
{48AD7E0A-25B1-4974-A1E3-03F8C438D34F}.Release JITIL|x64.Build.0 = Release|x64 {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Release JITIL|x64.Build.0 = Release|x64
{48AD7E0A-25B1-4974-A1E3-03F8C438D34F}.Release|Win32.ActiveCfg = Release|Win32 {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Release|Win32.ActiveCfg = Release|Win32
{48AD7E0A-25B1-4974-A1E3-03F8C438D34F}.Release|x64.ActiveCfg = Release|x64 {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}.Release|x64.ActiveCfg = Release|x64
{0318BA30-EF48-441A-9E10-DC85EFAE39F0}.Debug|Win32.ActiveCfg = Debug|Win32 {11F55366-12EC-4C44-A8CB-1D4E315D61ED}.Debug|Win32.ActiveCfg = Debug|Win32
{0318BA30-EF48-441A-9E10-DC85EFAE39F0}.Debug|Win32.Build.0 = Debug|Win32 {11F55366-12EC-4C44-A8CB-1D4E315D61ED}.Debug|Win32.Build.0 = Debug|Win32
{0318BA30-EF48-441A-9E10-DC85EFAE39F0}.Debug|x64.ActiveCfg = Debug|x64 {11F55366-12EC-4C44-A8CB-1D4E315D61ED}.Debug|x64.ActiveCfg = Debug|x64
{0318BA30-EF48-441A-9E10-DC85EFAE39F0}.Debug|x64.Build.0 = Debug|x64 {11F55366-12EC-4C44-A8CB-1D4E315D61ED}.Debug|x64.Build.0 = Debug|x64
{0318BA30-EF48-441A-9E10-DC85EFAE39F0}.DebugFast|Win32.ActiveCfg = DebugFast|Win32 {11F55366-12EC-4C44-A8CB-1D4E315D61ED}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
{0318BA30-EF48-441A-9E10-DC85EFAE39F0}.DebugFast|x64.ActiveCfg = DebugFast|x64 {11F55366-12EC-4C44-A8CB-1D4E315D61ED}.DebugFast|x64.ActiveCfg = DebugFast|x64
{0318BA30-EF48-441A-9E10-DC85EFAE39F0}.Release JITIL|Win32.ActiveCfg = Release|Win32 {11F55366-12EC-4C44-A8CB-1D4E315D61ED}.Release JITIL|Win32.ActiveCfg = Release|Win32
{0318BA30-EF48-441A-9E10-DC85EFAE39F0}.Release JITIL|x64.ActiveCfg = Release|x64 {11F55366-12EC-4C44-A8CB-1D4E315D61ED}.Release JITIL|x64.ActiveCfg = Release|x64
{0318BA30-EF48-441A-9E10-DC85EFAE39F0}.Release JITIL|x64.Build.0 = Release|x64 {11F55366-12EC-4C44-A8CB-1D4E315D61ED}.Release JITIL|x64.Build.0 = Release|x64
{0318BA30-EF48-441A-9E10-DC85EFAE39F0}.Release|Win32.ActiveCfg = Release|Win32 {11F55366-12EC-4C44-A8CB-1D4E315D61ED}.Release|Win32.ActiveCfg = Release|Win32
{0318BA30-EF48-441A-9E10-DC85EFAE39F0}.Release|x64.ActiveCfg = Release|x64 {11F55366-12EC-4C44-A8CB-1D4E315D61ED}.Release|x64.ActiveCfg = Release|x64
{4D3CD4C5-412B-4B49-9B1B-A68A2A129C77}.Debug|Win32.ActiveCfg = Debug|Win32 {4D3CD4C5-412B-4B49-9B1B-A68A2A129C77}.Debug|Win32.ActiveCfg = Debug|Win32
{4D3CD4C5-412B-4B49-9B1B-A68A2A129C77}.Debug|Win32.Build.0 = Debug|Win32 {4D3CD4C5-412B-4B49-9B1B-A68A2A129C77}.Debug|Win32.Build.0 = Debug|Win32
{4D3CD4C5-412B-4B49-9B1B-A68A2A129C77}.Debug|x64.ActiveCfg = Debug|x64 {4D3CD4C5-412B-4B49-9B1B-A68A2A129C77}.Debug|x64.ActiveCfg = Debug|x64
@ -385,17 +379,17 @@ Global
{ADF64291-57ED-4B7A-AB76-37B4A991504B}.Release|Win32.ActiveCfg = Release|Win32 {ADF64291-57ED-4B7A-AB76-37B4A991504B}.Release|Win32.ActiveCfg = Release|Win32
{ADF64291-57ED-4B7A-AB76-37B4A991504B}.Release|x64.ActiveCfg = Release|x64 {ADF64291-57ED-4B7A-AB76-37B4A991504B}.Release|x64.ActiveCfg = Release|x64
{ADF64291-57ED-4B7A-AB76-37B4A991504B}.Release|x64.Build.0 = Release|x64 {ADF64291-57ED-4B7A-AB76-37B4A991504B}.Release|x64.Build.0 = Release|x64
{71B16F46-0B00-4EDA-B253-D6D9D03A215C}.Debug|Win32.ActiveCfg = Debug|Win32 {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}.Debug|Win32.ActiveCfg = Debug|Win32
{71B16F46-0B00-4EDA-B253-D6D9D03A215C}.Debug|Win32.Build.0 = Debug|Win32 {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}.Debug|Win32.Build.0 = Debug|Win32
{71B16F46-0B00-4EDA-B253-D6D9D03A215C}.Debug|x64.ActiveCfg = Debug|x64 {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}.Debug|x64.ActiveCfg = Debug|x64
{71B16F46-0B00-4EDA-B253-D6D9D03A215C}.Debug|x64.Build.0 = Debug|x64 {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}.Debug|x64.Build.0 = Debug|x64
{71B16F46-0B00-4EDA-B253-D6D9D03A215C}.DebugFast|Win32.ActiveCfg = DebugFast|Win32 {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
{71B16F46-0B00-4EDA-B253-D6D9D03A215C}.DebugFast|x64.ActiveCfg = DebugFast|x64 {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}.DebugFast|x64.ActiveCfg = DebugFast|x64
{71B16F46-0B00-4EDA-B253-D6D9D03A215C}.Release JITIL|Win32.ActiveCfg = Release|Win32 {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}.Release JITIL|Win32.ActiveCfg = Release|Win32
{71B16F46-0B00-4EDA-B253-D6D9D03A215C}.Release JITIL|x64.ActiveCfg = Release|x64 {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}.Release JITIL|x64.ActiveCfg = Release|x64
{71B16F46-0B00-4EDA-B253-D6D9D03A215C}.Release JITIL|x64.Build.0 = Release|x64 {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}.Release JITIL|x64.Build.0 = Release|x64
{71B16F46-0B00-4EDA-B253-D6D9D03A215C}.Release|Win32.ActiveCfg = Release|Win32 {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}.Release|Win32.ActiveCfg = Release|Win32
{71B16F46-0B00-4EDA-B253-D6D9D03A215C}.Release|x64.ActiveCfg = Release|x64 {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}.Release|x64.ActiveCfg = Release|x64
{521498BE-6089-4780-8223-E67C22F4E068}.Debug|Win32.ActiveCfg = Debug|Win32 {521498BE-6089-4780-8223-E67C22F4E068}.Debug|Win32.ActiveCfg = Debug|Win32
{521498BE-6089-4780-8223-E67C22F4E068}.Debug|Win32.Build.0 = Debug|Win32 {521498BE-6089-4780-8223-E67C22F4E068}.Debug|Win32.Build.0 = Debug|Win32
{521498BE-6089-4780-8223-E67C22F4E068}.Debug|x64.ActiveCfg = Debug|x64 {521498BE-6089-4780-8223-E67C22F4E068}.Debug|x64.ActiveCfg = Debug|x64
@ -425,21 +419,6 @@ Global
{C7E5D50A-2916-464B-86A7-E10B3CC88ADA}.Release|Win32.Build.0 = Release|Win32 {C7E5D50A-2916-464B-86A7-E10B3CC88ADA}.Release|Win32.Build.0 = Release|Win32
{C7E5D50A-2916-464B-86A7-E10B3CC88ADA}.Release|x64.ActiveCfg = Release|x64 {C7E5D50A-2916-464B-86A7-E10B3CC88ADA}.Release|x64.ActiveCfg = Release|x64
{C7E5D50A-2916-464B-86A7-E10B3CC88ADA}.Release|x64.Build.0 = Release|x64 {C7E5D50A-2916-464B-86A7-E10B3CC88ADA}.Release|x64.Build.0 = Release|x64
{DE7C596C-CBC4-4278-8909-146D63990803}.Debug|Win32.ActiveCfg = Debug|Win32
{DE7C596C-CBC4-4278-8909-146D63990803}.Debug|Win32.Build.0 = Debug|Win32
{DE7C596C-CBC4-4278-8909-146D63990803}.Debug|x64.ActiveCfg = Debug|x64
{DE7C596C-CBC4-4278-8909-146D63990803}.Debug|x64.Build.0 = Debug|x64
{DE7C596C-CBC4-4278-8909-146D63990803}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
{DE7C596C-CBC4-4278-8909-146D63990803}.DebugFast|Win32.Build.0 = DebugFast|Win32
{DE7C596C-CBC4-4278-8909-146D63990803}.DebugFast|x64.ActiveCfg = DebugFast|x64
{DE7C596C-CBC4-4278-8909-146D63990803}.DebugFast|x64.Build.0 = DebugFast|x64
{DE7C596C-CBC4-4278-8909-146D63990803}.Release JITIL|Win32.ActiveCfg = Release|Win32
{DE7C596C-CBC4-4278-8909-146D63990803}.Release JITIL|x64.ActiveCfg = Release|x64
{DE7C596C-CBC4-4278-8909-146D63990803}.Release JITIL|x64.Build.0 = Release|x64
{DE7C596C-CBC4-4278-8909-146D63990803}.Release|Win32.ActiveCfg = Release|Win32
{DE7C596C-CBC4-4278-8909-146D63990803}.Release|Win32.Build.0 = Release|Win32
{DE7C596C-CBC4-4278-8909-146D63990803}.Release|x64.ActiveCfg = Release|x64
{DE7C596C-CBC4-4278-8909-146D63990803}.Release|x64.Build.0 = Release|x64
{95CCAABC-7062-47C4-B8C1-A064DD5F16FF}.Debug|Win32.ActiveCfg = Debug|Win32 {95CCAABC-7062-47C4-B8C1-A064DD5F16FF}.Debug|Win32.ActiveCfg = Debug|Win32
{95CCAABC-7062-47C4-B8C1-A064DD5F16FF}.Debug|Win32.Build.0 = Debug|Win32 {95CCAABC-7062-47C4-B8C1-A064DD5F16FF}.Debug|Win32.Build.0 = Debug|Win32
{95CCAABC-7062-47C4-B8C1-A064DD5F16FF}.Debug|x64.ActiveCfg = Debug|x64 {95CCAABC-7062-47C4-B8C1-A064DD5F16FF}.Debug|x64.ActiveCfg = Debug|x64
@ -483,6 +462,9 @@ Global
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
AMDCaProjectFile = D:\Dev\Dolphin\trunk\Source\CodeAnalyst\Dolphin.caw
EndGlobalSection
GlobalSection(NestedProjects) = preSolution GlobalSection(NestedProjects) = preSolution
{B7F1A9FB-BEA8-416E-9460-AE35A6A5165C} = {61C7F431-0623-4A8D-9C4B-EDE35696554A} {B7F1A9FB-BEA8-416E-9460-AE35A6A5165C} = {61C7F431-0623-4A8D-9C4B-EDE35696554A}
{C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {61C7F431-0623-4A8D-9C4B-EDE35696554A} {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {61C7F431-0623-4A8D-9C4B-EDE35696554A}
@ -510,9 +492,6 @@ Global
{0B72B5D6-5D72-4391-84A7-9CCA5392668A} = {77CF6E34-3038-4B23-A2E7-90AD17801609} {0B72B5D6-5D72-4391-84A7-9CCA5392668A} = {77CF6E34-3038-4B23-A2E7-90AD17801609}
{0D14F1E9-490B-4A2D-A4EF-0535E8B3C718} = {77CF6E34-3038-4B23-A2E7-90AD17801609} {0D14F1E9-490B-4A2D-A4EF-0535E8B3C718} = {77CF6E34-3038-4B23-A2E7-90AD17801609}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
AMDCaProjectFile = D:\Dev\Dolphin\trunk\Source\CodeAnalyst\Dolphin.caw
EndGlobalSection
GlobalSection(DPCodeReviewSolutionGUID) = preSolution GlobalSection(DPCodeReviewSolutionGUID) = preSolution
DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
EndGlobalSection EndGlobalSection