[Scummvm-cvs-logs] CVS: scummvm/scumm/smush insane.cpp,1.21,1.22 smush_player.cpp,1.78,1.79

[Max Horn]

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

Modified Files:
	insane.cpp smush_player.cpp 
Log Message:
Moved bundle music code from class Sound to IMuseDigital (seems more natural; and allows for various cleanup)

Index: insane.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/insane.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- insane.cpp	21 Dec 2003 19:01:39 -0000	1.21
+++ insane.cpp	22 Dec 2003 08:22:04 -0000	1.22
@@ -8213,7 +8213,6 @@
 	_player->seekSan(filename, _scumm->getGameDataPath(), offset);
 
 	_scumm->_imuseDigital->pause(false);
-	_scumm->_sound->pauseBundleMusic(false);
 }
 
 }

Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- smush_player.cpp	22 Dec 2003 00:10:43 -0000	1.78
+++ smush_player.cpp	22 Dec 2003 08:22:04 -0000	1.79
@@ -244,7 +244,6 @@
 
 	_frame = 0;
 
-	_scumm->_sound->pauseBundleMusic(true);
 	if (_scumm->_imuseDigital) {
 		_scumm->_imuseDigital->pause(true);
 	}
@@ -293,7 +292,6 @@
 	if (_scumm->_imuseDigital) {
 		_scumm->_imuseDigital->pause(false);
 	}
-	_scumm->_sound->pauseBundleMusic(false);
 	_scumm->_fullRedraw = true;
 }
 
@@ -373,7 +371,7 @@
 	checkBlock(b, TYPE_IACT, 8);
 	debug(6, "SmushPlayer::handleImuseAction()");
 
-	int code = b.getWord();
+	/* int code = */ b.getWord();
 	int flags = b.getWord();
 	int unknown = b.getShort();
 	int track_flags = b.getWord();