[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.429,1.430 sound.h,1.81,1.82 string.cpp,1.267,1.268

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


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

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

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.429
retrieving revision 1.430
diff -u -d -r1.429 -r1.430
--- sound.cpp	12 Mar 2005 11:06:07 -0000	1.429
+++ sound.cpp	12 Mar 2005 18:55:42 -0000	1.430
@@ -572,7 +572,7 @@
 		if (_vm->_imuseDigital) {
 			finished = !isSoundRunning(kTalkSoundID);
 		} else {
-			finished = !_talkChannelHandle.isActive();
+			finished = !_vm->_mixer->isSoundHandleActive(_talkChannelHandle);
 		}
 
 		if ((uint) act < 0x80 && ((_vm->_version == 8) || (_vm->_version <= 7 && !_vm->_string[0].no_talk_anim))) {
@@ -609,7 +609,7 @@
 	return ((const MP3OffsetTable *)a)->org_offset - ((const MP3OffsetTable *)b)->org_offset;
 }
 
-void Sound::startTalkSound(uint32 offset, uint32 b, int mode, PlayingSoundHandle *handle) {
+void Sound::startTalkSound(uint32 offset, uint32 b, int mode, SoundHandle *handle) {
 	int num = 0, i;
 	int size = 0;
 	byte *sound;

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.h,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- sound.h	30 Jan 2005 11:03:49 -0000	1.81
+++ sound.h	12 Mar 2005 18:55:43 -0000	1.82
@@ -84,7 +84,7 @@
 	int16 _currentCDSound;
 	int16 _currentMusic;
 public:
-	PlayingSoundHandle _talkChannelHandle;	// Handle of mixer channel actor is talking on
+	SoundHandle _talkChannelHandle;	// Handle of mixer channel actor is talking on
 
 	bool _soundsPaused;
 	byte _sfxMode;
@@ -97,7 +97,7 @@
 	void processSoundQues();
 	void setOverrideFreq(int freq);
 	void playSound(int soundID, int heOffset, int heChannel, int heFlags);
-	void startTalkSound(uint32 offset, uint32 b, int mode, PlayingSoundHandle *handle = NULL);
+	void startTalkSound(uint32 offset, uint32 b, int mode, SoundHandle *handle = NULL);
 	void stopTalkSound();
 	bool isMouthSyncOff(uint pos);
 	int isSoundRunning(int sound) const;

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -d -r1.267 -r1.268
--- string.cpp	11 Mar 2005 01:10:04 -0000	1.267
+++ string.cpp	12 Mar 2005 18:55:43 -0000	1.268
@@ -370,7 +370,7 @@
 					// Special case for games using imuse digital.for sound
 				} else if ((_gameId == GID_LOOM256) && !ConfMan.getBool("subtitles") && (_sound->pollCD())) {
 					// Special case for loomcd, since it only uses CD audio.for sound
-				} else if (!ConfMan.getBool("subtitles") && (_haveMsg == 0xFE || _sound->_talkChannelHandle.isActive())) {
+				} else if (!ConfMan.getBool("subtitles") && (_haveMsg == 0xFE || _mixer->isSoundHandleActive(_sound->_talkChannelHandle))) {
 					// Subtitles are turned off, and there is a voice version
 					// of this message -> don't print it. 
 				} else





More information about the Scummvm-git-logs mailing list