[Scummvm-cvs-logs] SF.net SVN: scummvm: [28155] scummvm/trunk/engines/sword2/music.cpp

eriktorbjorn at users.sourceforge.net eriktorbjorn at users.sourceforge.net
Sat Jul 21 16:39:12 CEST 2007


Revision: 28155
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28155&view=rev
Author:   eriktorbjorn
Date:     2007-07-21 07:39:12 -0700 (Sat, 21 Jul 2007)

Log Message:
-----------
The mixer no longer allows unpausing channels that aren't paused. So don't.

Modified Paths:
--------------
    scummvm/trunk/engines/sword2/music.cpp

Modified: scummvm/trunk/engines/sword2/music.cpp
===================================================================
--- scummvm/trunk/engines/sword2/music.cpp	2007-07-20 23:32:39 UTC (rev 28154)
+++ scummvm/trunk/engines/sword2/music.cpp	2007-07-21 14:39:12 UTC (rev 28155)
@@ -667,8 +667,10 @@
  */
 
 void Sound::pauseSpeech() {
-	_speechPaused = true;
-	_vm->_mixer->pauseHandle(_soundHandleSpeech, true);
+	if (!_speechPaused) {
+		_speechPaused = true;
+		_vm->_mixer->pauseHandle(_soundHandleSpeech, true);
+	}
 }
 
 /**
@@ -676,8 +678,10 @@
  */
 
 void Sound::unpauseSpeech() {
-	_speechPaused = false;
-	_vm->_mixer->pauseHandle(_soundHandleSpeech, false);
+	if (_speechPaused) {
+		_speechPaused = false;
+		_vm->_mixer->pauseHandle(_soundHandleSpeech, false);
+	}
 }
 
 /**
@@ -801,26 +805,22 @@
 }
 
 void Sound::pauseFx() {
-	if (_fxPaused)
-		return;
-
-	for (int i = 0; i < FXQ_LENGTH; i++) {
-		if (_fxQueue[i].resource)
-			_vm->_mixer->pauseHandle(_fxQueue[i].handle, true);
+	if (!_fxPaused) {
+		for (int i = 0; i < FXQ_LENGTH; i++) {
+			if (_fxQueue[i].resource)
+				_vm->_mixer->pauseHandle(_fxQueue[i].handle, true);
+		}
+		_fxPaused = true;
 	}
-
-	_fxPaused = true;
 }
 
 void Sound::unpauseFx() {
-	if (!_fxPaused)
-		return;
-
-	for (int i = 0; i < FXQ_LENGTH; i++)
-		if (_fxQueue[i].resource)
-			_vm->_mixer->pauseHandle(_fxQueue[i].handle, false);
-
-	_fxPaused = false;
+	if (_fxPaused) {
+		for (int i = 0; i < FXQ_LENGTH; i++)
+			if (_fxQueue[i].resource)
+				_vm->_mixer->pauseHandle(_fxQueue[i].handle, false);
+		_fxPaused = false;
+	}
 }
 
 } // End of namespace Sword2


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list