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/scumm/scumm.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'engines/scumm/scumm.cpp')

diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 89d2d3dc72..680bdb2463 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()->openCD();
 	}
 
 	// Create the sound manager
-- 
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/scumm/scumm.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/scumm/scumm.cpp')

diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 680bdb2463..d9148ed300 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1275,7 +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();
-		_system->getAudioCDManager()->openCD();
+		_system->getAudioCDManager()->open();
 	}
 
 	// Create the sound manager
-- 
cgit v1.2.3


From 253e18c44080f57eb2334296e09297a2db5efda9 Mon Sep 17 00:00:00 2001
From: Ori Avtalion
Date: Thu, 14 Apr 2016 13:29:08 +0300
Subject: JANITORIAL: Reduce GUI header dependencies

---
 engines/scumm/scumm.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'engines/scumm/scumm.cpp')

diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index d9148ed300..e7118616ba 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -30,7 +30,6 @@
 #include "engines/util.h"
 
 #include "gui/message.h"
-#include "gui/gui-manager.h"
 
 #include "graphics/cursorman.h"
 
-- 
cgit v1.2.3