[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.496,1.497 sound.h,1.95,1.96

kirben kirben at users.sourceforge.net
Sat Jan 7 15:54:07 CET 2006


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

Modified Files:
	sound.cpp sound.h 
Log Message:

No longer used by HE games.


Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.496
retrieving revision 1.497
diff -u -d -r1.496 -r1.497
--- sound.cpp	6 Jan 2006 05:40:40 -0000	1.496
+++ sound.cpp	7 Jan 2006 23:53:37 -0000	1.497
@@ -696,16 +696,6 @@
 	return val;
 }
 
-
-int Sound::getSoundElapsedTime(int sound) const {
-	if (sound >= 10000) {
-		int channel = sound - 10000;
-		return _vm->_mixer->getSoundElapsedTime(_heSoundChannels[channel]);
-	} else {
-		return _vm->_mixer->getSoundElapsedTimeOfSoundID(sound);
-	}
-}
-
 int Sound::isSoundRunning(int sound) const {
 #ifndef DISABLE_SCUMM_7_8
 	if (_vm->_imuseDigital)

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.h,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- sound.h	5 Jan 2006 07:06:47 -0000	1.95
+++ sound.h	7 Jan 2006 23:53:38 -0000	1.96
@@ -124,7 +124,6 @@
 	void startTalkSound(uint32 offset, uint32 b, int mode, Audio::SoundHandle *handle = NULL);
 	void stopTalkSound();
 	bool isMouthSyncOff(uint pos);
-	int getSoundElapsedTime(int sound) const;
 	int isSoundRunning(int sound) const;
 	bool isSoundInUse(int sound) const;
 	void stopSound(int sound);





More information about the Scummvm-git-logs mailing list