diff options
author | Alejandro Marzini | 2010-06-09 20:09:57 +0000 |
---|---|---|
committer | Alejandro Marzini | 2010-06-09 20:09:57 +0000 |
commit | e991cd8c53ad21af037df1e0a16816aeea2d0fe2 (patch) | |
tree | f647f636fc3898c150db61de50c3522056a65d17 /engines/gob | |
parent | 4177a1e16df7712c081e41a8eabf0b7d4694230b (diff) | |
download | scummvm-rg350-e991cd8c53ad21af037df1e0a16816aeea2d0fe2.tar.gz scummvm-rg350-e991cd8c53ad21af037df1e0a16816aeea2d0fe2.tar.bz2 scummvm-rg350-e991cd8c53ad21af037df1e0a16816aeea2d0fe2.zip |
- Revised abstract AudioCDManager.
- Removed AudioCDManager Singleton, and changed code for using AudioCDManager in OSystem.
- Added initialization code for new AudioCDManager in BaseBackend and OSystem_SDL.
svn-id: r49548
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 e3472e9fe1..5dc2da6e0c 100644 --- a/engines/gob/gob.cpp +++ b/engines/gob/gob.cpp @@ -243,7 +243,7 @@ Common::Error GobEngine::run() { int cd_num = ConfMan.getInt("cdrom"); if (cd_num >= 0) - _system->openCD(cd_num); + _system->getAudioCD()->openCD(cd_num); _global->_debugFlag = 1; _video->_doRangeClamp = true; diff --git a/engines/gob/sound/cdrom.cpp b/engines/gob/sound/cdrom.cpp index 8f0b1df23e..ed006ca722 100644 --- a/engines/gob/sound/cdrom.cpp +++ b/engines/gob/sound/cdrom.cpp @@ -25,7 +25,6 @@ #include "common/endian.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->getAudioCD()->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->getAudioCD()->stop(); _cdPlaying = false; } |