aboutsummaryrefslogtreecommitdiff
path: root/engines/drascula
diff options
context:
space:
mode:
authorJohannes Schickel2016-03-21 01:48:38 +0100
committerJohannes Schickel2016-03-21 01:48:38 +0100
commit5336882555e4834bb5b93fddcf4231d3def9d028 (patch)
tree757cc1dd3d5112f7ae479f86d2d11e0cf378e9bc /engines/drascula
parent00edd712e85c7811c1b6f1119ad2abcad6999ce9 (diff)
parentafe8ea139ccc4e563260494c236642153c540001 (diff)
downloadscummvm-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/drascula')
-rw-r--r--engines/drascula/drascula.cpp4
-rw-r--r--engines/drascula/sound.cpp2
2 files changed, 2 insertions, 4 deletions
diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp
index c72d77c281..9ac9031fb7 100644
--- a/engines/drascula/drascula.cpp
+++ b/engines/drascula/drascula.cpp
@@ -183,9 +183,7 @@ DrasculaEngine::DrasculaEngine(OSystem *syst, const DrasculaGameDescription *gam
const Common::FSNode gameDataDir(ConfMan.get("path"));
SearchMan.addSubDirectoryMatching(gameDataDir, "audio");
- int cd_num = ConfMan.getInt("cdrom");
- if (cd_num >= 0)
- _system->getAudioCDManager()->openCD(cd_num);
+ _system->getAudioCDManager()->open();
_lang = kEnglish;
diff --git a/engines/drascula/sound.cpp b/engines/drascula/sound.cpp
index 148dae76f5..c576b37660 100644
--- a/engines/drascula/sound.cpp
+++ b/engines/drascula/sound.cpp
@@ -133,7 +133,7 @@ void DrasculaEngine::stopMusic() {
}
void DrasculaEngine::updateMusic() {
- _system->getAudioCDManager()->updateCD();
+ _system->getAudioCDManager()->update();
}
int DrasculaEngine::musicStatus() {