[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_mixer.cpp,1.38,1.39 smush_mixer.h,1.12,1.13 smush_player.cpp,1.148,1.149 smush_player.h,1.42,1.43

Max Horn fingolfin at users.sourceforge.net
Sat Mar 12 10:56:53 CET 2005


Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9326/scumm/smush

Modified Files:
	smush_mixer.cpp smush_mixer.h smush_player.cpp smush_player.h 
Log Message:
PlayingSoundHandle -> SoundHandle; also, turned the handle activity check into a mixer method

Index: smush_mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_mixer.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- smush_mixer.cpp	9 Mar 2005 18:12:44 -0000	1.38
+++ smush_mixer.cpp	12 Mar 2005 18:55:45 -0000	1.39
@@ -69,7 +69,7 @@
 	}
 
 	for (i = 0; i < NUM_CHANNELS; i++) {
-		if ((_channels[i].chan == NULL || _channels[i].id == -1) && !_channels[i].handle.isActive()) {
+		if ((_channels[i].chan == NULL || _channels[i].id == -1) && !_mixer->isSoundHandleActive(_channels[i].handle)) {
 			_channels[i].chan = c;
 			_channels[i].id = track;
 			return;
@@ -120,7 +120,7 @@
 				}
 
 				if (_mixer->isReady()) {
-					if (!_channels[i].handle.isActive()) {
+					if (!_mixer->isSoundHandleActive(_channels[i].handle)) {
 						_channels[i].stream = makeAppendableAudioStream(rate, flags, 500000);
 						_mixer->playInputStream(SoundMixer::kSFXSoundType, &_channels[i].handle, _channels[i].stream);
 					}

Index: smush_mixer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_mixer.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- smush_mixer.h	9 Jan 2005 03:15:59 -0000	1.12
+++ smush_mixer.h	12 Mar 2005 18:55:45 -0000	1.13
@@ -39,7 +39,7 @@
 	struct channels {
 		int id;
 		SmushChannel *chan;
-		PlayingSoundHandle handle;
+		SoundHandle handle;
 		AppendableAudioStream *stream;
 	} _channels[NUM_CHANNELS];
 

Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- smush_player.cpp	9 Mar 2005 18:12:44 -0000	1.148
+++ smush_player.cpp	12 Mar 2005 18:55:45 -0000	1.149
@@ -507,7 +507,7 @@
 						}
 					} while (--count);
 
-					if (!_IACTchannel.isActive()) {
+					if (!_vm->_mixer->isSoundHandleActive(_IACTchannel)) {
 						_IACTstream = makeAppendableAudioStream(22050, SoundMixer::FLAG_STEREO | SoundMixer::FLAG_16BITS, 400000);
 						_vm->_mixer->playInputStream(SoundMixer::kSFXSoundType, &_IACTchannel, _IACTstream);
 					}

Index: smush_player.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- smush_player.h	9 Mar 2005 16:37:44 -0000	1.42
+++ smush_player.h	12 Mar 2005 18:55:45 -0000	1.43
@@ -56,10 +56,10 @@
 	bool _skips[37];
 	int32 _frame;
 
-	PlayingSoundHandle _IACTchannel;
+	SoundHandle _IACTchannel;
 	AppendableAudioStream *_IACTstream;
 
-	PlayingSoundHandle _compressedFileSoundHandle;
+	SoundHandle _compressedFileSoundHandle;
 	bool _compressedFileMode;
 	File _compressedFile;
 	byte _IACToutput[4096];





More information about the Scummvm-git-logs mailing list