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

[thebluegr at users.sourceforge.net]

Revision: 46531
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46531&view=rev
Author:   thebluegr
Date:     2009-12-24 16:46:15 +0000 (Thu, 24 Dec 2009)

Log Message:
-----------
Obtain channel mask from music drivers. Also, added a warning in cmdReverb() to indicate that it's a stub function

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

Modified: scummvm/trunk/engines/sci/sfx/music.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/music.cpp	2009-12-24 15:24:48 UTC (rev 46530)
+++ scummvm/trunk/engines/sci/sfx/music.cpp	2009-12-24 16:46:15 UTC (rev 46531)
@@ -333,7 +333,7 @@
 				pSnd->pMidiParser->setTimerRate(_dwTempo);
 			}
 			// Find out what channels to filter for SCI0
-			channelFilterMask = pSnd->soundRes->getChannelFilterMask(0x04); // Adlib hardcoded (TODO)
+			channelFilterMask = pSnd->soundRes->getChannelFilterMask(_pMidiDrv->getPlayMask());
 			pSnd->pMidiParser->loadMusic(track, pSnd, channelFilterMask);
 		}
 	}

Modified: scummvm/trunk/engines/sci/sfx/music.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/music.h	2009-12-24 15:24:48 UTC (rev 46530)
+++ scummvm/trunk/engines/sci/sfx/music.h	2009-12-24 16:46:15 UTC (rev 46531)
@@ -149,7 +149,7 @@
 	void doFade(MusicEntry *pSnd);
 
 	Audio::Mixer *_pMixer;
-	MidiDriver *_pMidiDrv;
+	MidiPlayer *_pMidiDrv;
 	MidiDriverType _midiType;
 	Common::Mutex _mutex;
 

Modified: scummvm/trunk/engines/sci/sfx/soundcmd.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/soundcmd.cpp	2009-12-24 15:24:48 UTC (rev 46530)
+++ scummvm/trunk/engines/sci/sfx/soundcmd.cpp	2009-12-24 16:46:15 UTC (rev 46531)
@@ -770,7 +770,9 @@
 
 void SoundCommandParser::cmdReverb(reg_t obj, int16 value) {
 	// TODO
+	warning("STUB: cmdReverb");
 }
+
 void SoundCommandParser::cmdHoldHandle(reg_t obj, int16 value) {
 #ifdef USE_OLD_MUSIC_FUNCTIONS
 	SongHandle handle = FROBNICATE_HANDLE(obj);


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