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

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Sat Jan 23 01:35:14 CET 2010


Revision: 47459
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47459&view=rev
Author:   fingolfin
Date:     2010-01-23 00:35:14 +0000 (Sat, 23 Jan 2010)

Log Message:
-----------
Get rid of two more FLAG_LOOP instances

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/sound_br.cpp
    scummvm/trunk/engines/scumm/he/cup_player_he.cpp

Modified: scummvm/trunk/engines/parallaction/sound_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/sound_br.cpp	2010-01-23 00:04:43 UTC (rev 47458)
+++ scummvm/trunk/engines/parallaction/sound_br.cpp	2010-01-23 00:35:14 UTC (rev 47459)
@@ -415,15 +415,9 @@
 	// TODO: Confirm sound rate
 	int rate = 11025;
 
-	uint32 loopStart = 0, loopEnd = 0;
-	uint32 flags = Audio::FLAG_UNSIGNED;
-
-	if (looping) {
-		loopEnd = dataSize;
-		flags |= Audio::FLAG_LOOP;
-	}
-
-	ch->stream = Audio::makeRawMemoryStream(data, dataSize, DisposeAfterUse::YES, rate, flags, loopStart, loopEnd);
+	ch->stream = Audio::makeLoopingAudioStream(
+			Audio::makeRawMemoryStream(data, dataSize, DisposeAfterUse::YES, rate, Audio::FLAG_UNSIGNED),
+			looping ? 0 : 1);
 	return ch->stream;
 }
 

Modified: scummvm/trunk/engines/scumm/he/cup_player_he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/cup_player_he.cpp	2010-01-23 00:04:43 UTC (rev 47458)
+++ scummvm/trunk/engines/scumm/he/cup_player_he.cpp	2010-01-23 00:35:14 UTC (rev 47459)
@@ -169,14 +169,12 @@
 			uint8 *soundData = _sfxBuffer + offset;
 			if (READ_BE_UINT32(soundData) == MKID_BE('DATA')) {
 				uint32 soundSize = READ_BE_UINT32(soundData + 4);
-				uint32 flags = Audio::FLAG_UNSIGNED;
-				uint32 loopEnd = 0;
-				if (sfx->flags & kSfxFlagLoop) {
-					flags |= Audio::FLAG_LOOP;
-					loopEnd = soundSize - 8;
-				}
 				_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &sfxChannel->handle,
-						Audio::makeRawMemoryStream(soundData + 8, soundSize - 8, DisposeAfterUse::NO, 11025, flags, 0, loopEnd));
+							Audio::makeLoopingAudioStream(
+								Audio::makeRawMemoryStream(soundData + 8, soundSize - 8, DisposeAfterUse::NO, 11025, Audio::FLAG_UNSIGNED),
+								(sfx->flags & kSfxFlagLoop) ? 0 : 1
+							)
+						);
 			}
 		} else {
 			warning("Unable to find a free channel to play sound %d", sfx->num);


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