From de886a8b5852248898ff86088dc867cf12a7e245 Mon Sep 17 00:00:00 2001 From: Bastien Bouclet Date: Tue, 31 Jul 2018 21:41:10 +0200 Subject: 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. --- backends/audiocd/win32/win32-audiocd.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'backends/audiocd/win32') diff --git a/backends/audiocd/win32/win32-audiocd.cpp b/backends/audiocd/win32/win32-audiocd.cpp index 6eff1ef0b3..7269910506 100644 --- a/backends/audiocd/win32/win32-audiocd.cpp +++ b/backends/audiocd/win32/win32-audiocd.cpp @@ -149,14 +149,14 @@ public: Win32AudioCDManager(); ~Win32AudioCDManager(); - virtual bool open(); - virtual void close(); - virtual bool play(int track, int numLoops, int startFrame, int duration, bool onlyEmulate = false, - Audio::Mixer::SoundType soundType = Audio::Mixer::kMusicSoundType); + bool open() override; + void close() override; + bool play(int track, int numLoops, int startFrame, int duration, bool onlyEmulate, + Audio::Mixer::SoundType soundType) override; protected: - virtual bool openCD(int drive); - virtual bool openCD(const Common::String &drive); + bool openCD(int drive) override; + bool openCD(const Common::String &drive) override; private: bool loadTOC(); -- cgit v1.2.3