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/gob | |
| 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/gob')
| -rw-r--r-- | engines/gob/gob.cpp | 2 | ||||
| -rw-r--r-- | engines/gob/sound/cdrom.cpp | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp index 4906b8f117..e8cbec270c 100644 --- a/engines/gob/gob.cpp +++ b/engines/gob/gob.cpp @@ -262,7 +262,7 @@ Common::Error GobEngine::run() { int cd_num = ConfMan.getInt("cdrom"); if (cd_num >= 0) - _system->openCD(cd_num); + _system->getAudioCDManager()->openCD(cd_num); _global->_debugFlag = 1; _video->_doRangeClamp = true; diff --git a/engines/gob/sound/cdrom.cpp b/engines/gob/sound/cdrom.cpp index cfd26e6bed..3316b760ef 100644 --- a/engines/gob/sound/cdrom.cpp +++ b/engines/gob/sound/cdrom.cpp @@ -26,7 +26,6 @@ #include "common/endian.h" #include "common/str.h" #include "common/util.h" -#include "sound/audiocd.h" #include "gob/gob.h" #include "gob/sound/cdrom.h" @@ -116,7 +115,7 @@ void CDROM::play(uint32 from, uint32 to) { // HSG encodes frame information into a double word: // minute multiplied by 4500, plus second multiplied by 75, // plus frame, minus 150 - AudioCD.play(1, 1, from, to - from + 1); + g_system->getAudioCDManager()->play(1, 1, from, to - from + 1); _cdPlaying = true; } @@ -161,7 +160,7 @@ void CDROM::stopPlaying() { void CDROM::stop() { _curTrackBuffer = 0; - AudioCD.stop(); + g_system->getAudioCDManager()->stop(); _cdPlaying = false; } |