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

[fingolfin at users.sourceforge.net]

Revision: 26475
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26475&view=rev
Author:   fingolfin
Date:     2007-04-14 11:44:15 -0700 (Sat, 14 Apr 2007)

Log Message:
-----------
oops, openStreamFile of course uses milliseconds, not frames, for the playback offsets/durations

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

Modified: scummvm/trunk/engines/saga/music.cpp
===================================================================
--- scummvm/trunk/engines/saga/music.cpp	2007-04-14 17:42:51 UTC (rev 26474)
+++ scummvm/trunk/engines/saga/music.cpp	2007-04-14 18:44:15 UTC (rev 26475)
@@ -393,8 +393,9 @@
 	sprintf(trackName[1], "track%02d", realTrackNumber);
 	Audio::AudioStream *stream = 0;
 	for (int i = 0; i < 2; ++i) {
+		// We multiply by 40 / 3 = 1000 / 75 to convert frames to milliseconds
 		// FIXME: Do we really want a duration of 10000 frames = 133 seconds, or is that just a random value?
-		stream = Audio::AudioStream::openStreamFile(trackName[i], 0, 10000, (flags == MUSIC_LOOP) ? 0 : 1);
+		stream = Audio::AudioStream::openStreamFile(trackName[i], 0, 10000 * 40 / 3, (flags == MUSIC_LOOP) ? 0 : 1);
 		if (stream) {
 			_mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_musicHandle, stream);
 			return;


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