From fb6fe1332aaa9ab4d0ec0ad4ee8015ce4076bd85 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Tue, 29 Sep 2015 21:00:56 -0400
Subject: BACKENDS: Move to an openCD() without parameters as the public API

---
 engines/drascula/drascula.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'engines/drascula')

diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp
index c72d77c281..1a7659fc85 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()->openCD();
 
 	_lang = kEnglish;
 
-- 
cgit v1.2.3


From aa6ff444408bfd17bcca1d8364e86ce62da327ef Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Tue, 6 Oct 2015 22:10:34 -0400
Subject: BACKENDS: Only expose one set of functions for AudioCDManager

Engines should only have to call one set of functions and not decide between the two. In fact, the 'emulation' API was documented to just call the 'real CD' API.
---
 engines/drascula/drascula.cpp | 2 +-
 engines/drascula/sound.cpp    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/drascula')

diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp
index 1a7659fc85..9ac9031fb7 100644
--- a/engines/drascula/drascula.cpp
+++ b/engines/drascula/drascula.cpp
@@ -183,7 +183,7 @@ DrasculaEngine::DrasculaEngine(OSystem *syst, const DrasculaGameDescription *gam
 	const Common::FSNode gameDataDir(ConfMan.get("path"));
 	SearchMan.addSubDirectoryMatching(gameDataDir, "audio");
 
-	_system->getAudioCDManager()->openCD();
+	_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() {
-- 
cgit v1.2.3