[Scummvm-cvs-logs] SF.net SVN: scummvm: [25353] scummvm/trunk/engines/scumm/imuse_digi

[fingolfin at users.sourceforge.net]

Revision: 25353
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25353&view=rev
Author:   fingolfin
Date:     2007-02-03 10:08:10 -0800 (Sat, 03 Feb 2007)

Log Message:
-----------
Removed obsolete call to Mixer::isPaused

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/imuse_digi/dimuse.cpp
    scummvm/trunk/engines/scumm/imuse_digi/dimuse_script.cpp

Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse.cpp	2007-02-03 17:55:49 UTC (rev 25352)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse.cpp	2007-02-03 18:08:10 UTC (rev 25353)
@@ -46,6 +46,9 @@
 
 IMuseDigital::IMuseDigital(ScummEngine_v7 *scumm, Audio::Mixer *mixer, int fps)
 	: _vm(scumm), _mixer(mixer) {
+	assert(_vm);
+	assert(mixer);
+
 	_pause = false;
 	_sound = new ImuseDigiSndMgr(_vm);
 	assert(_sound);
@@ -216,7 +219,7 @@
 				continue;
 			}
 
-			if (_pause || !_vm)
+			if (_pause)
 				return;
 
 			if (track->volFadeUsed) {

Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse_script.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse_script.cpp	2007-02-03 17:55:49 UTC (rev 25352)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_script.cpp	2007-02-03 18:08:10 UTC (rev 25353)
@@ -172,7 +172,6 @@
 	 				track->stream->finish();
 	 			}
 				if (track->stream->endOfStream()
-						|| _mixer->isPaused() // hack for paused Mixer
 						|| _vm->_insaneRunning) { // INSANE hack for sync timer mode
 					_mixer->stopHandle(track->handle);
 					delete track->stream;


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