diff options
| author | Max Horn | 2010-11-08 22:53:36 +0000 |
|---|---|---|
| committer | Max Horn | 2010-11-08 22:53:36 +0000 |
| commit | 82e473bc3b1498325bad28d804e4314f0c3a528c (patch) | |
| tree | f186d8b9eeb665a81897deca3a3fadcf74007c16 /engines/tinsel/music.cpp | |
| parent | 4242229c91c356bdd90c66ce8c0642488a1b4bf5 (diff) | |
| parent | 74a53df11b51fa4956745c086b2e6351b8383568 (diff) | |
| download | scummvm-rg350-82e473bc3b1498325bad28d804e4314f0c3a528c.tar.gz scummvm-rg350-82e473bc3b1498325bad28d804e4314f0c3a528c.tar.bz2 scummvm-rg350-82e473bc3b1498325bad28d804e4314f0c3a528c.zip | |
BACKENDS: Partial merge of gsoc2010-opengl: Audio CD changes only
This commit contains the AudioCDManager changes from the gsoc2010-opengl
branch. The other changes in that branch are restricted to the backends
directory only (plus configure).
The Nintendo DS and Dreamcast ports still need to be ported over to
the new Audio CD system, but that should be fairly easy to do.
svn-id: r54147
Diffstat (limited to 'engines/tinsel/music.cpp')
| -rw-r--r-- | engines/tinsel/music.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp index f21c41a843..b46424704c 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" @@ -191,11 +190,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->getAudioCDManager()->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->getAudioCDManager()->isPlaying()) { return true; } } @@ -270,7 +269,7 @@ bool PlayMidiSequence(uint32 dwFileOffset, bool bLoop) { */ bool MidiPlaying() { if (_vm->getFeatures() & GF_ENHANCED_AUDIO_SUPPORT) { - if (AudioCD.isPlaying()) + if (g_system->getAudioCDManager()->isPlaying()) return true; } return _vm->_midiMusic->isPlaying(); @@ -284,7 +283,7 @@ bool StopMidi() { currentLoop = false; if (_vm->getFeatures() & GF_ENHANCED_AUDIO_SUPPORT) { - AudioCD.stop(); + g_system->getAudioCDManager()->stop(); } _vm->_midiMusic->stop(); |