[Scummvm-cvs-logs] SF.net SVN: scummvm:[47133] scummvm/trunk

[lordhoto at users.sourceforge.net]

Revision: 47133
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47133&view=rev
Author:   lordhoto
Date:     2010-01-07 17:04:32 +0000 (Thu, 07 Jan 2010)

Log Message:
-----------
Cleanup.

Modified Paths:
--------------
    scummvm/trunk/engines/agos/sound.cpp
    scummvm/trunk/engines/sword2/sound.cpp
    scummvm/trunk/engines/tucker/resource.cpp
    scummvm/trunk/sound/mixer.cpp

Modified: scummvm/trunk/engines/agos/sound.cpp
===================================================================
--- scummvm/trunk/engines/agos/sound.cpp	2010-01-07 17:04:01 UTC (rev 47132)
+++ scummvm/trunk/engines/agos/sound.cpp	2010-01-07 17:04:32 UTC (rev 47133)
@@ -788,10 +788,7 @@
 	convertVolume(vol);
 	convertPan(pan);
 
-	if (loop)
-		_mixer->playInputStreamLooping(Audio::Mixer::kSFXSoundType, handle, sndStream, 0, -1, vol, pan);
-	else
-		_mixer->playInputStream(Audio::Mixer::kSFXSoundType, handle, sndStream, -1, vol, pan);
+	_mixer->playInputStreamLooping(Audio::Mixer::kSFXSoundType, handle, sndStream, loop ? 0 : 1, -1, vol, pan);
 }
 
 void Sound::stopSfx5() {

Modified: scummvm/trunk/engines/sword2/sound.cpp
===================================================================
--- scummvm/trunk/engines/sword2/sound.cpp	2010-01-07 17:04:01 UTC (rev 47132)
+++ scummvm/trunk/engines/sword2/sound.cpp	2010-01-07 17:04:32 UTC (rev 47133)
@@ -340,10 +340,7 @@
 
 	assert(input);
 
-	if (loop)
-		_vm->_mixer->playInputStreamLooping(soundType, handle, input, 0, -1, vol, pan, true, false, isReverseStereo());
-	else
-		_vm->_mixer->playInputStream(soundType, handle, input, -1, vol, pan, true, false, isReverseStereo());
+	_vm->_mixer->playInputStreamLooping(soundType, handle, input, loop ? 0 : 1, -1, vol, pan, true, false, isReverseStereo());
 
 	return RD_OK;
 }

Modified: scummvm/trunk/engines/tucker/resource.cpp
===================================================================
--- scummvm/trunk/engines/tucker/resource.cpp	2010-01-07 17:04:01 UTC (rev 47132)
+++ scummvm/trunk/engines/tucker/resource.cpp	2010-01-07 17:04:32 UTC (rev 47133)
@@ -954,11 +954,7 @@
 
 	if (stream) {
 		_mixer->stopHandle(*handle);
-
-		if (loop)
-			_mixer->playInputStreamLooping(type, handle, stream, 0, -1, scaleMixerVolume(volume, kMaxSoundVolume));
-		else
-			_mixer->playInputStream(type, handle, stream, -1, scaleMixerVolume(volume, kMaxSoundVolume));
+		_mixer->playInputStreamLooping(type, handle, stream, loop ? 0 : 1, -1, scaleMixerVolume(volume, kMaxSoundVolume));
 	}
 }
 

Modified: scummvm/trunk/sound/mixer.cpp
===================================================================
--- scummvm/trunk/sound/mixer.cpp	2010-01-07 17:04:01 UTC (rev 47132)
+++ scummvm/trunk/sound/mixer.cpp	2010-01-07 17:04:32 UTC (rev 47133)
@@ -274,6 +274,13 @@
 			bool permanent,
 			bool reverseStereo) {
 
+	// Just in case the user wants the stream just looped once, we will take care of that with the normal
+	// playInputStream method
+	if (loopCount == 1) {
+		playInputStream(type, handle, input, id, volume, balance, autofreeStream, permanent, reverseStereo);
+		return;
+	}
+
 	LoopingAudioStream *loopingStream = new LoopingAudioStream(input, loopCount, autofreeStream);
 	assert(loopingStream);
 


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