diff options
| author | Johannes Schickel | 2010-01-06 00:00:50 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-01-06 00:00:50 +0000 |
| commit | fb9017c51e22c0121dafa124fb59de603e4f11b1 (patch) | |
| tree | 20cedddb365496f3d0a148e7d8f2881f3f596918 | |
| parent | 0e420431fdfa826f555cb7fb2236e950c7341595 (diff) | |
| download | scummvm-rg350-fb9017c51e22c0121dafa124fb59de603e4f11b1.tar.gz scummvm-rg350-fb9017c51e22c0121dafa124fb59de603e4f11b1.tar.bz2 scummvm-rg350-fb9017c51e22c0121dafa124fb59de603e4f11b1.zip | |
Adapt SAGA to use Mixer::playAudioStreamLooping instead of relying the depracted in AudioStream looping support.
svn-id: r47063
| -rw-r--r-- | engines/saga/music.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp index aeca848719..aa7d81d35a 100644 --- a/engines/saga/music.cpp +++ b/engines/saga/music.cpp @@ -239,7 +239,7 @@ bool Music::isPlaying() { } 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 @@ void Music::play(uint32 resourceId, MusicFlags flags) { 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 @@ void Music::play(uint32 resourceId, MusicFlags flags) { 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 @@ void Music::play(uint32 resourceId, MusicFlags flags) { 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; } |