diff options
author | Johannes Schickel | 2016-03-21 01:48:38 +0100 |
---|---|---|
committer | Johannes Schickel | 2016-03-21 01:48:38 +0100 |
commit | 5336882555e4834bb5b93fddcf4231d3def9d028 (patch) | |
tree | 757cc1dd3d5112f7ae479f86d2d11e0cf378e9bc /engines/scumm | |
parent | 00edd712e85c7811c1b6f1119ad2abcad6999ce9 (diff) | |
parent | afe8ea139ccc4e563260494c236642153c540001 (diff) | |
download | scummvm-rg350-5336882555e4834bb5b93fddcf4231d3def9d028.tar.gz scummvm-rg350-5336882555e4834bb5b93fddcf4231d3def9d028.tar.bz2 scummvm-rg350-5336882555e4834bb5b93fddcf4231d3def9d028.zip |
Merge pull request #704 from lordhoto/clone2727-audiocd
Implement Custom Audio CD Support for Win32, Linux, and Mac OS X.
Diffstat (limited to 'engines/scumm')
-rw-r--r-- | engines/scumm/scumm.cpp | 5 | ||||
-rw-r--r-- | engines/scumm/sound.cpp | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index 89d2d3dc72..d9148ed300 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -1275,10 +1275,7 @@ void ScummEngine::setupScumm() { // On some systems it's not safe to run CD audio games from the CD. if (_game.features & GF_AUDIOTRACKS && !Common::File::exists("CDDA.SOU")) { checkCD(); - - int cd_num = ConfMan.getInt("cdrom"); - if (cd_num >= 0) - _system->getAudioCDManager()->openCD(cd_num); + _system->getAudioCDManager()->open(); } // Create the sound manager diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index 4d70ee8482..404bdd022c 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -1093,7 +1093,7 @@ int Sound::pollCD() const { void Sound::updateCD() { if (!_isLoomSteam) - g_system->getAudioCDManager()->updateCD(); + g_system->getAudioCDManager()->update(); } AudioCDManager::Status Sound::getCDStatus() { |