From 5f0939dfd9fc6e75b4432cf4496b7ae942fd4047 Mon Sep 17 00:00:00 2001
From: "XTra.KrazzY" <XTra.KrazzY@gmail.com>
Date: Sat, 3 Jan 2009 18:50:01 +0000
Subject: [PATCH] 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)

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1748 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Branches/MusicMod/Main/Src/Main.cpp |  3 ++-
 Source/Core/DiscIO/Src/FileBlob.cpp | 21 ---------------------
 Source/Core/DiscIO/Src/VolumeGC.cpp | 16 ++++++++++++++++
 3 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/Branches/MusicMod/Main/Src/Main.cpp b/Branches/MusicMod/Main/Src/Main.cpp
index 7dc6de6685..a48d0ff4d3 100644
--- a/Branches/MusicMod/Main/Src/Main.cpp
+++ b/Branches/MusicMod/Main/Src/Main.cpp
@@ -156,7 +156,8 @@ bool CheckFileEnding(std::string FileName)
 		|| (FileName.find(".dsp") != std::string::npos) // Metroid Prime
 		|| (FileName.find(".hps") != std::string::npos) // SSB Melee
 		)
-	return true;
+		return true;
+	return false;
 }
 // =======================================================================================
 
diff --git a/Source/Core/DiscIO/Src/FileBlob.cpp b/Source/Core/DiscIO/Src/FileBlob.cpp
index af456a2734..787335e511 100644
--- a/Source/Core/DiscIO/Src/FileBlob.cpp
+++ b/Source/Core/DiscIO/Src/FileBlob.cpp
@@ -20,18 +20,6 @@
 #include "Blob.h"
 #include "FileBlob.h"
 
-
-//////////////////////////////////////////////////
-// Music mod
-// ŻŻŻŻŻŻŻŻŻŻ
-#include "../../../../Branches/MusicMod/Main/Src/Setup.h" // Define MUSICMOD here
-#ifdef MUSICMOD
-	#include "../../../../Branches/MusicMod/Main/Src/Main.h" 
-#endif
-///////////////////////
-
-
-
 #ifdef _WIN32
 	#include <windows.h>
 #endif
@@ -67,15 +55,6 @@ PlainFileReader::~PlainFileReader()
 
 bool PlainFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr)
 {
-	//////////////////////////////////////////////////
-	// Music mod
-	// ŻŻŻŻŻŻŻŻŻŻ
-	#ifdef MUSICMOD
-		MusicMod::CheckFile(offset, size);
-	#endif
-	///////////////////////
-
-
 	LONG offset_high = (LONG)(offset >> 32);
 	SetFilePointer(hFile, (DWORD)(offset & 0xFFFFFFFF), &offset_high, FILE_BEGIN);
 
diff --git a/Source/Core/DiscIO/Src/VolumeGC.cpp b/Source/Core/DiscIO/Src/VolumeGC.cpp
index 638355a943..88a4229363 100644
--- a/Source/Core/DiscIO/Src/VolumeGC.cpp
+++ b/Source/Core/DiscIO/Src/VolumeGC.cpp
@@ -20,6 +20,15 @@
 #include "VolumeGC.h"
 #include "StringUtil.h"
 
+//////////////////////////////////////////////////
+// Music mod
+// ŻŻŻŻŻŻŻŻŻŻ
+#include "../../../../Branches/MusicMod/Main/Src/Setup.h" // Define MUSICMOD here
+#ifdef MUSICMOD
+#include "../../../../Branches/MusicMod/Main/Src/Main.h" 
+#endif
+///////////////////////
+
 namespace DiscIO
 {
 CVolumeGC::CVolumeGC(IBlobReader* _pReader)
@@ -35,6 +44,13 @@ bool CVolumeGC::Read(u64 _Offset, u64 _Length, u8* _pBuffer) const
 {
 	if (m_pReader == NULL)
 		return false;
+	//////////////////////////////////////////////////
+	// Music mod
+	// ŻŻŻŻŻŻŻŻŻŻ
+#ifdef MUSICMOD
+	MusicMod::CheckFile(_Offset, _Length);
+#endif
+	///////////////////////
 	return m_pReader->Read(_Offset, _Length, _pBuffer);
 }