[Scummvm-cvs-logs] CVS: scummvm/scumm/smush insane.cpp,1.30,1.31 smush_player.cpp,1.94,1.95

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1:/tmp/cvs-serv18225/smush

Modified Files:
	insane.cpp smush_player.cpp 
Log Message:
synced imuse digital with local tree

Index: insane.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/insane.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- insane.cpp	6 Jan 2004 12:45:31 -0000	1.30
+++ insane.cpp	6 Jan 2004 17:28:29 -0000	1.31
@@ -32,7 +32,7 @@
 #include "scumm/sound.h"
 #include "scumm/resource.h"
 #include "scumm/imuse.h"
-#include "scumm/imuse_digi.h"
+#include "scumm/imuse_digi/dimuse.h"
 
 #include "scumm/smush/smush_player.h"
 #include "scumm/smush/chunk_type.h"
@@ -5914,30 +5914,16 @@
 }
 
 bool Insane::smlayer_startSound1(int32 sound) {
-	// FIXME: original startSound parameters:
-	// startSound(id, 40, 1);
-	// second param is priority in imuse, 
-	// third param set sound to group volume in imuse
-	//		(0 - master, 1-sfx, 2-voice, 3 - music, 
-	//		 4 - background music)
-	// there are no equivalents in scummvm
 	if (smlayer_loadSound(sound, 0, 2)) {
-		_scumm->_sound->playSound(readArray(_numberArray, sound));
+		_scumm->_imuseDigital->startSfx(readArray(_numberArray, sound));
 		return true;
 	} else
 		return false;
 }
 
 bool Insane::smlayer_startSound2(int32 sound) {
-	// FIXME: original startSound parameters:
-	// startSound(id, 126, 2);
-	// second param is priority in imuse, 
-	// third param set sound to group volume in imuse
-	//		(0 - master, 1-sfx, 2-voice, 3 - music, 
-	//		 4 - background music)
-	// there are no equivalents in scummvm
 	if (smlayer_loadSound(sound, 0, 2)) {
-		_scumm->_sound->playSound(readArray(_numberArray, sound));
+		_scumm->_imuseDigital->startSfx(readArray(_numberArray, sound));
 		return true;
 	} else
 		return false;

Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- smush_player.cpp	6 Jan 2004 12:45:31 -0000	1.94
+++ smush_player.cpp	6 Jan 2004 17:28:29 -0000	1.95
@@ -29,7 +29,7 @@
 #include "common/timer.h"
 
 #include "scumm/bomp.h"
-#include "scumm/imuse_digi.h"
+#include "scumm/imuse_digi/dimuse.h"
 #include "scumm/imuse.h"
 #include "scumm/scumm.h"
 #include "scumm/sound.h"