[Scummvm-cvs-logs] CVS: scummvm/scumm imuse_digi.cpp,1.71,1.72 scumm.h,1.335,1.336 scummvm.cpp,2.515,2.516 sound.cpp,1.290,1.291

[Max Horn]

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

Modified Files:
	imuse_digi.cpp scumm.h scummvm.cpp sound.cpp 
Log Message:
o Added SoundMixer::isReady()
o Removed SoundMixer::bindToSystem()
o In scumm, replaced _silentMixer, _silentDigitalImuse and _noDigitalSamples by SoundMixer::isReady()


Index: imuse_digi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- imuse_digi.cpp	24 Dec 2003 17:30:47 -0000	1.71
+++ imuse_digi.cpp	24 Dec 2003 17:42:19 -0000	1.72
@@ -800,7 +800,7 @@
 			memcpy(buf, _channel[l].data + _channel[l].offset, mixer_size);
 			_channel[l].offset += mixer_size;
 
-			if (_scumm->_silentDigitalImuse == false) {
+			if (_scumm->_mixer->isReady()) {
 				if (!_channel[l].handle.isActive())
 					_scumm->_mixer->newStream(&_channel[l].handle, _channel[l].freq, 
 											_channel[l].mixerFlags, 100000);
@@ -1243,7 +1243,7 @@
 }
 
 void IMuseDigital::playBundleMusic(const char *song) {
-	if (_scumm->_silentDigitalImuse) {
+	if (!_scumm->_mixer->isReady()) {
 		return;
 	}
 
@@ -1430,7 +1430,7 @@
 	byte *final;
 	bool result;
 
-	if (_scumm->_noDigitalSamples)
+	if (!_scumm->_mixer->isReady())
 		return;	
 
 	if (_scumm->_gameId == GID_CMI) {

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -d -r1.335 -r1.336
--- scumm.h	21 Dec 2003 18:36:20 -0000	1.335
+++ scumm.h	24 Dec 2003 17:42:19 -0000	1.336
@@ -969,8 +969,6 @@
 	bool _copyProtection;
 	bool _demoMode;
 	bool _confirmExit;
-public:
-	bool _silentDigitalImuse, _noDigitalSamples;
 
 #ifdef INSANE
 public:

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.515
retrieving revision 2.516
diff -u -d -r2.515 -r2.516
--- scummvm.cpp	21 Dec 2003 18:36:19 -0000	2.515
+++ scummvm.cpp	24 Dec 2003 17:42:19 -0000	2.516
@@ -459,8 +459,6 @@
 	_defaultTalkDelay = 0;
 	_midiDriver = MD_NULL;
 	tempMusic = 0;
-	_silentDigitalImuse = 0;
-	_noDigitalSamples = 0;
 	_saveSound = 0;
 	memset(_extraBoxFlags, 0, sizeof(_extraBoxFlags));
 	memset(_scaleSlots, 0, sizeof(_scaleSlots));
@@ -707,8 +705,7 @@
 #ifndef __GP32__ //ph0x FIXME, "quick dirty hack"
 	/* Bind the mixer to the system => mixer will be invoked
 	 * automatically when samples need to be generated */
-	_silentDigitalImuse = false;
-	if (!_mixer->bindToSystem(syst)) {
+	if (!_mixer->isReady()) {
 		warning("Sound mixer initialization failed");
 		if (_midiDriver == MD_ADLIB ||
 				_midiDriver == MD_PCSPK ||
@@ -716,8 +713,6 @@
 			_midiDriver = MD_NULL;
 			warning("MIDI driver depends on sound mixer, switching to null MIDI driver");
 		}
-		_silentDigitalImuse = true;
-		_noDigitalSamples = true;
 	}
 	_mixer->setVolume(ConfMan.getInt("sfx_volume") * ConfMan.getInt("master_volume") / 255);
 	_mixer->setMusicVolume(ConfMan.getInt("music_volume"));

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -d -r1.290 -r1.291
--- sound.cpp	24 Dec 2003 00:24:57 -0000	1.290
+++ sound.cpp	24 Dec 2003 17:42:20 -0000	1.291
@@ -825,7 +825,7 @@
 	int rate, comp;
 	byte *data;
 
-	if (_soundsPaused || _scumm->_noDigitalSamples)
+	if (_soundsPaused || !_scumm->_mixer->isReady())
 		return;
 
 	if (file_size > 0) {