diff options
Diffstat (limited to 'engines/scumm/sound.cpp')
| -rw-r--r-- | engines/scumm/sound.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index 8fc6de8af9..af7bc5f295 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -37,7 +37,6 @@ #include "scumm/util.h" #include "sound/decoders/adpcm.h" -#include "sound/audiocd.h" #include "sound/decoders/flac.h" #include "sound/mididrv.h" #include "sound/mixer.h" @@ -89,7 +88,7 @@ Sound::Sound(ScummEngine *parent, Audio::Mixer *mixer) Sound::~Sound() { stopCDTimer(); - AudioCD.stop(); + g_system->getAudioCDManager()->stop(); delete _sfxFile; } @@ -1027,7 +1026,7 @@ void Sound::playCDTrack(int track, int numLoops, int startFrame, int duration) { // Play it if (!_soundsPaused) - AudioCD.play(track, numLoops, startFrame, duration); + g_system->getAudioCDManager()->play(track, numLoops, startFrame, duration); // Start the timer after starting the track. Starting an MP3 track is // almost instantaneous, but a CD player may take some time. Hopefully @@ -1036,15 +1035,15 @@ void Sound::playCDTrack(int track, int numLoops, int startFrame, int duration) { } void Sound::stopCD() { - AudioCD.stop(); + g_system->getAudioCDManager()->stop(); } int Sound::pollCD() const { - return AudioCD.isPlaying(); + return g_system->getAudioCDManager()->isPlaying(); } void Sound::updateCD() { - AudioCD.updateCD(); + g_system->getAudioCDManager()->updateCD(); } void Sound::saveLoadWithSerializer(Serializer *ser) { |