[Scummvm-cvs-logs] SF.net SVN: scummvm:[47063] scummvm/trunk/engines/saga/music.cpp
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Wed Jan 6 01:00:51 CET 2010
Revision: 47063
http://scummvm.svn.sourceforge.net/scummvm/?rev=47063&view=rev
Author: lordhoto
Date: 2010-01-06 00:00:50 +0000 (Wed, 06 Jan 2010)
Log Message:
-----------
Adapt SAGA to use Mixer::playAudioStreamLooping instead of relying the depracted in AudioStream looping support.
Modified Paths:
--------------
scummvm/trunk/engines/saga/music.cpp
Modified: scummvm/trunk/engines/saga/music.cpp
===================================================================
--- scummvm/trunk/engines/saga/music.cpp 2010-01-06 00:00:25 UTC (rev 47062)
+++ scummvm/trunk/engines/saga/music.cpp 2010-01-06 00:00:50 UTC (rev 47063)
@@ -239,7 +239,7 @@
}
void Music::play(uint32 resourceId, MusicFlags flags) {
- Audio::AudioStream *audioStream = NULL;
+ Audio::SeekableAudioStream *audioStream = NULL;
MidiParser *parser;
ResourceContext *context = NULL;
byte *resourceData;
@@ -275,11 +275,11 @@
char trackName[2][16];
sprintf(trackName[0], "track%d", realTrackNumber);
sprintf(trackName[1], "track%02d", realTrackNumber);
- Audio::AudioStream *stream = 0;
+ Audio::SeekableAudioStream *stream = 0;
for (int i = 0; i < 2; ++i) {
- stream = Audio::AudioStream::openStreamFile(trackName[i], 0, 0, (flags == MUSIC_LOOP) ? 0 : 1);
+ stream = Audio::AudioStream::openStreamFile(trackName[i]);
if (stream) {
- _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_musicHandle, stream);
+ _mixer->playInputStreamLooping(Audio::Mixer::kMusicSoundType, &_musicHandle, stream, (flags == MUSIC_LOOP) ? 0 : 1);
_digitalMusic = true;
return;
}
@@ -318,15 +318,15 @@
if (identifier == 0) { // MP3
#ifdef USE_MAD
- audioStream = Audio::makeMP3Stream(musicStream, false, 0, 0, (flags == MUSIC_LOOP ? 0 : 1));
+ audioStream = Audio::makeMP3Stream(musicStream, false);
#endif
} else if (identifier == 1) { // OGG
#ifdef USE_VORBIS
- audioStream = Audio::makeVorbisStream(musicStream, false, 0, 0, (flags == MUSIC_LOOP ? 0 : 1));
+ audioStream = Audio::makeVorbisStream(musicStream, false);
#endif
} else if (identifier == 2) { // FLAC
#ifdef USE_FLAC
- audioStream = Audio::makeFlacStream(musicStream, false, 0, 0, (flags == MUSIC_LOOP ? 0 : 1));
+ audioStream = Audio::makeFlacStream(musicStream, false);
#endif
}
}
@@ -336,7 +336,7 @@
if (audioStream) {
debug(2, "Playing digitized music");
- _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_musicHandle, audioStream);
+ _mixer->playInputStreamLooping(Audio::Mixer::kMusicSoundType, &_musicHandle, audioStream, (flags == MUSIC_LOOP ? 0 : 1));
_digitalMusic = true;
return;
}
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