From c66c54814c21f92973a611580a451afe1b467253 Mon Sep 17 00:00:00 2001 From: John Peterson Date: Sat, 20 Jun 2009 11:05:52 +0000 Subject: [PATCH] MusicMod: Fixed the build git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3507 8ced0084-cf51-0410-be5f-012b33b47a6e --- Externals/MusicMod/Main/Src/Frame.cpp | 108 +++++++------- Externals/MusicMod/Main/Src/Main.cpp | 72 ++++++---- Externals/MusicMod/Player/Src/Config.cpp | 22 +-- Externals/MusicMod/Player/Src/InputPlugin.cpp | 2 +- Externals/MusicMod/Player/Src/Main.cpp | 2 +- Externals/MusicMod/Player/Src/Output.cpp | 2 +- .../MusicMod/Player/Src/OutputPlugin.cpp | 4 +- Externals/MusicMod/Player/Src/Playback.cpp | 24 ++-- Externals/MusicMod/Player/Src/Player.cpp | 42 +++--- .../MusicMod/Player/Src/PlayerExport.cpp | 32 +++-- Externals/MusicMod/Player/Src/PlaylistModel.h | 2 +- Externals/MusicMod/Player/Src/Timer.cpp | 12 +- Source/Core/Common/Src/Setup.h | 3 + .../Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp | 11 ++ Source/Core/DiscIO/Src/VolumeGC.cpp | 16 ++- Source/Core/DolphinWX/Src/BootManager.cpp | 14 ++ Source/Core/DolphinWX/Src/Frame.cpp | 42 +++--- Source/Core/DolphinWX/Src/Frame.h | 20 +++ Source/Core/DolphinWX/Src/FrameTools.cpp | 92 ++++++++++-- Source/Core/DolphinWX/Src/Globals.h | 11 ++ Source/MusicMod.sln | 132 ++++++++++++------ 21 files changed, 446 insertions(+), 219 deletions(-) diff --git a/Externals/MusicMod/Main/Src/Frame.cpp b/Externals/MusicMod/Main/Src/Frame.cpp index a29d02c1ed..9de36c4fab 100644 --- a/Externals/MusicMod/Main/Src/Frame.cpp +++ b/Externals/MusicMod/Main/Src/Frame.cpp @@ -25,6 +25,7 @@ #include "IniFile.h" // Common #include "Log.h" +#include "Setup.h" #include "../../../../Source/Core/DolphinWX/Src/Globals.h" // DolphinWX #include "../../../../Source/Core/DolphinWX/Src/Frame.h" @@ -39,10 +40,9 @@ ////////////////////////////////// - ////////////////////////////////////////////////////////////////////////////////////////// // Declarations and definitions -// ŻŻŻŻŻŻŻŻŻŻ +// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ namespace MusicMod { bool GlobalMute = false; @@ -51,16 +51,15 @@ namespace MusicMod int GlobalVolume = 125; extern bool dllloaded; - void ShowConsole(); + void ShowConsole(bool); void Init(); } -////////////////////////////////// - +////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////// // Change the brightness of a wxBitmap -// ŻŻŻŻŻŻŻŻŻŻ +// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ wxBitmap SetBrightness(wxBitmap _Bitmap, int _Brightness, bool Gray) { wxImage _Image = _Bitmap.ConvertToImage(); @@ -126,9 +125,12 @@ wxBitmap SetBrightness(wxBitmap _Bitmap, int _Brightness, bool Gray) //wxMessageBox(Tmp); } -////////////////////////////////// +////////////////////////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////////////////// +// Create bitmaps +// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ #ifdef MUSICMOD void CFrame::MM_InitBitmaps(int Theme) @@ -158,20 +160,22 @@ CFrame::MM_InitBitmaps(int Theme) // Update in case the bitmap has been updated //if (GetToolBar() != NULL) TheToolBar->FindById(Toolbar_Log)->SetNormalBitmap(m_Bitmaps[Toolbar_Log]); } +////////////////////////////////////////////////////////////////////////////////////////// -void -CFrame::MM_PopulateGUI() +////////////////////////////////////////////////////////////////////////////////////////// +// Create GUI controls +// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +void CFrame::MM_PopulateGUI() { wxToolBar* toolBar = TheToolBar; // Shortcut toolBar->AddSeparator(); - MusicMod::Init(); - - // --------------------------------------- + // ------------------------------------------------------------ // Draw a rotated music label // --------------------- + /* wxBitmap m_RotatedText(30, 15); wxMemoryDC dc; dc.SelectObject(m_RotatedText); @@ -180,7 +184,7 @@ CFrame::MM_PopulateGUI() // Set outline and fill colors dc.SetBackground(BackgroundGrayBrush); dc.Clear(); - + // Set font style and color wxFont m_font(8, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD); dc.SetFont(m_font); dc.SetTextForeground(wxColour(*wxLIGHT_GREY)); @@ -191,8 +195,8 @@ CFrame::MM_PopulateGUI() wxStaticBitmap * m_StaticBitmap = new wxStaticBitmap(toolBar, wxID_ANY, m_RotatedText); toolBar->AddControl(m_StaticBitmap); - // --------------------------- - + */ + // ------------------------------------------------------------ mm_ToolMute = toolBar->AddTool(IDM_MUTE, _T("Mute"), m_Bitmaps[Toolbar_PluginDSP], _T("Mute music")); @@ -210,16 +214,17 @@ CFrame::MM_PopulateGUI() */ - // --------------------- + // --------------------------------------------------------- /* Lots of code to get a label for the slider, in 2.9.0 AddControl accepts a label so then this code can be simplified a lot */ // --------- - wxPanel * mm_SliderPanel = new wxPanel(toolBar, IDS_VOLUME_PANEL, wxDefaultPosition, wxDefaultSize); - mm_Slider = new wxSlider(mm_SliderPanel, IDS_VOLUME, 125, 0, 255, wxDefaultPosition, wxDefaultSize); + wxPanel * mm_SliderPanel = new wxPanel(toolBar, IDM_VOLUME_PANEL, wxDefaultPosition, wxDefaultSize); + mm_Slider = new wxSlider(mm_SliderPanel, IDM_VOLUME, 125, 0, 255, wxDefaultPosition, wxDefaultSize); //mm_Slider->SetToolTip("Change the music volume"); mm_Slider->SetValue(MusicMod::GlobalVolume); + // --------------------------------------------------------- - wxStaticText * mm_SliderText = new wxStaticText(mm_SliderPanel, IDS_VOLUME_LABEL, _T("Volume"), wxDefaultPosition, wxDefaultSize); + wxStaticText * mm_SliderText = new wxStaticText(mm_SliderPanel, IDM_VOLUME_LABEL, _T("Volume"), wxDefaultPosition, wxDefaultSize); wxBoxSizer * mm_VolSizer = new wxBoxSizer(wxVERTICAL); mm_VolSizer->Add(mm_Slider, 0, wxEXPAND | wxALL, 0); mm_VolSizer->Add(mm_SliderText, 0, wxCENTER | wxALL, 0); @@ -230,14 +235,16 @@ CFrame::MM_PopulateGUI() toolBar->AddControl((wxControl*)mm_SliderPanel); // --------- - mm_ToolLog = toolBar->AddTool(IDT_LOG, _T("Log"), m_Bitmaps[Toolbar_Log], - wxT("Show or hide log. Enable the log window and restart Dolphin to show the DLL status.")); + // Console button disabled + //mm_ToolLog = toolBar->AddTool(IDM_LOG, _T("Log"), m_Bitmaps[Toolbar_Log], + // wxT("Show or hide log. Enable the log window and restart Dolphin to show the DLL status.")); } +////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////// // Update GUI -// ŻŻŻŻŻŻŻŻŻŻ +// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ void CFrame::MM_UpdateGUI() { @@ -263,6 +270,7 @@ CFrame::MM_UpdateGUI() mm_ToolPlay->SetNormalBitmap(m_Bitmaps[Toolbar_Pause]); } + /* if(MusicMod::bShowConsole) { mm_ToolLog->SetNormalBitmap(m_Bitmaps[Toolbar_Log]); @@ -271,18 +279,19 @@ CFrame::MM_UpdateGUI() { mm_ToolLog->SetNormalBitmap(m_Bitmaps[Toolbar_Log_Dis]); } + */ } ////////////////////////////////// -// ======================================================================================= +////////////////////////////////////////////////////////////////////////////////////////// // Play and stop music -// --------------------------------------------------------------------------------------- +// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ void CFrame::MM_OnPlay() { - //INFO_LOG(AUDIO,"\nCFrame::OnPlayMusicMod > Begin\n"); + //NOTICE_LOG(AUDIO,"\nCFrame::OnPlayMusicMod > Begin\n"); // Save the volume MusicMod::GlobalVolume = mm_Slider->GetValue(); @@ -296,7 +305,7 @@ CFrame::MM_OnPlay() { if (Core::GetState() == Core::CORE_RUN) { - //INFO_LOG(AUDIO,"CFrame::OnPlayMusicMod > Pause\n"); + //NOTICE_LOG(AUDIO,"CFrame::OnPlayMusicMod > Pause\n"); if(!MusicMod::GlobalPause) // we may has set this elsewhere { MusicMod::GlobalPause = true; @@ -308,7 +317,7 @@ CFrame::MM_OnPlay() } else { - //INFO_LOG(AUDIO,"CFrame::OnPlayMusicMod > Play\n"); + //NOTICE_LOG(AUDIO,"CFrame::OnPlayMusicMod > Play\n"); if(MusicMod::GlobalPause) // we may has set this elsewhere { MusicMod::GlobalPause = false; @@ -332,11 +341,11 @@ CFrame::MM_OnStop() // ======================================================================================= // Mute music -// --------------------------------------------------------------------------------------- +// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ void CFrame::MM_OnMute(wxCommandEvent& WXUNUSED (event)) { - //INFO_LOG(AUDIO,"CFrame::OnMute > Begin\n"); + //NOTICE_LOG(AUDIO,"CFrame::OnMute > Begin\n"); //MessageBox(0, "", "", 0); if(!MusicMod::GlobalMute) @@ -364,11 +373,11 @@ CFrame::MM_OnMute(wxCommandEvent& WXUNUSED (event)) // ======================================================================================= // Pause music -// --------------------------------------------------------------------------------------- +// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ void CFrame::MM_OnPause(wxCommandEvent& WXUNUSED (event)) { - INFO_LOG(AUDIO,"CFrame::OnPause > Begin\n"); + NOTICE_LOG(AUDIO,"CFrame::OnPause > Begin\n"); //MessageBox(0, "", "", 0); if(!MusicMod::GlobalPause) @@ -392,14 +401,12 @@ CFrame::MM_OnPause(wxCommandEvent& WXUNUSED (event)) } - - // ======================================================================================= // Change volume -// --------------------------------------------------------------------------------------- +// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ void CFrame::MM_OnVolume(wxScrollEvent& event) { - //INFO_LOG(AUDIO,"CFrame::OnVolume > Begin <%i>\n", event.GetPosition()); + //NOTICE_LOG(AUDIO,"CFrame::OnVolume > Begin <%i>\n", event.GetPosition()); //MessageBox(0, "", "", 0); //if(event.GetEventType() == wxEVT_SCROLL_PAGEUP || event.GetEventType() == wxEVT_SCROLL_PAGEDOWN) @@ -428,38 +435,29 @@ void CFrame::MM_OnVolume(wxScrollEvent& event) //======================================================================================= - // ======================================================================================= // Show log -// --------------------------------------------------------------------------------------- -void CFrame::MM_OnLog(wxCommandEvent& event) +// ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ +void CFrame::MM_OnLog(bool Show) { - //INFO_LOG(AUDIO,"CFrame::OnLog > Begin\n"); + //NOTICE_LOG(AUDIO, "CFrame::OnLog > Begin\n"); //MessageBox(0, "", "", 0); + //NOTICE_LOG(AUDIO, "MM_OnLog: %i", MusicMod::dllloaded); - if(!MusicMod::dllloaded) return; // Avoid crash + // Check that Init() was run + if(!MusicMod::dllloaded) MusicMod::Init(); + // Check that it succeeded + if(!MusicMod::dllloaded) return; - MusicMod::bShowConsole = !MusicMod::bShowConsole; - - if(MusicMod::bShowConsole) - /* What we do here is run StartConsoleWin() in Common directly after each - other first in the exe then in the DLL, sometimes this would give me a rampant memory - usage increase until the exe crashed at 700 MB memory usage or something like that. - For that reason I'm trying to sleep for a moment between them here. */ - { MusicMod::ShowConsole(); Sleep(100); Player_Console(true); } - else - { - #if defined (_WIN32) - Console::Close(); Player_Console(false); - #endif - } + MusicMod::bShowConsole = Show; + MusicMod::ShowConsole(MusicMod::bShowConsole); IniFile file; file.Load("Plainamp.ini"); file.Set("Interface", "ShowConsole", MusicMod::bShowConsole); file.Save("Plainamp.ini"); - UpdateGUI(); + //UpdateGUI(); } //======================================================================================= diff --git a/Externals/MusicMod/Main/Src/Main.cpp b/Externals/MusicMod/Main/Src/Main.cpp index 89d95367a2..0f5207ea7b 100644 --- a/Externals/MusicMod/Main/Src/Main.cpp +++ b/Externals/MusicMod/Main/Src/Main.cpp @@ -98,7 +98,7 @@ void StructSort (std::vector &MyFiles) { MyFilesStructure temp; - //INFO_LOG(AUDIO,"StructSort > Begin\n"); + //NOTICE_LOG(AUDIO,"StructSort > Begin\n"); for(int i = 0; i < MyFiles.size() - 1; i++) { @@ -119,16 +119,29 @@ void StructSort (std::vector &MyFiles) std::cout << i << " " << MyFiles[i].path.c_str() << "#" << MyFiles[i].offset << "\n"; } - //INFO_LOG(AUDIO,"StructSort > Done\n"); + //NOTICE_LOG(AUDIO,"StructSort > Done\n"); } // ============================ // ======================================================================================= -/* Run these things once */ +/* Run these things once when Dolphin starts */ // ------------------------ -void ShowConsole() +void ShowConsole(bool Show) { + if (Show) + { + /* What we do here is run StartConsoleWin() in Common directly after each + other first in the exe then in the DLL, sometimes this would give me a rampant memory + usage increase until the exe crashed at 700 MB memory usage or something like that. + For that reason I'm trying to sleep for a moment between them here. */ + Sleep(100); + Player_Console(true); + } + else + { + Player_Console(false); + } // Console::Open(100, 2000, "MusicMod", true); // Give room for 2000 rows } @@ -149,13 +162,13 @@ void Init() // --------------------------------------- // Make a debugging window // --------------------- - if(MusicMod::bShowConsole) ShowConsole(); + //if(MusicMod::bShowConsole) ShowConsole(); // Write version #ifdef _M_X64 - INFO_LOG(AUDIO,"64 bit version\n"); + NOTICE_LOG(AUDIO,"64 bit version\n"); #else - INFO_LOG(AUDIO,"32 bit version\n"); + NOTICE_LOG(AUDIO,"32 bit version\n"); #endif // ----------- @@ -165,7 +178,7 @@ void Init() // Show DLL status Player_Main(MusicMod::bShowConsole); //play_file("c:\\demo36_02.ast"); - //INFO_LOG(AUDIO,"DLL loaded\n"); + //NOTICE_LOG(AUDIO,"DLL loaded\n"); dllloaded = true; // Do this once } @@ -173,15 +186,17 @@ void Init() // ======================================================================================= -/* This will read the GC file system. */ +/* Function: Read the GC file system when a game is booted + Called from: BootManager.cpp */ // ------------------------ void Main(std::string FileName) { // - DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(FileName.c_str()); - + DiscIO::IVolume* pVolume = DiscIO::CreateVolumeFromFilename(FileName); // my_pFileSystem = new DiscIO::CFileSystemGCWii(pVolume); + // Check that it worked + if (my_pFileSystem->m_FileInfoVector.size() == 0) NOTICE_LOG(AUDIO, "Volume creation failed") /* We have to sort the files according to offset so that out scan in Blob.cpp works. Because StructSort() only works for MyFilesStructure I copy the offset and filenames @@ -202,7 +217,7 @@ void Main(std::string FileName) LPSECURITY_ATTRIBUTES attr; attr = NULL; MusicPath = "Music\\"; - INFO_LOG(AUDIO,"Created a Music directory\n"); + NOTICE_LOG(AUDIO,"Created a Music directory\n"); CreateDirectory(MusicPath.c_str(), attr); // ---------------------------------------------------------------------------------------- } @@ -216,8 +231,6 @@ void CheckFile(std::string File, int FileNumber) // Do nothing if we found the same file again if (CurrentFile == File) return; - //INFO_LOG(AUDIO,">>>> (%i)Current read %s <%u = %ux%i> \n", i, CurrentFiles[i].path.c_str(), offset, CurrentFiles[i].offset, size); - // Check if it's a music file if (CheckFileEnding(File.c_str())) { @@ -227,7 +240,7 @@ void CheckFile(std::string File, int FileNumber) if (CurrentPlayFile == File) return; // Notify the user - INFO_LOG(AUDIO,"\n >>> (%i/%i) Match %s\n\n", FileNumber, MyFiles.size(), File.c_str()); + NOTICE_LOG(AUDIO,"\n >>> (%i/%i) Match %s\n", FileNumber, MyFiles.size(), File.c_str()); // Save the matched file CurrentPlayFile = File; @@ -236,7 +249,7 @@ void CheckFile(std::string File, int FileNumber) // We will now save the file to the PC hard drive // ------------------ // Get the filename - std::size_t pointer = File.find_last_of("\\"); + std::size_t pointer = File.find_last_of("/"); std::string fragment = File.substr (0, (pointer-0)); int compare = File.length() - fragment.length(); // Get the length of the filename fragment = File.substr ((pointer+1), compare); // Now we have the filename @@ -245,9 +258,11 @@ void CheckFile(std::string File, int FileNumber) std::string FilePath = (MusicPath + fragment); WritingFile = true; // Avoid detecting the file we are writing - INFO_LOG(AUDIO,"Writing <%s> to <%s>\n", File.c_str(), FilePath.c_str()); - my_pFileSystem->ExportFile(File.c_str(), FilePath.c_str()); + NOTICE_LOG(AUDIO, "Writing '%s' to '%s'", File.c_str(), FilePath.c_str()); + if (!my_pFileSystem->ExportFile(File.c_str(), FilePath.c_str())) + NOTICE_LOG(AUDIO, "ERROR: ExportFile failed"); WritingFile = false; + // ------------------------------------------------------ // --------------------------------------------------------------------------------------- // Play the file we found @@ -256,8 +271,9 @@ void CheckFile(std::string File, int FileNumber) { Player_Play((char*)FilePath.c_str()); // retype it from const char* to char* } else { - INFO_LOG(AUDIO,"Warning > Music DLL is not loaded"); + NOTICE_LOG(AUDIO, "Warning > Music DLL is not loaded"); } + // ------------------------------------------------------ // --------------------------------------------------------------------------------------- // Remove the last file, if any @@ -266,11 +282,12 @@ void CheckFile(std::string File, int FileNumber) { if(!remove(CurrentPlayFilePath.c_str())) { - INFO_LOG(AUDIO,"The program failed to remove <%s>\n", CurrentPlayFilePath.c_str()); + NOTICE_LOG(AUDIO,"The program failed to remove '%s'", CurrentPlayFilePath.c_str()); } else { - INFO_LOG(AUDIO,"The program removed <%s>\n", CurrentPlayFilePath.c_str()); + NOTICE_LOG(AUDIO,"The program removed '%s'", CurrentPlayFilePath.c_str()); } } + // ------------------------------------------------------ // --------------------------------------------------------------------------------------- // Save the current playing file @@ -279,7 +296,7 @@ void CheckFile(std::string File, int FileNumber) } // Tell the user about the files we ignored - INFO_LOG(AUDIO,"(%i/%i) Ignored %s\n", FileNumber, MyFiles.size(), File.c_str()); + NOTICE_LOG(AUDIO,"(%i/%i) Ignored '%s'\n", FileNumber, MyFiles.size(), File.c_str()); // Update the current file CurrentFile = File; @@ -299,8 +316,6 @@ void FindFilename(u64 offset, u64 size) upp the scanning */ 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 the matching offset. Before MyFiles has data this loop will go nowhere. We have to @@ -310,6 +325,9 @@ void FindFilename(u64 offset, u64 size) // --------------------------------------------------------------------------------------- for (int i = 0; i < (int)(MyFiles.size() - 1); ++i) { + // Log + //NOTICE_LOG(AUDIO, ">>> Comparing %s [#%i, Size: %i, Location: %u] with %u", MyFiles[i].path.c_str(), i, size, MyFiles[i].offset, offset); + // --------------------------------------------------------------------------------------- /* If we assume that myoffset is the begginning of every file this works. Suppose there are three files @@ -332,6 +350,12 @@ void FindFilename(u64 offset, u64 size) // Stop checking break; } + + // If the file check failed + if (i == (int)(MyFiles.size() - 1) - 1) + { + NOTICE_LOG(AUDIO, "ERROR: GC filename search failed"); + } } } // This ends the entire filescan // ======================================================================================= diff --git a/Externals/MusicMod/Player/Src/Config.cpp b/Externals/MusicMod/Player/Src/Config.cpp index d6b3615bf9..49465c88b5 100644 --- a/Externals/MusicMod/Player/Src/Config.cpp +++ b/Externals/MusicMod/Player/Src/Config.cpp @@ -34,7 +34,7 @@ const TCHAR * SECTION = TEXT( "Plainamp" ); ConfVar::ConfVar( TCHAR * szKey, ConfMode mode ) { // MessageBox( 0, TEXT( "no const @ ConfVar" ), TEXT( "" ), 0 ); - //INFO_LOG(AUDIO,"ConfVar::ConfVar(TCHAR) > Got <%s>\n", szKey); + //NOTICE_LOG(AUDIO,"ConfVar::ConfVar(TCHAR) > Got <%s>\n", szKey); // Init const int iLen = ( int )_tcslen( szKey ); @@ -59,7 +59,7 @@ ConfVar::ConfVar( TCHAR * szKey, ConfMode mode ) //////////////////////////////////////////////////////////////////////////////// ConfVar::ConfVar( const TCHAR * szKey, ConfMode mode ) { - //INFO_LOG(AUDIO,"ConfVar::ConfVar(const TCHAR) > Got <%s>\n", szKey); + //NOTICE_LOG(AUDIO,"ConfVar::ConfVar(const TCHAR) > Got <%s>\n", szKey); // Init m_szKey = ( TCHAR * )szKey; @@ -73,7 +73,7 @@ ConfVar::ConfVar( const TCHAR * szKey, ConfMode mode ) if( !conf_map ) conf_map = new map; conf_map->insert( pair( m_szKey, this ) ); - //INFO_LOG(AUDIO,"ConfVar::ConfVar(const TCHAR) > Insert <%s>\n", ConfVar::m_szKey); + //NOTICE_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 ) { // MessageBox( 0, TEXT( "no const @ ConfBool" ), TEXT( "" ), 0 ); - //INFO_LOG(AUDIO,"ConfBool(TCHAR) > Get <%s>\n", szKey); + //NOTICE_LOG(AUDIO,"ConfBool(TCHAR) > Get <%s>\n", szKey); m_pbData = pbData; 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 ) { - //INFO_LOG(AUDIO,"ConfBool(TCHAR) > Get <%s>\n", szKey); + //NOTICE_LOG(AUDIO,"ConfBool(TCHAR) > Get <%s>\n", szKey); m_pbData = pbData; m_bDefault = bDefault; @@ -127,7 +127,7 @@ ConfBool::ConfBool( bool * pbData, const TCHAR * szKey, ConfMode mode, bool bDef //////////////////////////////////////////////////////////////////////////////// void ConfBool::Read() { - //INFO_LOG(AUDIO,"ConfBool::Read() > Begin and \n", m_bRead, szIniPath); + //NOTICE_LOG(AUDIO,"ConfBool::Read() > Begin and \n", m_bRead, szIniPath); if( m_bRead || !szIniPath ) return; @@ -507,13 +507,13 @@ ConfString::ConfString( TCHAR * szData, const TCHAR * szKey, ConfMode mode, TCHA //////////////////////////////////////////////////////////////////////////////// void ConfString::Read() { - //INFO_LOG(AUDIO, "ConfString::Read() > Begin\n"); + //NOTICE_LOG(AUDIO, "ConfString::Read() > Begin\n"); if( m_bRead || !szIniPath ) return; GetPrivateProfileString( SECTION, m_szKey, m_szDefault, m_szData, m_iMaxLen, szIniPath ); - //INFO_LOG(AUDIO, "ConfString::Read() > GetPrivateProfileString <%s> <%s> <%s>\n", m_szKey, m_szData, szIniPath); + //NOTICE_LOG(AUDIO, "ConfString::Read() > GetPrivateProfileString <%s> <%s> <%s>\n", m_szKey, m_szData, szIniPath); m_bRead = true; } @@ -567,7 +567,7 @@ void ConfCurDir::Read() // Apply //SetCurrentDirectory( m_szData ); - //INFO_LOG(AUDIO,"ConfCurDir::Read > End <%s>\n", m_szData); + //NOTICE_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 // MessageBox( 0, m_szData, TEXT( "CurDir" ), 0 ); - //INFO_LOG(AUDIO,"ConfCurDir::Read <%s>\n", m_szData); + //NOTICE_LOG(AUDIO,"ConfCurDir::Read <%s>\n", m_szData); 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, TEXT( "Plainamp.ini" ) ); - INFO_LOG(AUDIO,"DLL > Ini path <%s>\n", szIniPath); + NOTICE_LOG(AUDIO,"DLL > Ini path <%s>\n", szIniPath); // ======================================================================================= diff --git a/Externals/MusicMod/Player/Src/InputPlugin.cpp b/Externals/MusicMod/Player/Src/InputPlugin.cpp index 4fe945773c..59fed72c55 100644 --- a/Externals/MusicMod/Player/Src/InputPlugin.cpp +++ b/Externals/MusicMod/Player/Src/InputPlugin.cpp @@ -37,7 +37,7 @@ InputPlugin::InputPlugin( TCHAR * szDllpath, bool bKeepLoaded ) : Plugin( szDllp iFiltersLen = 0; plugin = NULL; - //INFO_LOG(AUDIO,"\InputPlugin::InputPlugin > Begin\n"); + //NOTICE_LOG(AUDIO,"\InputPlugin::InputPlugin > Begin\n"); if( !Load() ) { diff --git a/Externals/MusicMod/Player/Src/Main.cpp b/Externals/MusicMod/Player/Src/Main.cpp index 61fd7428f4..5b8a16a4e8 100644 --- a/Externals/MusicMod/Player/Src/Main.cpp +++ b/Externals/MusicMod/Player/Src/Main.cpp @@ -371,7 +371,7 @@ LRESULT CALLBACK WndprocMain( HWND hwnd, UINT message, WPARAM wp, LPARAM lp ) static bool bRemoveIcon = false; #ifdef NOGUI - //INFO_LOG(AUDIO,"DLL > Main.cpp:WndprocMain() was called. But nothing will be done. \n"); + //NOTICE_LOG(AUDIO,"DLL > Main.cpp:WndprocMain() was called. But nothing will be done. \n"); #else Console::Append( TEXT( "Main.cpp:WndprocMain was called" ) ); #endif diff --git a/Externals/MusicMod/Player/Src/Output.cpp b/Externals/MusicMod/Player/Src/Output.cpp index 86bc6f4a08..5f88e5ff8a 100644 --- a/Externals/MusicMod/Player/Src/Output.cpp +++ b/Externals/MusicMod/Player/Src/Output.cpp @@ -266,7 +266,7 @@ void Output_SetVolume( int volume ) //_stprintf( szBuffer, TEXT( "DLL > Output_SetVolume <%i>" ), volume ); //Console::Append( szBuffer ); //Console::Append( TEXT( " " ) ); - //INFO_LOG(AUDIO, "DLL > Output_SetVolume <%i>\n", volume ); + //NOTICE_LOG(AUDIO, "DLL > Output_SetVolume <%i>\n", volume ); // ======================================================================================= for( int i = 0; i < active_output_count; i++ ) diff --git a/Externals/MusicMod/Player/Src/OutputPlugin.cpp b/Externals/MusicMod/Player/Src/OutputPlugin.cpp index 73b01f7be5..3138e85b70 100644 --- a/Externals/MusicMod/Player/Src/OutputPlugin.cpp +++ b/Externals/MusicMod/Player/Src/OutputPlugin.cpp @@ -248,7 +248,7 @@ bool OutputPlugin::Config( HWND hParent ) //////////////////////////////////////////////////////////////////////////////// bool OutputPlugin::Start() { - //INFO_LOG(AUDIO, "OutputPlugin::Start() > Begin \n", + //NOTICE_LOG(AUDIO, "OutputPlugin::Start() > Begin \n", // IsLoaded(), bActive, active_output_count ); if( !IsLoaded() ) return false; @@ -275,7 +275,7 @@ bool OutputPlugin::Start() Console::Append( szBuffer ); Console::Append( TEXT( " " ) ); #else - INFO_LOG(AUDIO, "\n >>> Output plugin '%s' activated\n\n" , GetFilename() ); + NOTICE_LOG(AUDIO, "\n >>> Output plugin '%s' activated\n\n" , GetFilename() ); #endif bActive = true; diff --git a/Externals/MusicMod/Player/Src/Playback.cpp b/Externals/MusicMod/Player/Src/Playback.cpp index 090d2e07a5..41a6be7298 100644 --- a/Externals/MusicMod/Player/Src/Playback.cpp +++ b/Externals/MusicMod/Player/Src/Playback.cpp @@ -60,14 +60,14 @@ void EnableTimer( bool bEnabled ) if( bEnabled ) { SetTimer( WindowMain, TIMER_SEEK_UPDATE, 1000, NULL ); - INFO_LOG(AUDIO, "EnableTimer > Activated\n" ); + NOTICE_LOG(AUDIO, "EnableTimer > Activated\n" ); } else { KillTimer( WindowMain, TIMER_SEEK_UPDATE ); StatusReset(); - INFO_LOG(AUDIO, "EnableTimer > Killed\n" ); + NOTICE_LOG(AUDIO, "EnableTimer > Killed\n" ); } bTimerRunning = bEnabled; @@ -82,7 +82,7 @@ bool OpenPlay( TCHAR * szFilename, int iNumber ) { // ======================================================================================= #ifdef NOGUI - //INFO_LOG(AUDIO, "Playback.cpp: OpenPlay > Begin <%i> <%s>\n" , iNumber, szFilename ); + //NOTICE_LOG(AUDIO, "Playback.cpp: OpenPlay > Begin <%i> <%s>\n" , iNumber, szFilename ); #else TCHAR sszBuffer[ 5000 ]; _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( " " ); - INFO_LOG(AUDIO,"OpenPlay > ERROR: Extension not supported\n"); + NOTICE_LOG(AUDIO,"OpenPlay > ERROR: Extension not supported\n"); return false; } // --------------------------------------------------------------------------------------- // 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 active_input_plugin = iter->second; - INFO_LOG(AUDIO,"OpenPlay > Input plugin '%s' activated\n", active_input_plugin->GetFilename()); + NOTICE_LOG(AUDIO,"OpenPlay > Input plugin '%s' activated\n", active_input_plugin->GetFilename()); // ======================================================================================= if( old_input ) @@ -145,12 +145,12 @@ bool OpenPlay( TCHAR * szFilename, int iNumber ) { Console::Append( TEXT( "ERROR: Input plugin is NULL" ) ); Console::Append( " " ); - INFO_LOG(AUDIO,"OpenPlay > ERROR: Input plugin is NULL\n"); + NOTICE_LOG(AUDIO,"OpenPlay > ERROR: Input plugin is NULL\n"); return false; } // Connect - //INFO_LOG(AUDIO, "OpenPlay > OutMod\n" ); + //NOTICE_LOG(AUDIO, "OpenPlay > OutMod\n" ); active_input_plugin->plugin->outMod = &output_server; // output->plugin; // ======================================================================================= @@ -190,10 +190,10 @@ bool OpenPlay( TCHAR * szFilename, int iNumber ) TCHAR szTitle[ 2000 ] = TEXT( "\0" ); int length_in_ms; - //INFO_LOG(AUDIO, "OpenPlay > GetFileInfo\n" ); + //NOTICE_LOG(AUDIO, "OpenPlay > GetFileInfo\n" ); active_input_plugin->plugin->GetFileInfo( szFilename, szTitle, &length_in_ms ); - //INFO_LOG(AUDIO, "OpenPlay > Play\n" ); + //NOTICE_LOG(AUDIO, "OpenPlay > Play\n" ); active_input_plugin->plugin->Play( szFilename ); // ======================================================================================= #endif @@ -218,7 +218,7 @@ bool OpenPlay( TCHAR * szFilename, int iNumber ) // Timer ON //EnableTimer( true ); - //INFO_LOG(AUDIO, "OpenPlay > End\n" ); + //NOTICE_LOG(AUDIO, "OpenPlay > End\n" ); return true; } @@ -298,7 +298,7 @@ bool Playback::Play() Console::Append( sszBuffer ); Console::Append( TEXT( " " ) ); #else - //INFO_LOG(AUDIO, "Playback::Play() > Begin <%i>\n" , bPlaying ); + //NOTICE_LOG(AUDIO, "Playback::Play() > Begin <%i>\n" , bPlaying ); #endif // --------------------------------------------------------------------------------------- @@ -393,7 +393,7 @@ bool Playback::Play() Console::Append( szBuffer ); //Console::Append( TEXT( " " ) ); #else - //INFO_LOG(AUDIO, "Playback::Play() > Filename <%s>\n", szFilename); + //NOTICE_LOG(AUDIO, "Playback::Play() > Filename <%s>\n", szFilename); #endif // Play diff --git a/Externals/MusicMod/Player/Src/Player.cpp b/Externals/MusicMod/Player/Src/Player.cpp index 8c1075ba56..03be5a7cd7 100644 --- a/Externals/MusicMod/Player/Src/Player.cpp +++ b/Externals/MusicMod/Player/Src/Player.cpp @@ -119,15 +119,15 @@ void Player_Main(bool Console) //g_hInstance = hInstance; // ======================================================================================= - //printf( "DLL > main_dll() opened\n" ); + //printf( "DLL > main_dll() opened" ); if (Console) Player_Console(true); //MessageBox(0, "main() opened", "", 0); //printf( "main() opened\n" ); - INFO_LOG(AUDIO,"\n=========================================================\n\n\n" ); - //INFO_LOG(AUDIO, "DLL > Player_Main() > Begin\n" ); - INFO_LOG(AUDIO, "DLL > Settings:\n", bLoop); + NOTICE_LOG(AUDIO,"\n=========================================================\n\n\n" ); + //NOTICE_LOG(AUDIO, "DLL > Player_Main() > Begin\n" ); + NOTICE_LOG(AUDIO, "DLL > Settings:", bLoop); // ======================================================================================= @@ -137,8 +137,8 @@ void Player_Main(bool Console) // --------------------------------------------------------------------------------------- - INFO_LOG(AUDIO, "DLL > Loop: %i\n", bLoop); - INFO_LOG(AUDIO, "DLL > WarnPluginsMissing: %i\n", bWarnPluginsMissing); + NOTICE_LOG(AUDIO, "DLL > Loop: %i", bLoop); + NOTICE_LOG(AUDIO, "DLL > WarnPluginsMissing: %i", bWarnPluginsMissing); // --------------------------------------------------------------------------------------- // ======================================================================================= @@ -170,7 +170,7 @@ void Player_Main(bool Console) memcpy( szPluginDir, szHomeDir, iHomeDirLen * sizeof( TCHAR ) ); memcpy( szPluginDir + iHomeDirLen, TEXT( "PluginsMusic" ), 12 * sizeof( TCHAR ) ); szPluginDir[ iHomeDirLen + 12 ] = TEXT( '\0' ); - INFO_LOG(AUDIO,"DLL > Plugindir: %s\n", szPluginDir); + NOTICE_LOG(AUDIO,"DLL > Plugindir: %s", szPluginDir); // ======================================================================================= #ifndef NOGUI Font::Create(); @@ -183,7 +183,7 @@ void Player_Main(bool Console) //GlobalVolume = Playback::Volume::Get(); // Don't bother with this for now //GlobalCurrentVolume = GlobalVolume; //Output_SetVolume( GlobalVolume ); - INFO_LOG(AUDIO,"DLL > Volume: %i\n\n", GlobalVolume); + NOTICE_LOG(AUDIO,"DLL > Volume: %i\n", GlobalVolume); // --------------------------------------------------------------------------------------- @@ -206,10 +206,10 @@ void Player_Main(bool Console) Plugin::FindAll ( szPluginDir, TEXT( "dsp_*.dll" ), false ); Plugin::FindAll ( szPluginDir, TEXT( "gen_*.dll" ), true ); - //INFO_LOG(AUDIO, "Winmain.cpp > PluginManager::Fill()\n" ); + //NOTICE_LOG(AUDIO, "Winmain.cpp > PluginManager::Fill()\n" ); PluginManager::Fill(); - //INFO_LOG(AUDIO, "Winmain.cpp > PluginManager::Fill()\n" ); + //NOTICE_LOG(AUDIO, "Winmain.cpp > PluginManager::Fill()\n" ); @@ -251,26 +251,26 @@ void Player_Main(bool Console) // Check the plugins if( input_plugins.empty() ) { - INFO_LOG(AUDIO,"\n *** Warning: No valid input plugins found\n\n"); + NOTICE_LOG(AUDIO,"\n *** Warning: No valid input plugins found\n"); } else { - INFO_LOG(AUDIO," >>> These valid input plugins were found:\n"); + NOTICE_LOG(AUDIO," >>> These valid input plugins were found:"); for(int i = 0; i < input_plugins.size(); i++) - INFO_LOG(AUDIO," %i: %s\n", (i + 1), input_plugins.at(i)->GetFilename()); - INFO_LOG(AUDIO,"\n"); + NOTICE_LOG(AUDIO," %i: %s", (i + 1), input_plugins.at(i)->GetFilename()); + NOTICE_LOG(AUDIO,"\n"); } // The input plugins are never activated here, they are activate for each file if( !active_input_plugin || !active_input_plugin->plugin ) { - // INFO_LOG(AUDIO,"The input plugin is not activated yet\n"); + // NOTICE_LOG(AUDIO,"The input plugin is not activated yet\n"); } else { //const int ms_len = active_input_plugin->plugin->GetLength(); //const int ms_cur = active_input_plugin->plugin->GetOutputTime(); - //INFO_LOG(AUDIO,"We are at <%i of %i>\n", ms_cur, ms_len); + //NOTICE_LOG(AUDIO,"We are at <%i of %i>\n", ms_cur, ms_len); } // --------------------------------------------------------------------------------------- if( active_output_count > 0 ) @@ -281,11 +281,11 @@ void Player_Main(bool Console) { res_temp = active_output_plugins[ i ]->plugin->GetOutputTime(); } - INFO_LOG(AUDIO,"Playback progress <%i>\n", res_temp);*/ + NOTICE_LOG(AUDIO,"Playback progress <%i>\n", res_temp);*/ } else { - INFO_LOG(AUDIO,"\n *** Warning: The output plugin is not working\n\n"); + NOTICE_LOG(AUDIO,"\n *** Warning: The output plugin is not working\n\n"); } // ======================================================================================= @@ -293,14 +293,14 @@ void Player_Main(bool Console) // Start the timer if(!TimerCreated && bLoop) // Only create this the first time { - //INFO_LOG(AUDIO,"Created the timer\n"); + //NOTICE_LOG(AUDIO,"Created the timer\n"); MakeTime(); TimerCreated = true; } // ======================================================================================= - INFO_LOG(AUDIO, "\n=========================================================\n\n" ); - //INFO_LOG(AUDIO, "DLL > main_dll() > End\n\n\n" ); + NOTICE_LOG(AUDIO, "\n=========================================================\n\n" ); + //NOTICE_LOG(AUDIO, "DLL > main_dll() > End\n\n\n" ); //std::cin.get(); } diff --git a/Externals/MusicMod/Player/Src/PlayerExport.cpp b/Externals/MusicMod/Player/Src/PlayerExport.cpp index db35042358..acf23993f0 100644 --- a/Externals/MusicMod/Player/Src/PlayerExport.cpp +++ b/Externals/MusicMod/Player/Src/PlayerExport.cpp @@ -60,21 +60,21 @@ void AddFileToPlaylist(char * a) void Player_Play(char * FileName) { - INFO_LOG(AUDIO,"Play file <%s>\n", FileName); + NOTICE_LOG(AUDIO,"Play file '%s'", FileName); // Check if the file exists if(GetFileAttributes(FileName) == INVALID_FILE_ATTRIBUTES) { - INFO_LOG(AUDIO,"Warning: The file <%s> does not exist. Something is wrong.\n", FileName); + NOTICE_LOG(AUDIO,"Warning: The file '%s' does not exist. Something is wrong.", FileName); return; } Playback::Stop(); - //INFO_LOG(AUDIO,"Stop\n"); + //NOTICE_LOG(AUDIO,"Stop\n"); playlist->RemoveAll(); - //INFO_LOG(AUDIO,"RemoveAll\n"); + //NOTICE_LOG(AUDIO,"RemoveAll\n"); AddFileToPlaylist(FileName); - //INFO_LOG(AUDIO,"addfiletoplaylist\n"); + //NOTICE_LOG(AUDIO,"addfiletoplaylist\n"); // Play the file Playback::Play(); @@ -84,7 +84,7 @@ void Player_Play(char * FileName) // --------------------------------------------------------------------------------------- // Set volume. This must probably be done after the dll is loaded. //Output_SetVolume( Playback::Volume::Get() ); - //INFO_LOG(AUDIO,"Volume(%i)\n", Playback::Volume::Get()); + //NOTICE_LOG(AUDIO,"Volume(%i)\n", Playback::Volume::Get()); // --------------------------------------------------------------------------------------- GlobalPause = false; @@ -93,7 +93,7 @@ void Player_Play(char * FileName) void Player_Stop() { Playback::Stop(); - //INFO_LOG(AUDIO,"Stop\n"); + //NOTICE_LOG(AUDIO,"Stop\n"); playlist->RemoveAll(); CurrentlyPlayingFile = ""; @@ -106,13 +106,13 @@ void Player_Pause() { if (!GlobalPause) { - INFO_LOG(AUDIO,"DLL > Pause\n"); + NOTICE_LOG(AUDIO,"DLL > Pause\n"); Playback::Pause(); GlobalPause = true; } else { - INFO_LOG(AUDIO,"DLL > UnPause from Pause\n"); + NOTICE_LOG(AUDIO,"DLL > UnPause from Pause\n"); Player_Unpause(); GlobalPause = false; } @@ -120,7 +120,7 @@ void Player_Pause() void Player_Unpause() { - INFO_LOG(AUDIO,"DLL > UnPause\n"); + NOTICE_LOG(AUDIO,"DLL > UnPause\n"); Playback::Play(); GlobalPause = false; } @@ -136,7 +136,7 @@ void Player_Unpause() void Player_Mute(int Vol) { if(GlobalVolume == -1) GlobalVolume = Vol; - INFO_LOG(AUDIO,"DLL > Mute <%i> <%i>\n", GlobalVolume, GlobalMute); + NOTICE_LOG(AUDIO,"DLL > Mute <%i> <%i>\n", GlobalVolume, GlobalMute); GlobalMute = !GlobalMute; @@ -144,15 +144,15 @@ void Player_Mute(int Vol) if(GlobalMute) { Output_SetVolume( 0 ); - INFO_LOG(AUDIO,"DLL > Volume <%i>\n", GlobalMute); + NOTICE_LOG(AUDIO,"DLL > Volume <%i>\n", GlobalMute); } else { Output_SetVolume( GlobalVolume ); - INFO_LOG(AUDIO,"DLL > Volume <%i>\n", GlobalMute); + NOTICE_LOG(AUDIO,"DLL > Volume <%i>\n", GlobalMute); } - //INFO_LOG(AUDIO,"Volume(%i)\n", Playback::Volume::Get()); + //NOTICE_LOG(AUDIO,"Volume(%i)\n", Playback::Volume::Get()); } /////////////////////////////////////// @@ -161,11 +161,13 @@ void Player_Volume(int Vol) { GlobalVolume = Vol; Output_SetVolume( GlobalVolume ); - //INFO_LOG(AUDIO,"DLL > Volume <%i> <%i>\n", GlobalVolume, GlobalCurrentVolume); + //NOTICE_LOG(AUDIO,"DLL > Volume <%i> <%i>\n", GlobalVolume, GlobalCurrentVolume); } void ShowConsole() { + ConsoleListener *console = LogManager::GetInstance()->getConsoleListener(); + console->Open(100, 2000, "MusicMod"); // Console::Open(100, 2000, "MusicMod", true); // give room for 2000 rows } diff --git a/Externals/MusicMod/Player/Src/PlaylistModel.h b/Externals/MusicMod/Player/Src/PlaylistModel.h index 1a914c8f3a..275d1a9f07 100644 --- a/Externals/MusicMod/Player/Src/PlaylistModel.h +++ b/Externals/MusicMod/Player/Src/PlaylistModel.h @@ -105,7 +105,7 @@ public: if( 0 > iIndex || iIndex >= ( int )_database.size() ) { - INFO_LOG(AUDIO,"SetCurIndex > Return"); + NOTICE_LOG(AUDIO,"SetCurIndex > Return"); return; } diff --git a/Externals/MusicMod/Player/Src/Timer.cpp b/Externals/MusicMod/Player/Src/Timer.cpp index ca6aa21526..8cf2a64747 100644 --- a/Externals/MusicMod/Player/Src/Timer.cpp +++ b/Externals/MusicMod/Player/Src/Timer.cpp @@ -48,7 +48,7 @@ extern bool GlobalPause; void CALLBACK Update(unsigned int,unsigned int,unsigned long,unsigned long,unsigned long) #endif { - //INFO_LOG(AUDIO,"DLL > Update() > Begin (%i)\n", active_input_plugin); + //NOTICE_LOG(AUDIO,"DLL > Update() > Begin (%i)\n", active_input_plugin); // -------------------------------- // 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 if(!active_input_plugin || !active_input_plugin->plugin) { - //INFO_LOG(AUDIO,"The input plugin is not activated yet\n"); + //NOTICE_LOG(AUDIO,"The input plugin is not activated yet\n"); } 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 // basically { - //INFO_LOG(AUDIO,"Playback progress <%i of %i>\n", ms_cur, ms_len); + //NOTICE_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 // 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 { - INFO_LOG(AUDIO,"Restart <%s>\n", CurrentlyPlayingFile.c_str()); + NOTICE_LOG(AUDIO,"Restart <%s>\n", CurrentlyPlayingFile.c_str()); Player_Play((char *)CurrentlyPlayingFile.c_str()); } } // -------------- - //INFO_LOG(AUDIO,"Make new time\n"); + //NOTICE_LOG(AUDIO,"Make new time\n"); MakeTime(); // Make a new one } @@ -119,7 +119,7 @@ int MainTimer() // cout << "."; //} - //INFO_LOG(AUDIO,"MakeTime\n"); + //NOTICE_LOG(AUDIO,"MakeTime\n"); return 0; } diff --git a/Source/Core/Common/Src/Setup.h b/Source/Core/Common/Src/Setup.h index c32b5fe959..0b9ed0a3fe 100644 --- a/Source/Core/Common/Src/Setup.h +++ b/Source/Core/Common/Src/Setup.h @@ -57,6 +57,9 @@ // 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 9b945651b6..618154525f 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,6 +29,12 @@ #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; @@ -222,6 +228,11 @@ 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; diff --git a/Source/Core/DiscIO/Src/VolumeGC.cpp b/Source/Core/DiscIO/Src/VolumeGC.cpp index 3082d74aa2..67d2ea2de7 100644 --- a/Source/Core/DiscIO/Src/VolumeGC.cpp +++ b/Source/Core/DiscIO/Src/VolumeGC.cpp @@ -20,6 +20,14 @@ #include "VolumeGC.h" #include "StringUtil.h" +////////////////////////////////////////////////// +// Music mod +// ŻŻŻŻŻŻŻŻŻŻ +#include "Setup.h" // Define MUSICMOD here +#ifdef MUSICMOD +#include "../../../../Externals/MusicMod/Main/Src/Main.h" +#endif +/////////////////////// namespace DiscIO { @@ -37,7 +45,13 @@ bool CVolumeGC::Read(u64 _Offset, u64 _Length, u8* _pBuffer) const { if (m_pReader == NULL) return false; - + ////////////////////////////////////////////////// + // Music mod + // ŻŻŻŻŻŻŻŻŻŻ + #ifdef MUSICMOD + MusicMod::FindFilename(_Offset, _Length); + #endif + /////////////////////// return m_pReader->Read(_Offset, _Length, _pBuffer); } diff --git a/Source/Core/DolphinWX/Src/BootManager.cpp b/Source/Core/DolphinWX/Src/BootManager.cpp index 258001f6b3..75bef8516d 100644 --- a/Source/Core/DolphinWX/Src/BootManager.cpp +++ b/Source/Core/DolphinWX/Src/BootManager.cpp @@ -58,6 +58,10 @@ #include "Frame.h" #include "CodeWindow.h" #include "Setup.h" + // MusicMod + #ifdef MUSICMOD + #include "../../../Externals/MusicMod/Main/Src/Main.h" + #endif #endif @@ -200,6 +204,16 @@ bool BootCore(const std::string& _rFilename) #endif // ===================== + + // ================================================================= + // Init MusicMod + // ŻŻŻŻŻŻŻŻŻŻ + #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 f930a53792..050d98c50f 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -34,6 +34,11 @@ be accessed from Core::GetWindowHandle(). // includes // ---------------------------------------------------------------------------- +#include "Common.h" // Common +#include "FileUtil.h" +#include "Timer.h" +#include "Setup.h" + #include "Globals.h" // Local #include "Frame.h" #include "ConfigMain.h" @@ -44,11 +49,6 @@ be accessed from Core::GetWindowHandle(). #include "GameListCtrl.h" #include "BootManager.h" -#include "Common.h" // Common -#include "FileUtil.h" -#include "Timer.h" -#include "Setup.h" - #include "ConfigManager.h" // Core #include "Core.h" #include "HW/DVDInterface.h" @@ -82,7 +82,6 @@ extern "C" { }; - ////////////////////////////////////////////////////////////////////////////////////////// /* Windows functions. Setting the cursor with wxSetCursor() did not work in this instance. Probably because it's somehow reset from the WndProc() in the child window */ @@ -114,7 +113,7 @@ HWND MSWGetParent_(HWND Parent) return GetParent(Parent); } #endif -///////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////////////////// @@ -226,13 +225,12 @@ int abc = 0; return wxPanel::MSWWindowProc(nMsg, wParam, lParam); } #endif -///////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////////////////// - -// ---------------------------------------------------------------------------- +////////////////////////////////////////////////////////////////////////////////////////// // event tables -// ---------------------------------------------------------------------------- +// ---------------------------- // Notice that wxID_HELP will be processed for the 'About' menu and the toolbar // help button. @@ -256,6 +254,13 @@ 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 + EVT_MENU(IDM_NETPLAY, CFrame::OnNetPlay) EVT_MENU(IDM_BROWSE, CFrame::OnBrowse) EVT_MENU(IDM_MEMCARD, CFrame::OnMemcard) @@ -291,13 +296,12 @@ EVT_HOST_COMMAND(wxID_ANY, CFrame::OnHostMessage) EVT_TIMER(wxID_ANY, CFrame::OnTimer) #endif END_EVENT_TABLE() -///////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////////////////// -// ---------------------------------------------------------------------------- +////////////////////////////////////////////////////////////////////////////////////////// // Creation and close, quit functions -// ---------------------------------------------------------------------------- - +// ---------------------------------------- CFrame::CFrame(bool showLogWindow, wxFrame* parent, wxWindowID id, @@ -342,6 +346,12 @@ 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); @@ -443,7 +453,7 @@ void CFrame::OnClose(wxCloseEvent& event) UpdateGUI(); } } -///////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////// diff --git a/Source/Core/DolphinWX/Src/Frame.h b/Source/Core/DolphinWX/Src/Frame.h index 7f242b0375..1bacd0b7c4 100644 --- a/Source/Core/DolphinWX/Src/Frame.h +++ b/Source/Core/DolphinWX/Src/Frame.h @@ -100,6 +100,22 @@ 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, @@ -117,6 +133,10 @@ 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 d97701e126..091865f79e 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -16,24 +16,38 @@ // http://code.google.com/p/dolphin-emu/ -/* +////////////////////////////////////////////////////////////////////////////////////////// +// Documentation +/* ŻŻŻŻŻŻŻŻŻŻŻŻŻŻ + +1.1 Windows + CFrame is the main parent window. Inside CFrame there is m_Panel which is the parent for the rendering window (when we render to the main window). In Windows the rendering window is created by giving CreateWindow() m_Panel->GetHandle() as parent window and creating a new child window to m_Panel. The new child window handle that is returned by CreateWindow() can be accessed from Core::GetWindowHandle(). -*/ + +///////////////////////////////////////////////*/ + // FIXME: why doesn't it work on windows??? #ifndef _WIN32 #include "Common.h" #endif +#include "Setup.h" // Common + #if defined(HAVE_SFML) && HAVE_SFML || defined(_WIN32) #include "NetWindow.h" #endif +#include "Common.h" // Common +#include "FileUtil.h" +#include "FileSearch.h" +#include "Timer.h" + #include "Globals.h" // Local #include "Frame.h" #include "ConfigMain.h" @@ -47,12 +61,6 @@ Core::GetWindowHandle(). #include "LogWindow.h" #include "WxUtils.h" -#include "Common.h" // Common -#include "FileUtil.h" -#include "FileSearch.h" -#include "Timer.h" -#include "Setup.h" - #include "ConfigManager.h" // Core #include "Core.h" #include "HW/DVDInterface.h" @@ -91,7 +99,10 @@ static const long TOOLBAR_STYLE = wxTB_FLAT | wxTB_DOCKABLE | wxTB_TEXT; wxCheatsWindow* CheatsWindow; wxInfoWindow* InfoWindow; + +////////////////////////////////////////////////////////////////////////////////////// // Create menu items +// ---------------------- void CFrame::CreateMenu() { if (GetMenuBar()) @@ -211,9 +222,12 @@ void CFrame::CreateMenu() // Associate the menu bar with the frame SetMenuBar(menuBar); } +////////////////////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////////////// // Create toolbar items +// ---------------------- void CFrame::PopulateToolbar(wxToolBar* toolBar) { int w = m_Bitmaps[Toolbar_FileOpen].GetWidth(), @@ -224,10 +238,7 @@ void CFrame::PopulateToolbar(wxToolBar* toolBar) toolBar->AddTool(wxID_REFRESH, _T("Refresh"), m_Bitmaps[Toolbar_Refresh], _T("Refresh")); toolBar->AddTool(IDM_BROWSE, _T("Browse"), m_Bitmaps[Toolbar_Browse], _T("Browse for an ISO directory...")); toolBar->AddSeparator(); - toolBar->AddTool(IDM_PLAY, _T("Play"), m_Bitmaps[Toolbar_Play], _T("Play")); - - toolBar->AddTool(IDM_STOP, _T("Stop"), m_Bitmaps[Toolbar_Stop], _T("Stop")); #ifdef _WIN32 toolBar->AddTool(IDM_TOGGLE_FULLSCREEN, _T("Fullscr."), m_Bitmaps[Toolbar_FullScreen], _T("Toggle Fullscreen")); @@ -242,10 +253,21 @@ 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(); } +////////////////////////////////////////////////////////////////////////////////////// // Delete and recreate the toolbar @@ -362,15 +384,31 @@ 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(); } +/////////////////////////////////////////////////////////////////////////////////////////////////// // Start the game or change the disc +// ------------- void CFrame::BootGame() { + // Music modification + #ifdef MUSICMOD + MM_OnPlay(); + #endif + // Rerecording #ifdef RERECORDING Core::RerecordingStart(); @@ -470,8 +508,12 @@ void CFrame::OnBootDrive(wxCommandEvent& event) { BootManager::BootCore(drives[event.GetId()-IDM_DRIVE1]); } +/////////////////////////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////////////////////////// // Refresh the file list and browse for a favorites directory +// -------------------- void CFrame::OnRefresh(wxCommandEvent& WXUNUSED (event)) { if (m_GameListCtrl) @@ -485,7 +527,12 @@ void CFrame::OnBrowse(wxCommandEvent& WXUNUSED (event)) { m_GameListCtrl->BrowseForDirectory(); } +/////////////////////////////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////////////////////////// +// Create screenshot +// -------------------- static inline void GenerateScreenshotName(std::string& name) { int index = 1; @@ -510,11 +557,19 @@ void CFrame::OnScreenshot(wxCommandEvent& WXUNUSED (event)) if(!bPaused) Core::SetState(Core::CORE_RUN); } +/////////////////////////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////////////////////////////// // Stop the emulation +// -------------------- void CFrame::DoStop() { + // Music modification + #ifdef MUSICMOD + MM_OnStop(); + #endif + // Rerecording #ifdef RERECORDING Core::RerecordingStop(); @@ -551,6 +606,8 @@ void CFrame::OnStop(wxCommandEvent& WXUNUSED (event)) { DoStop(); } +/////////////////////////////////////////////////////////////////////////////////////////////////// + void CFrame::OnConfigMain(wxCommandEvent& WXUNUSED (event)) { @@ -595,7 +652,6 @@ void CFrame::OnPluginWiimote(wxCommandEvent& WXUNUSED (event)) ); } - void CFrame::OnHelp(wxCommandEvent& event) { switch (event.GetId()) @@ -752,6 +808,14 @@ 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); } @@ -759,6 +823,10 @@ 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 386256294b..ab84a08bef 100644 --- a/Source/Core/DolphinWX/Src/Globals.h +++ b/Source/Core/DolphinWX/Src/Globals.h @@ -79,6 +79,17 @@ 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, diff --git a/Source/MusicMod.sln b/Source/MusicMod.sln index b14f3cf139..0c97184944 100644 --- a/Source/MusicMod.sln +++ b/Source/MusicMod.sln @@ -1,13 +1,13 @@ Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual C++ Express 2008 +# Visual Studio 2008 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "Core\Core\Core.vcproj", "{F0B874CB-4476-4199-9315-8343D05AE684}" ProjectSection(ProjectDependencies) = postProject - {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} {C7E5D50A-2916-464B-86A7-E10B3CC88ADA} = {C7E5D50A-2916-464B-86A7-E10B3CC88ADA} {11F55366-12EC-4C44-A8CB-1D4E315D61ED} = {11F55366-12EC-4C44-A8CB-1D4E315D61ED} {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} {95CCAABC-7062-47C4-B8C1-A064DD5F16FF} = {95CCAABC-7062-47C4-B8C1-A064DD5F16FF} {29C2ABC1-ADA5-42CD-A5FC-96022D52A510} = {29C2ABC1-ADA5-42CD-A5FC-96022D52A510} + {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} {B7F1A9FB-BEA8-416E-9460-AE35A6A5165C} = {B7F1A9FB-BEA8-416E-9460-AE35A6A5165C} EndProjectSection @@ -21,10 +21,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_VideoDX9", "Plugins\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_PadSimple", "Plugins\Plugin_PadSimple\Plugin_PadSimple.vcproj", "{9A183B48-ECC2-4121-876A-9B3793686073}" ProjectSection(ProjectDependencies) = postProject - {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} {C7E5D50A-2916-464B-86A7-E10B3CC88ADA} = {C7E5D50A-2916-464B-86A7-E10B3CC88ADA} {11F55366-12EC-4C44-A8CB-1D4E315D61ED} = {11F55366-12EC-4C44-A8CB-1D4E315D61ED} {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} + {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} EndProjectSection EndProject @@ -32,7 +32,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Bochs_disasm", "..\External EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\Externals\zlib\zlib.vcproj", "{3E03C179-8251-46E4-81F4-466F114BAC63}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_DSP_LLE", "Plugins\Plugin_DSP_LLE\Plugin_DSP_LLE.vcproj", "{3D8156A9-64D1-4C8E-ADBE-1B319030E4A4}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_DSP_LLE", "Plugins\Plugin_DSP_LLE\Plugin_DSP_LLE.vcproj", "{C60D0E7A-ED05-4C67-9EE7-3A6C0D7801C8}" ProjectSection(ProjectDependencies) = postProject {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} EndProjectSection @@ -45,10 +45,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DiscIO", "Core\DiscIO\DiscI EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_VideoOGL", "Plugins\Plugin_VideoOGL\Plugin_VideoOGL.vcproj", "{CFDCEE0E-FA45-4F72-9FCC-0B88F5A75160}" ProjectSection(ProjectDependencies) = postProject - {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} {11F55366-12EC-4C44-A8CB-1D4E315D61ED} = {11F55366-12EC-4C44-A8CB-1D4E315D61ED} {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} {E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA} = {E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA} + {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} EndProjectSection EndProject @@ -56,19 +56,19 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Core\Common\Commo EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dolphin", "Core\DolphinWX\DolphinWX.vcproj", "{A72606EF-C5C1-4954-90AD-F0F93A8D97D9}" ProjectSection(ProjectDependencies) = postProject - {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} {CFDCEE0E-FA45-4F72-9FCC-0B88F5A75160} = {CFDCEE0E-FA45-4F72-9FCC-0B88F5A75160} - {11F55366-12EC-4C44-A8CB-1D4E315D61ED} = {11F55366-12EC-4C44-A8CB-1D4E315D61ED} {8D612734-FAA5-4B8A-804F-4DEA2367D495} = {8D612734-FAA5-4B8A-804F-4DEA2367D495} - {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} {33546D62-7F34-4EA6-A88E-D538B36E16BF} = {33546D62-7F34-4EA6-A88E-D538B36E16BF} + {11F55366-12EC-4C44-A8CB-1D4E315D61ED} = {11F55366-12EC-4C44-A8CB-1D4E315D61ED} {3E03C179-8251-46E4-81F4-466F114BAC63} = {3E03C179-8251-46E4-81F4-466F114BAC63} + {823DDC98-42D5-4A38-88CF-9DC06C788AE4} = {823DDC98-42D5-4A38-88CF-9DC06C788AE4} + {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} {95CCAABC-7062-47C4-B8C1-A064DD5F16FF} = {95CCAABC-7062-47C4-B8C1-A064DD5F16FF} {521498BE-6089-4780-8223-E67C22F4E068} = {521498BE-6089-4780-8223-E67C22F4E068} {29C2ABC1-ADA5-42CD-A5FC-96022D52A510} = {29C2ABC1-ADA5-42CD-A5FC-96022D52A510} {4D3CD4C5-412B-4B49-9B1B-A68A2A129C77} = {4D3CD4C5-412B-4B49-9B1B-A68A2A129C77} + {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} {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} EndProjectSection EndProject @@ -78,24 +78,25 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxCore28", "..\Externals\wx EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Debugger", "Core\DebuggerWX\DebuggerWX.vcproj", "{4D3CD4C5-412B-4B49-9B1B-A68A2A129C77}" ProjectSection(ProjectDependencies) = postProject - {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} {11F55366-12EC-4C44-A8CB-1D4E315D61ED} = {11F55366-12EC-4C44-A8CB-1D4E315D61ED} {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} {29C2ABC1-ADA5-42CD-A5FC-96022D52A510} = {29C2ABC1-ADA5-42CD-A5FC-96022D52A510} + {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} {F0B874CB-4476-4199-9315-8343D05AE684} = {F0B874CB-4476-4199-9315-8343D05AE684} {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoCommon", "Core\VideoCommon\VideoCommon.vcproj", "{E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA}" ProjectSection(ProjectDependencies) = postProject + {C0B84DA9-FF15-4FAB-9590-17132F3C6DE4} = {C0B84DA9-FF15-4FAB-9590-17132F3C6DE4} {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} EndProjectSection EndProject 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 - {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} {11F55366-12EC-4C44-A8CB-1D4E315D61ED} = {11F55366-12EC-4C44-A8CB-1D4E315D61ED} {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} + {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} EndProjectSection EndProject @@ -103,18 +104,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LZO", "..\Externals\LZO\LZO EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_Wiimote", "Plugins\Plugin_Wiimote\Plugin_Wiimote.vcproj", "{8D612734-FAA5-4B8A-804F-4DEA2367D495}" ProjectSection(ProjectDependencies) = postProject - {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} {C7E5D50A-2916-464B-86A7-E10B3CC88ADA} = {C7E5D50A-2916-464B-86A7-E10B3CC88ADA} {11F55366-12EC-4C44-A8CB-1D4E315D61ED} = {11F55366-12EC-4C44-A8CB-1D4E315D61ED} {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} + {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} EndProjectSection 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}" ProjectSection(ProjectDependencies) = postProject - {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} {11F55366-12EC-4C44-A8CB-1D4E315D61ED} = {11F55366-12EC-4C44-A8CB-1D4E315D61ED} {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} + {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} EndProjectSection EndProject @@ -122,15 +123,25 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxAdv28", "..\Externals\wxW EndProject 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 - {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} {C7E5D50A-2916-464B-86A7-E10B3CC88ADA} = {C7E5D50A-2916-464B-86A7-E10B3CC88ADA} {11F55366-12EC-4C44-A8CB-1D4E315D61ED} = {11F55366-12EC-4C44-A8CB-1D4E315D61ED} {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} + {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} EndProjectSection 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}" 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}" ProjectSection(ProjectDependencies) = postProject {0B72B5D6-5D72-4391-84A7-9CCA5392668A} = {0B72B5D6-5D72-4391-84A7-9CCA5392668A} @@ -143,9 +154,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Player", "..\Externals\Musi EndProjectSection EndProject 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 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SFML_Network", "..\Externals\SFML\build\vc2008\sfml-network.vcproj", "{823DDC98-42D5-4A38-88CF-9DC06C788AE4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SOIL", "..\Externals\SOIL\SOIL.vcproj", "{C0B84DA9-FF15-4FAB-9590-17132F3C6DE4}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -200,7 +212,6 @@ Global {29C2ABC1-ADA5-42CD-A5FC-96022D52A510}.Debug|x64.ActiveCfg = Debug|x64 {29C2ABC1-ADA5-42CD-A5FC-96022D52A510}.Debug|x64.Build.0 = Debug|x64 {29C2ABC1-ADA5-42CD-A5FC-96022D52A510}.DebugFast|Win32.ActiveCfg = DebugFast|Win32 - {29C2ABC1-ADA5-42CD-A5FC-96022D52A510}.DebugFast|Win32.Build.0 = DebugFast|Win32 {29C2ABC1-ADA5-42CD-A5FC-96022D52A510}.DebugFast|x64.ActiveCfg = DebugFast|x64 {29C2ABC1-ADA5-42CD-A5FC-96022D52A510}.DebugFast|x64.Build.0 = DebugFast|x64 {29C2ABC1-ADA5-42CD-A5FC-96022D52A510}.Release JITIL|Win32.ActiveCfg = Release|Win32 @@ -221,21 +232,20 @@ Global {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.Build.0 = Release|x64 - {3D8156A9-64D1-4C8E-ADBE-1B319030E4A4}.Debug|Win32.ActiveCfg = Debug|Win32 - {3D8156A9-64D1-4C8E-ADBE-1B319030E4A4}.Debug|x64.ActiveCfg = Debug|x64 - {3D8156A9-64D1-4C8E-ADBE-1B319030E4A4}.DebugFast|Win32.ActiveCfg = DebugFast|Win32 - {3D8156A9-64D1-4C8E-ADBE-1B319030E4A4}.DebugFast|x64.ActiveCfg = DebugFast|x64 - {3D8156A9-64D1-4C8E-ADBE-1B319030E4A4}.DebugFast|x64.Build.0 = DebugFast|x64 - {3D8156A9-64D1-4C8E-ADBE-1B319030E4A4}.Release JITIL|Win32.ActiveCfg = Release|x64 - {3D8156A9-64D1-4C8E-ADBE-1B319030E4A4}.Release JITIL|x64.ActiveCfg = Release|x64 - {3D8156A9-64D1-4C8E-ADBE-1B319030E4A4}.Release|Win32.ActiveCfg = Release|Win32 - {3D8156A9-64D1-4C8E-ADBE-1B319030E4A4}.Release|x64.ActiveCfg = Release|x64 + {C60D0E7A-ED05-4C67-9EE7-3A6C0D7801C8}.Debug|Win32.ActiveCfg = Debug|Win32 + {C60D0E7A-ED05-4C67-9EE7-3A6C0D7801C8}.Debug|x64.ActiveCfg = Debug|x64 + {C60D0E7A-ED05-4C67-9EE7-3A6C0D7801C8}.DebugFast|Win32.ActiveCfg = DebugFast|Win32 + {C60D0E7A-ED05-4C67-9EE7-3A6C0D7801C8}.DebugFast|x64.ActiveCfg = DebugFast|x64 + {C60D0E7A-ED05-4C67-9EE7-3A6C0D7801C8}.DebugFast|x64.Build.0 = DebugFast|x64 + {C60D0E7A-ED05-4C67-9EE7-3A6C0D7801C8}.Release JITIL|Win32.ActiveCfg = Release|x64 + {C60D0E7A-ED05-4C67-9EE7-3A6C0D7801C8}.Release JITIL|x64.ActiveCfg = Release|x64 + {C60D0E7A-ED05-4C67-9EE7-3A6C0D7801C8}.Release|Win32.ActiveCfg = Release|Win32 + {C60D0E7A-ED05-4C67-9EE7-3A6C0D7801C8}.Release|x64.ActiveCfg = Release|x64 {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|x64.ActiveCfg = Debug|x64 {B7F1A9FB-BEA8-416E-9460-AE35A6A5165C}.Debug|x64.Build.0 = Debug|x64 {B7F1A9FB-BEA8-416E-9460-AE35A6A5165C}.DebugFast|Win32.ActiveCfg = DebugFast|Win32 - {B7F1A9FB-BEA8-416E-9460-AE35A6A5165C}.DebugFast|Win32.Build.0 = DebugFast|Win32 {B7F1A9FB-BEA8-416E-9460-AE35A6A5165C}.DebugFast|x64.ActiveCfg = DebugFast|x64 {B7F1A9FB-BEA8-416E-9460-AE35A6A5165C}.DebugFast|x64.Build.0 = DebugFast|x64 {B7F1A9FB-BEA8-416E-9460-AE35A6A5165C}.Release JITIL|Win32.ActiveCfg = Release|Win32 @@ -253,7 +263,6 @@ Global {CFDCEE0E-FA45-4F72-9FCC-0B88F5A75160}.Release JITIL|x64.ActiveCfg = Release|x64 {CFDCEE0E-FA45-4F72-9FCC-0B88F5A75160}.Release JITIL|x64.Build.0 = Release|x64 {CFDCEE0E-FA45-4F72-9FCC-0B88F5A75160}.Release|Win32.ActiveCfg = Release|Win32 - {CFDCEE0E-FA45-4F72-9FCC-0B88F5A75160}.Release|Win32.Build.0 = Release|Win32 {CFDCEE0E-FA45-4F72-9FCC-0B88F5A75160}.Release|x64.ActiveCfg = Release|x64 {CFDCEE0E-FA45-4F72-9FCC-0B88F5A75160}.Release|x64.Build.0 = Release|x64 {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}.Debug|Win32.ActiveCfg = Debug|Win32 @@ -261,7 +270,6 @@ Global {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}.Debug|x64.ActiveCfg = Debug|x64 {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}.Debug|x64.Build.0 = Debug|x64 {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}.DebugFast|Win32.ActiveCfg = DebugFast|Win32 - {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}.DebugFast|Win32.Build.0 = DebugFast|Win32 {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}.DebugFast|x64.ActiveCfg = DebugFast|x64 {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}.DebugFast|x64.Build.0 = DebugFast|x64 {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}.Release JITIL|Win32.ActiveCfg = Release|Win32 @@ -327,7 +335,6 @@ Global {E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA}.Debug|Win32.ActiveCfg = Debug|Win32 {E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA}.Debug|x64.ActiveCfg = Debug|x64 {E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA}.DebugFast|Win32.ActiveCfg = DebugFast|Win32 - {E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA}.DebugFast|Win32.Build.0 = DebugFast|Win32 {E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA}.DebugFast|x64.ActiveCfg = DebugFast|x64 {E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA}.Release JITIL|Win32.ActiveCfg = Release|Win32 {E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA}.Release JITIL|x64.ActiveCfg = Release|x64 @@ -361,13 +368,11 @@ Global {8D612734-FAA5-4B8A-804F-4DEA2367D495}.Debug|Win32.ActiveCfg = Debug|Win32 {8D612734-FAA5-4B8A-804F-4DEA2367D495}.Debug|x64.ActiveCfg = Debug|x64 {8D612734-FAA5-4B8A-804F-4DEA2367D495}.DebugFast|Win32.ActiveCfg = DebugFast|Win32 - {8D612734-FAA5-4B8A-804F-4DEA2367D495}.DebugFast|Win32.Build.0 = DebugFast|Win32 {8D612734-FAA5-4B8A-804F-4DEA2367D495}.DebugFast|x64.ActiveCfg = DebugFast|x64 {8D612734-FAA5-4B8A-804F-4DEA2367D495}.Release JITIL|Win32.ActiveCfg = Release|Win32 {8D612734-FAA5-4B8A-804F-4DEA2367D495}.Release JITIL|x64.ActiveCfg = Release|x64 {8D612734-FAA5-4B8A-804F-4DEA2367D495}.Release JITIL|x64.Build.0 = Release|x64 {8D612734-FAA5-4B8A-804F-4DEA2367D495}.Release|Win32.ActiveCfg = Release|Win32 - {8D612734-FAA5-4B8A-804F-4DEA2367D495}.Release|Win32.Build.0 = Release|Win32 {8D612734-FAA5-4B8A-804F-4DEA2367D495}.Release|x64.ActiveCfg = Release|x64 {8D612734-FAA5-4B8A-804F-4DEA2367D495}.Release|x64.Build.0 = Release|x64 {ADF64291-57ED-4B7A-AB76-37B4A991504B}.Debug|Win32.ActiveCfg = Debug|Win32 @@ -395,13 +400,13 @@ Global {521498BE-6089-4780-8223-E67C22F4E068}.Debug|x64.ActiveCfg = Debug|x64 {521498BE-6089-4780-8223-E67C22F4E068}.Debug|x64.Build.0 = Debug|x64 {521498BE-6089-4780-8223-E67C22F4E068}.DebugFast|Win32.ActiveCfg = DebugFast|Win32 + {521498BE-6089-4780-8223-E67C22F4E068}.DebugFast|Win32.Build.0 = DebugFast|Win32 {521498BE-6089-4780-8223-E67C22F4E068}.DebugFast|x64.ActiveCfg = DebugFast|x64 {521498BE-6089-4780-8223-E67C22F4E068}.DebugFast|x64.Build.0 = DebugFast|x64 {521498BE-6089-4780-8223-E67C22F4E068}.Release JITIL|Win32.ActiveCfg = Release|Win32 {521498BE-6089-4780-8223-E67C22F4E068}.Release JITIL|x64.ActiveCfg = Release|x64 {521498BE-6089-4780-8223-E67C22F4E068}.Release JITIL|x64.Build.0 = Release|x64 {521498BE-6089-4780-8223-E67C22F4E068}.Release|Win32.ActiveCfg = Release|Win32 - {521498BE-6089-4780-8223-E67C22F4E068}.Release|Win32.Build.0 = Release|Win32 {521498BE-6089-4780-8223-E67C22F4E068}.Release|x64.ActiveCfg = Release|x64 {521498BE-6089-4780-8223-E67C22F4E068}.Release|x64.Build.0 = Release|x64 {C7E5D50A-2916-464B-86A7-E10B3CC88ADA}.Debug|Win32.ActiveCfg = Debug|Win32 @@ -419,6 +424,20 @@ Global {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.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|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.Build.0 = Debug|Win32 {95CCAABC-7062-47C4-B8C1-A064DD5F16FF}.Debug|x64.ActiveCfg = Debug|x64 @@ -430,6 +449,7 @@ Global {95CCAABC-7062-47C4-B8C1-A064DD5F16FF}.Release JITIL|x64.ActiveCfg = Release|x64 {95CCAABC-7062-47C4-B8C1-A064DD5F16FF}.Release JITIL|x64.Build.0 = Release|x64 {95CCAABC-7062-47C4-B8C1-A064DD5F16FF}.Release|Win32.ActiveCfg = Release|Win32 + {95CCAABC-7062-47C4-B8C1-A064DD5F16FF}.Release|Win32.Build.0 = Release|Win32 {95CCAABC-7062-47C4-B8C1-A064DD5F16FF}.Release|x64.ActiveCfg = Release|x64 {95CCAABC-7062-47C4-B8C1-A064DD5F16FF}.Release|x64.Build.0 = Release|x64 {0B72B5D6-5D72-4391-84A7-9CCA5392668A}.Debug|Win32.ActiveCfg = Debug|Win32 @@ -443,6 +463,7 @@ Global {0B72B5D6-5D72-4391-84A7-9CCA5392668A}.Release JITIL|x64.ActiveCfg = Release|x64 {0B72B5D6-5D72-4391-84A7-9CCA5392668A}.Release JITIL|x64.Build.0 = Release|x64 {0B72B5D6-5D72-4391-84A7-9CCA5392668A}.Release|Win32.ActiveCfg = Release|Win32 + {0B72B5D6-5D72-4391-84A7-9CCA5392668A}.Release|Win32.Build.0 = Release|Win32 {0B72B5D6-5D72-4391-84A7-9CCA5392668A}.Release|x64.ActiveCfg = Release|x64 {0B72B5D6-5D72-4391-84A7-9CCA5392668A}.Release|x64.Build.0 = Release|x64 {0D14F1E9-490B-4A2D-A4EF-0535E8B3C718}.Debug|Win32.ActiveCfg = Debug|Win32 @@ -458,13 +479,39 @@ Global {0D14F1E9-490B-4A2D-A4EF-0535E8B3C718}.Release|Win32.ActiveCfg = Release|Win32 {0D14F1E9-490B-4A2D-A4EF-0535E8B3C718}.Release|x64.ActiveCfg = Release|x64 {0D14F1E9-490B-4A2D-A4EF-0535E8B3C718}.Release|x64.Build.0 = Release|x64 + {823DDC98-42D5-4A38-88CF-9DC06C788AE4}.Debug|Win32.ActiveCfg = Debug|Win32 + {823DDC98-42D5-4A38-88CF-9DC06C788AE4}.Debug|Win32.Build.0 = Debug|Win32 + {823DDC98-42D5-4A38-88CF-9DC06C788AE4}.Debug|x64.ActiveCfg = Debug|x64 + {823DDC98-42D5-4A38-88CF-9DC06C788AE4}.Debug|x64.Build.0 = Debug|x64 + {823DDC98-42D5-4A38-88CF-9DC06C788AE4}.DebugFast|Win32.ActiveCfg = Debug|x64 + {823DDC98-42D5-4A38-88CF-9DC06C788AE4}.DebugFast|x64.ActiveCfg = Debug|x64 + {823DDC98-42D5-4A38-88CF-9DC06C788AE4}.DebugFast|x64.Build.0 = Debug|x64 + {823DDC98-42D5-4A38-88CF-9DC06C788AE4}.Release JITIL|Win32.ActiveCfg = Release|x64 + {823DDC98-42D5-4A38-88CF-9DC06C788AE4}.Release JITIL|x64.ActiveCfg = Release|x64 + {823DDC98-42D5-4A38-88CF-9DC06C788AE4}.Release JITIL|x64.Build.0 = Release|x64 + {823DDC98-42D5-4A38-88CF-9DC06C788AE4}.Release|Win32.ActiveCfg = Release|Win32 + {823DDC98-42D5-4A38-88CF-9DC06C788AE4}.Release|Win32.Build.0 = Release|Win32 + {823DDC98-42D5-4A38-88CF-9DC06C788AE4}.Release|x64.ActiveCfg = Release|x64 + {823DDC98-42D5-4A38-88CF-9DC06C788AE4}.Release|x64.Build.0 = Release|x64 + {C0B84DA9-FF15-4FAB-9590-17132F3C6DE4}.Debug|Win32.ActiveCfg = Debug|Win32 + {C0B84DA9-FF15-4FAB-9590-17132F3C6DE4}.Debug|Win32.Build.0 = Debug|Win32 + {C0B84DA9-FF15-4FAB-9590-17132F3C6DE4}.Debug|x64.ActiveCfg = Debug|x64 + {C0B84DA9-FF15-4FAB-9590-17132F3C6DE4}.Debug|x64.Build.0 = Debug|x64 + {C0B84DA9-FF15-4FAB-9590-17132F3C6DE4}.DebugFast|Win32.ActiveCfg = DebugFast|Win32 + {C0B84DA9-FF15-4FAB-9590-17132F3C6DE4}.DebugFast|Win32.Build.0 = DebugFast|Win32 + {C0B84DA9-FF15-4FAB-9590-17132F3C6DE4}.DebugFast|x64.ActiveCfg = DebugFast|x64 + {C0B84DA9-FF15-4FAB-9590-17132F3C6DE4}.DebugFast|x64.Build.0 = DebugFast|x64 + {C0B84DA9-FF15-4FAB-9590-17132F3C6DE4}.Release JITIL|Win32.ActiveCfg = Release|x64 + {C0B84DA9-FF15-4FAB-9590-17132F3C6DE4}.Release JITIL|x64.ActiveCfg = Release|x64 + {C0B84DA9-FF15-4FAB-9590-17132F3C6DE4}.Release JITIL|x64.Build.0 = Release|x64 + {C0B84DA9-FF15-4FAB-9590-17132F3C6DE4}.Release|Win32.ActiveCfg = Release|Win32 + {C0B84DA9-FF15-4FAB-9590-17132F3C6DE4}.Release|Win32.Build.0 = Release|Win32 + {C0B84DA9-FF15-4FAB-9590-17132F3C6DE4}.Release|x64.ActiveCfg = Release|x64 + {C0B84DA9-FF15-4FAB-9590-17132F3C6DE4}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - AMDCaProjectFile = D:\Dev\Dolphin\trunk\Source\CodeAnalyst\Dolphin.caw - EndGlobalSection GlobalSection(NestedProjects) = preSolution {B7F1A9FB-BEA8-416E-9460-AE35A6A5165C} = {61C7F431-0623-4A8D-9C4B-EDE35696554A} {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {61C7F431-0623-4A8D-9C4B-EDE35696554A} @@ -482,16 +529,21 @@ Global {521498BE-6089-4780-8223-E67C22F4E068} = {5C17B1EB-6C76-438A-A503-8F3C7831023B} {636FAD5F-02D1-4E9A-BE67-FB8EA99B9A18} = {5C17B1EB-6C76-438A-A503-8F3C7831023B} {3E03C179-8251-46E4-81F4-466F114BAC63} = {4F427D1B-8C90-4D9C-B23D-A51493A1C471} - {48AD7E0A-25B1-4974-A1E3-03F8C438D34F} = {4F427D1B-8C90-4D9C-B23D-A51493A1C471} - {0318BA30-EF48-441A-9E10-DC85EFAE39F0} = {4F427D1B-8C90-4D9C-B23D-A51493A1C471} + {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {4F427D1B-8C90-4D9C-B23D-A51493A1C471} + {11F55366-12EC-4C44-A8CB-1D4E315D61ED} = {4F427D1B-8C90-4D9C-B23D-A51493A1C471} {33546D62-7F34-4EA6-A88E-D538B36E16BF} = {4F427D1B-8C90-4D9C-B23D-A51493A1C471} - {71B16F46-0B00-4EDA-B253-D6D9D03A215C} = {4F427D1B-8C90-4D9C-B23D-A51493A1C471} + {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {4F427D1B-8C90-4D9C-B23D-A51493A1C471} {29C2ABC1-ADA5-42CD-A5FC-96022D52A510} = {4F427D1B-8C90-4D9C-B23D-A51493A1C471} + {823DDC98-42D5-4A38-88CF-9DC06C788AE4} = {4F427D1B-8C90-4D9C-B23D-A51493A1C471} + {C0B84DA9-FF15-4FAB-9590-17132F3C6DE4} = {4F427D1B-8C90-4D9C-B23D-A51493A1C471} {DE7C596C-CBC4-4278-8909-146D63990803} = {77CF6E34-3038-4B23-A2E7-90AD17801609} {95CCAABC-7062-47C4-B8C1-A064DD5F16FF} = {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} EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + AMDCaProjectFile = D:\Dev\Dolphin\trunk\Source\CodeAnalyst\Dolphin.caw + EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} EndGlobalSection