diff options
| author | Filippos Karapetis | 2009-12-22 20:53:03 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-12-22 20:53:03 +0000 |
| commit | ca92253da1f306162e01f0afcc5d77852ce29a34 (patch) | |
| tree | f79ac96811325a9c2532c727b859741912729db2 | |
| parent | ac28e8165f74a2f425ca78e8ef719179b77127d1 (diff) | |
| download | scummvm-rg350-ca92253da1f306162e01f0afcc5d77852ce29a34.tar.gz scummvm-rg350-ca92253da1f306162e01f0afcc5d77852ce29a34.tar.bz2 scummvm-rg350-ca92253da1f306162e01f0afcc5d77852ce29a34.zip | |
Disabled some currently unused code
svn-id: r46488
| -rw-r--r-- | engines/sci/sfx/music.cpp | 7 | ||||
| -rw-r--r-- | engines/sci/sfx/music.h | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/engines/sci/sfx/music.cpp b/engines/sci/sfx/music.cpp index c1e8477e92..e8f603c56f 100644 --- a/engines/sci/sfx/music.cpp +++ b/engines/sci/sfx/music.cpp @@ -161,6 +161,7 @@ void SciMusic::sortPlayList() { 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 @@ void SciMusic::patchUpdateAddr(byte *addr, int len) { 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 } +#endif #if 0 // currently loads patch 1.pat for Roland/MT-32 device diff --git a/engines/sci/sfx/music.h b/engines/sci/sfx/music.h index b02a7064f8..f8e24de89b 100644 --- a/engines/sci/sfx/music.h +++ b/engines/sci/sfx/music.h @@ -99,7 +99,9 @@ public: ~SciMusic(); void init(); +#if 0 void loadPatch(); +#endif void onTimer(); bool saveState(Common::OutSaveFile *pFile); bool restoreState(Common::InSaveFile *pFile); @@ -136,9 +138,12 @@ public: 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; |