piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

MusicMod: A couple of fixes, more to come (when I find what is the I/O interrupt we have to trap to only get music, and in the correct time)

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1748 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
XTra.KrazzY
2009-01-03 18:50:01 +00:00
parent dc189c688c
commit 5f0939dfd9
3 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Branches/MusicMod/Main/Src/Main.cpp
View File

@ -156,7 +156,8 @@ bool CheckFileEnding(std::string FileName)
|| (FileName.find(".dsp") != std::string::npos) // Metroid Prime || (FileName.find(".dsp") != std::string::npos) // Metroid Prime
|| (FileName.find(".hps") != std::string::npos) // SSB Melee || (FileName.find(".hps") != std::string::npos) // SSB Melee
) )
return true; return true;
return false;
} }
// ======================================================================================= // =======================================================================================

21
Source/Core/DiscIO/Src/FileBlob.cpp
View File

@ -20,18 +20,6 @@
#include "Blob.h" #include "Blob.h"
#include "FileBlob.h" #include "FileBlob.h"
//////////////////////////////////////////////////
// Music mod
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#include "../../../../Branches/MusicMod/Main/Src/Setup.h" // Define MUSICMOD here
#ifdef MUSICMOD
#include "../../../../Branches/MusicMod/Main/Src/Main.h"
#endif
///////////////////////
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
#endif #endif
@ -67,15 +55,6 @@ PlainFileReader::~PlainFileReader()
bool PlainFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr) bool PlainFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr)
{ {
//////////////////////////////////////////////////
// Music mod
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#ifdef MUSICMOD
MusicMod::CheckFile(offset, size);
#endif
///////////////////////
LONG offset_high = (LONG)(offset >> 32); LONG offset_high = (LONG)(offset >> 32);
SetFilePointer(hFile, (DWORD)(offset & 0xFFFFFFFF), &offset_high, FILE_BEGIN); SetFilePointer(hFile, (DWORD)(offset & 0xFFFFFFFF), &offset_high, FILE_BEGIN);

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

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