[Scummvm-cvs-logs] CVS: scummvm/bs2/driver d_sound.cpp,1.74,1.75

Torbj?rn Andersson eriktorbjorn at users.sourceforge.net
Wed Oct 8 10:10:07 CEST 2003


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

Modified Files:
	d_sound.cpp 
Log Message:
cleanup


Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_sound.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- d_sound.cpp	8 Oct 2003 06:58:34 -0000	1.74
+++ d_sound.cpp	8 Oct 2003 17:09:51 -0000	1.75
@@ -169,11 +169,8 @@
  */
 
 void Sound::reverseStereo(void) {
-	for (int i = 0; i < 16; i++) {
-		int j = panTable[i];
-		panTable[i] = panTable[32 - i];
-		panTable[32 - i] = j;
-	}
+	for (int i = 0; i < 16; i++)
+		SWAP(panTable[i], panTable[32 - i]);
 }
 
 // Save/Restore information about current music so that we can restore it
@@ -1088,20 +1085,16 @@
 }
 
 /**
- * Stops the music dead in its tracks.
+ * Stops the music dead in its tracks. Any music that is currently being
+ * streamed is paued.
  */
 
 void Sound::pauseMusic(void) {
 	Common::StackLock lock(_mutex);
 
 	if (_soundOn) {
-		for (int i = 0; i < MAXMUS; i++) {
-			if (_music[i]._streaming) {
-				_music[i]._paused = true;
-			} else {
-				_music[i]._paused = false;
-			}
-		}
+		for (int i = 0; i < MAXMUS; i++)
+			_music[i]._paused = _music[i]._streaming;
 	}
 }
 





More information about the Scummvm-git-logs mailing list