diff options
| author | Matthew Hoops | 2014-06-09 20:35:40 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2015-08-30 19:53:53 -0400 |
| commit | 030e4d06088cb75e871f1373b662d14262fbfc93 (patch) | |
| tree | 1b2db83cfac8dd00056435058c830afb0ccba468 /engines/groovie | |
| parent | 62973836e1ec7b32a9425fd65e976416d6b5e320 (diff) | |
| download | scummvm-rg350-030e4d06088cb75e871f1373b662d14262fbfc93.tar.gz scummvm-rg350-030e4d06088cb75e871f1373b662d14262fbfc93.tar.bz2 scummvm-rg350-030e4d06088cb75e871f1373b662d14262fbfc93.zip | |
AUDIO: Make Rewindable- and SeekableAudioStream inherit virtually
Diffstat (limited to 'engines/groovie')
| -rw-r--r-- | engines/groovie/music.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/engines/groovie/music.cpp b/engines/groovie/music.cpp index c00290b155..cf65e012c8 100644 --- a/engines/groovie/music.cpp +++ b/engines/groovie/music.cpp @@ -934,16 +934,18 @@ bool MusicPlayerIOS::load(uint32 fileref, bool loop) { } // Create the audio stream - Audio::AudioStream *audStream = Audio::SeekableAudioStream::openStreamFile(info.filename); + Audio::SeekableAudioStream *seekStream = Audio::SeekableAudioStream::openStreamFile(info.filename); - if (!audStream) { + if (!seekStream) { warning("Could not play audio file '%s'", info.filename.c_str()); return false; } + Audio::AudioStream *audStream = seekStream; + // Loop if requested if (loop) - audStream = Audio::makeLoopingAudioStream((Audio::RewindableAudioStream *)audStream, 0); + audStream = Audio::makeLoopingAudioStream(seekStream, 0); // MIDI player handles volume reset on load, IOS player doesn't - force update here updateVolume(); |