diff options
Diffstat (limited to 'engines/tinsel')
| -rw-r--r-- | engines/tinsel/music.cpp | 9 | ||||
| -rw-r--r-- | engines/tinsel/tinsel.cpp | 7 |
2 files changed, 7 insertions, 9 deletions
diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp index cef7f0a781..0dd62dc9c4 100644 --- a/engines/tinsel/music.cpp +++ b/engines/tinsel/music.cpp @@ -30,7 +30,6 @@ #include "sound/audiostream.h" #include "sound/mididrv.h" #include "sound/midiparser.h" -#include "sound/audiocd.h" #include "sound/decoders/adpcm.h" #include "common/config-manager.h" #include "common/file.h" @@ -212,11 +211,11 @@ bool PlayMidiSequence(uint32 dwFileOffset, bool bLoop) { currentLoop = bLoop; // try to play track, but don't fall back to a true CD - AudioCD.play(track, bLoop ? -1 : 1, 0, 0, true); + g_system->getAudioCD()->play(track, bLoop ? -1 : 1, 0, 0, true); // Check if an enhanced audio track is being played. // If it is, stop here and don't load a MIDI track - if (AudioCD.isPlaying()) { + if (g_system->getAudioCD()->isPlaying()) { return true; } } @@ -291,7 +290,7 @@ bool PlayMidiSequence(uint32 dwFileOffset, bool bLoop) { */ bool MidiPlaying() { if (_vm->getFeatures() & GF_ENHANCED_AUDIO_SUPPORT) { - if (AudioCD.isPlaying()) + if (g_system->getAudioCD()->isPlaying()) return true; } return _vm->_midiMusic->isPlaying(); @@ -305,7 +304,7 @@ bool StopMidi() { currentLoop = false; if (_vm->getFeatures() & GF_ENHANCED_AUDIO_SUPPORT) { - AudioCD.stop(); + g_system->getAudioCD()->stop(); } _vm->_midiMusic->stop(); diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp index 8d11efef3c..8bebd635d0 100644 --- a/engines/tinsel/tinsel.cpp +++ b/engines/tinsel/tinsel.cpp @@ -45,7 +45,6 @@ #include "sound/mididrv.h" #include "sound/mixer.h" -#include "sound/audiocd.h" #include "tinsel/actors.h" #include "tinsel/background.h" @@ -854,7 +853,7 @@ TinselEngine::TinselEngine(OSystem *syst, const TinselGameDescription *gameDesc) int cd_num = ConfMan.getInt("cdrom"); if (cd_num >= 0) - _system->openCD(cd_num); + _system->getAudioCD()->openCD(cd_num); MidiDriverType midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI); bool native_mt32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32")); @@ -885,7 +884,7 @@ TinselEngine::~TinselEngine() { if (_bmv->MoviePlaying()) _bmv->FinishBMV(); - AudioCD.stop(); + _system->getAudioCD()->stop(); delete _bmv; delete _sound; delete _midiMusic; @@ -1007,7 +1006,7 @@ Common::Error TinselEngine::run() { // Check for time to do next game cycle if ((g_system->getMillis() > timerVal + GAME_FRAME_DELAY)) { timerVal = g_system->getMillis(); - AudioCD.updateCD(); + _system->getAudioCD()->updateCD(); NextGameCycle(); } |