[Scummvm-cvs-logs] CVS: scummvm/bs2/driver d_sound.cpp,1.40,1.41 d_sound.h,1.10,1.11

Torbj?rn Andersson eriktorbjorn at users.sourceforge.net
Fri Sep 5 05:20:08 CEST 2003


Update of /cvsroot/scummvm/scummvm/bs2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv19759/driver

Modified Files:
	d_sound.cpp d_sound.h 
Log Message:
Removed unused function, StartMusicFadeDown().


Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_sound.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- d_sound.cpp	5 Sep 2003 11:12:40 -0000	1.40
+++ d_sound.cpp	5 Sep 2003 12:19:40 -0000	1.41
@@ -990,16 +990,6 @@
 	return (fxMuted);
 }
 
-void Sword2Sound::StartMusicFadeDown(int i) {
-	StackLock lock(_mutex);
-
-	g_engine->_mixer->stopHandle(soundHandleMusic[i]);
-	musFading[i] = -16;
-	musStreaming[i] = 0;
-	if (fpMus.isOpen())
-		fpMus.close();
-}
-
 int32 Sword2Sound::StreamCompMusic(const char *filename, uint32 musicId, int32 looping) {
 	StackLock lock(_mutex);
 	return StreamCompMusicFromLock(filename, musicId, looping);

Index: d_sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_sound.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- d_sound.h	4 Sep 2003 10:58:55 -0000	1.10
+++ d_sound.h	5 Sep 2003 12:19:40 -0000	1.11
@@ -91,7 +91,6 @@
 	private:
 		int32 StreamCompMusicFromLock(const char *filename, uint32 musicId, int32 looping);
 		int32 GetFxIndex(int32 id);
-		void StartMusicFadeDown(int i);
 		int32 DipMusic();
 
 		OSystem::MutexRef _mutex;





More information about the Scummvm-git-logs mailing list