[Scummvm-cvs-logs] SF.net SVN: scummvm:[46488] scummvm/trunk/engines/sci/sfx

[thebluegr at users.sourceforge.net]

Revision: 46488
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46488&view=rev
Author:   thebluegr
Date:     2009-12-22 20:53:03 +0000 (Tue, 22 Dec 2009)

Log Message:
-----------
Disabled some currently unused code

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sfx/music.cpp
    scummvm/trunk/engines/sci/sfx/music.h

Modified: scummvm/trunk/engines/sci/sfx/music.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/music.cpp	2009-12-22 20:44:03 UTC (rev 46487)
+++ scummvm/trunk/engines/sci/sfx/music.cpp	2009-12-22 20:53:03 UTC (rev 46488)
@@ -161,6 +161,7 @@
 	qsort(pData, _playList.size(), sizeof(MusicEntry *), &f_compare);
 }
 
+#if 0
 void SciMusic::patchSysEx(byte * addr, byte *pdata, int len) {
 	byte *buff = new byte[7 + len + 1];
 	uint16 chk = 0;
@@ -190,13 +191,15 @@
 		addr[2] -= 0x80;
 	}
 }
-void SciMusic::loadPatch() {
+#endif
+
 // FIXME: This should be done at the driver level
 #if 0
+void SciMusic::loadPatch() {
 	if (_midiType == MD_MT32)
 		loadPatchMT32();
+}
 #endif
-}
 
 #if 0
 // currently loads patch 1.pat for Roland/MT-32 device

Modified: scummvm/trunk/engines/sci/sfx/music.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/music.h	2009-12-22 20:44:03 UTC (rev 46487)
+++ scummvm/trunk/engines/sci/sfx/music.h	2009-12-22 20:53:03 UTC (rev 46488)
@@ -99,7 +99,9 @@
 	~SciMusic();
 
 	void init();
+#if 0
 	void loadPatch();
+#endif
 	void onTimer();
 	bool saveState(Common::OutSaveFile *pFile);
 	bool restoreState(Common::InSaveFile *pFile);
@@ -136,9 +138,12 @@
 protected:
 	byte findAudEntry(uint16 nAud, byte&oVolume, uint32& oOffset, uint32&oSize);
 	void sortPlayList();
+#if 0
 	void loadPatchMT32();
 	void patchSysEx(byte * addr, byte *pdata, int len);
 	void patchUpdateAddr(byte *addr, int len);
+#endif
+
 	void doFade(MusicEntry *pSnd);
 
 	Audio::Mixer *_pMixer;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.