diff options
| author | Johannes Schickel | 2010-01-07 17:14:44 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-01-07 17:14:44 +0000 |
| commit | aa2f55ddc6730e8c3afce61efa241d5f1b1e6b34 (patch) | |
| tree | f11f10e485a11cce728854376b92a3ec3b926b3d /engines/sword1 | |
| parent | b47725540f53694ce8d261a2b7b132aff6c6eb74 (diff) | |
| download | scummvm-rg350-aa2f55ddc6730e8c3afce61efa241d5f1b1e6b34.tar.gz scummvm-rg350-aa2f55ddc6730e8c3afce61efa241d5f1b1e6b34.tar.bz2 scummvm-rg350-aa2f55ddc6730e8c3afce61efa241d5f1b1e6b34.zip | |
Remove the deprecated FLAC, Vorbis and MP3 factories.
svn-id: r47134
Diffstat (limited to 'engines/sword1')
| -rw-r--r-- | engines/sword1/music.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sword1/music.cpp b/engines/sword1/music.cpp index 783900c598..dd86f27f43 100644 --- a/engines/sword1/music.cpp +++ b/engines/sword1/music.cpp @@ -177,7 +177,7 @@ bool MusicHandle::play(const char *fileBase, bool loop) { if (!_audioSource) { sprintf(fileName, "%s.flac", fileBase); if (_file.open(fileName)) { - _audioSource = Audio::makeFlacStream(&_file, false, 0, 0, loop ? 0 : 1); + _audioSource = Audio::makeLoopingAudioStream(Audio::makeFlacStream(&_file, false), loop ? 0 : 1); if (!_audioSource) _file.close(); } @@ -186,7 +186,7 @@ bool MusicHandle::play(const char *fileBase, bool loop) { if (!_audioSource) { sprintf(fileName, "%s.fla", fileBase); if (_file.open(fileName)) { - _audioSource = Audio::makeFlacStream(&_file, false, 0, 0, loop ? 0 : 1); + _audioSource = Audio::makeLoopingAudioStream(Audio::makeFlacStream(&_file, false), loop ? 0 : 1); if (!_audioSource) _file.close(); } @@ -196,7 +196,7 @@ bool MusicHandle::play(const char *fileBase, bool loop) { if (!_audioSource) { sprintf(fileName, "%s.ogg", fileBase); if (_file.open(fileName)) { - _audioSource = Audio::makeVorbisStream(&_file, false, 0, 0, loop ? 0 : 1); + _audioSource = Audio::makeLoopingAudioStream(Audio::makeVorbisStream(&_file, false), loop ? 0 : 1); if (!_audioSource) _file.close(); } @@ -206,7 +206,7 @@ bool MusicHandle::play(const char *fileBase, bool loop) { if (!_audioSource) { sprintf(fileName, "%s.mp3", fileBase); if (_file.open(fileName)) { - _audioSource = Audio::makeMP3Stream(&_file, false, 0, 0, loop ? 0 : 1); + _audioSource = Audio::makeLoopingAudioStream(Audio::makeMP3Stream(&_file, false), loop ? 0 : 1); if (!_audioSource) _file.close(); } |