diff options
author | Bastien Bouclet | 2018-07-31 21:41:10 +0200 |
---|---|---|
committer | Bastien Bouclet | 2018-07-31 21:44:26 +0200 |
commit | de886a8b5852248898ff86088dc867cf12a7e245 (patch) | |
tree | 2beec1457e3b487f854e7dfd9d67cd96bf6678e7 /backends/audiocd/sdl | |
parent | 2586ca2345751a0ca5eb2c694e5e2c753054f069 (diff) | |
download | scummvm-rg350-de886a8b5852248898ff86088dc867cf12a7e245.tar.gz scummvm-rg350-de886a8b5852248898ff86088dc867cf12a7e245.tar.bz2 scummvm-rg350-de886a8b5852248898ff86088dc867cf12a7e245.zip |
AUDIO: Fix broken physical audio CD playback on non-win32
The play method did not override the base class due to the addition of
the soundType parameter.
Diffstat (limited to 'backends/audiocd/sdl')
-rw-r--r-- | backends/audiocd/sdl/sdl-audiocd.cpp | 5 | ||||
-rw-r--r-- | backends/audiocd/sdl/sdl-audiocd.h | 15 |
2 files changed, 11 insertions, 9 deletions
diff --git a/backends/audiocd/sdl/sdl-audiocd.cpp b/backends/audiocd/sdl/sdl-audiocd.cpp index 3558fb5671..e2e4f1d069 100644 --- a/backends/audiocd/sdl/sdl-audiocd.cpp +++ b/backends/audiocd/sdl/sdl-audiocd.cpp @@ -91,9 +91,10 @@ void SdlAudioCDManager::stop() { _cdNumLoops = 0; } -bool SdlAudioCDManager::play(int track, int numLoops, int startFrame, int duration, bool onlyEmulate) { +bool SdlAudioCDManager::play(int track, int numLoops, int startFrame, int duration, bool onlyEmulate, + Audio::Mixer::SoundType soundType) { // Prefer emulation - if (DefaultAudioCDManager::play(track, numLoops, startFrame, duration, onlyEmulate)) + if (DefaultAudioCDManager::play(track, numLoops, startFrame, duration, onlyEmulate, soundType)) return true; // If we're set to only emulate, or have no CD, return here diff --git a/backends/audiocd/sdl/sdl-audiocd.h b/backends/audiocd/sdl/sdl-audiocd.h index 91895dac99..567def936d 100644 --- a/backends/audiocd/sdl/sdl-audiocd.h +++ b/backends/audiocd/sdl/sdl-audiocd.h @@ -37,15 +37,16 @@ public: SdlAudioCDManager(); virtual ~SdlAudioCDManager(); - virtual bool open(); - virtual void close(); - virtual bool play(int track, int numLoops, int startFrame, int duration, bool onlyEmulate = false); - virtual void stop(); - virtual bool isPlaying() const; - virtual void update(); + bool open() override; + void close() override; + bool play(int track, int numLoops, int startFrame, int duration, bool onlyEmulate, + Audio::Mixer::SoundType soundType) override; + void stop() override; + bool isPlaying() const override; + void update() override; protected: - virtual bool openCD(int drive); + bool openCD(int drive) override; SDL_CD *_cdrom; int _cdTrack, _cdNumLoops, _cdStartFrame, _cdDuration; |