From 1e5496b2c8fc998e9210d90e05ff006e0409918a Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 22 Dec 2003 08:22:04 +0000
Subject: Moved bundle music code from class Sound to IMuseDigital (seems more
 natural; and allows for various cleanup)

svn-id: r11846
---
 scumm/smush/insane.cpp       | 1 -
 scumm/smush/smush_player.cpp | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'scumm/smush')

diff --git a/scumm/smush/insane.cpp b/scumm/smush/insane.cpp
index e65281be1e..b247dc4c79 100644
--- a/scumm/smush/insane.cpp
+++ b/scumm/smush/insane.cpp
@@ -8213,7 +8213,6 @@ void Insane::smush_setupSanFile(const char *filename, int32 offset) {
 	_player->seekSan(filename, _scumm->getGameDataPath(), offset);
 
 	_scumm->_imuseDigital->pause(false);
-	_scumm->_sound->pauseBundleMusic(false);
 }
 
 }
diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp
index 36396eb515..8028d5eff7 100644
--- a/scumm/smush/smush_player.cpp
+++ b/scumm/smush/smush_player.cpp
@@ -244,7 +244,6 @@ void SmushPlayer::init() {
 
 	_frame = 0;
 
-	_scumm->_sound->pauseBundleMusic(true);
 	if (_scumm->_imuseDigital) {
 		_scumm->_imuseDigital->pause(true);
 	}
@@ -293,7 +292,6 @@ void SmushPlayer::deinit() {
 	if (_scumm->_imuseDigital) {
 		_scumm->_imuseDigital->pause(false);
 	}
-	_scumm->_sound->pauseBundleMusic(false);
 	_scumm->_fullRedraw = true;
 }
 
@@ -373,7 +371,7 @@ void SmushPlayer::handleIACT(Chunk &b) {
 	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();
-- 
cgit v1.2.3