From ac4411389b08c4dde18fb09b8e16a547877a40e1 Mon Sep 17 00:00:00 2001
From: Patryk Obara <dreamer.tan@gmail.com>
Date: Fri, 29 Nov 2019 09:07:19 +0100
Subject: [PATCH] Remove CDROM_USE_SDL enum value

---
 src/dos/cdrom.cpp        | 7 +------
 src/dos/cdrom.h          | 4 ----
 src/dos/dos_mscdex.cpp   | 5 +----
 src/dos/dos_programs.cpp | 4 ++--
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/dos/cdrom.cpp b/src/dos/cdrom.cpp
index bbfc21e1..ffa0d66c 100644
--- a/src/dos/cdrom.cpp
+++ b/src/dos/cdrom.cpp
@@ -16,10 +16,7 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-
-// ******************************************************
-// SDL CDROM 
-// ******************************************************
+#include "cdrom.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -27,8 +24,6 @@
 
 #include "dosbox.h"
 #include "support.h"
-#include "cdrom.h"
-
 
 int CDROM_GetMountType(char* path, int) {
 // 1 - Iso file
diff --git a/src/dos/cdrom.h b/src/dos/cdrom.h
index 57de6c18..3404fc02 100644
--- a/src/dos/cdrom.h
+++ b/src/dos/cdrom.h
@@ -45,10 +45,6 @@
 #define REDBOOK_PCM_BYTES_PER_MS     176.4f // 44.1 frames/ms * 4 bytes/frame
 #define BYTES_PER_REDBOOK_PCM_FRAME       4 // 2 bytes/sample * 2 samples/frame
 
-enum {
-	CDROM_USE_SDL,
-};
-
 typedef struct SMSF {
 	unsigned char min;
 	unsigned char sec;
diff --git a/src/dos/dos_mscdex.cpp b/src/dos/dos_mscdex.cpp
index 172c55e7..9ff80bd1 100644
--- a/src/dos/dos_mscdex.cpp
+++ b/src/dos/dos_mscdex.cpp
@@ -47,8 +47,6 @@
 #define	REQUEST_STATUS_DONE		0x0100
 #define	REQUEST_STATUS_ERROR	0x8000
 
-// Use cdrom Interface
-int useCdromInterface	= CDROM_USE_SDL;
 int forceCD				= -1;
 
 static Bitu MSCDEX_Strategy_Handler(void); 
@@ -1299,8 +1297,7 @@ bool MSCDEX_HasMediaChanged(Bit8u subUnit)
 	return true;
 }
 
-void MSCDEX_SetCDInterface(int intNr, int numCD) {
-	useCdromInterface = intNr;
+void MSCDEX_SetCDInterface(int, int numCD) {
 	forceCD	= numCD;
 }
 
diff --git a/src/dos/dos_programs.cpp b/src/dos/dos_programs.cpp
index e990bb7a..74044e9f 100644
--- a/src/dos/dos_programs.cpp
+++ b/src/dos/dos_programs.cpp
@@ -328,7 +328,7 @@ public:
 					WriteOut(MSG_Get("MSCDEX_WARNING_IOCTL"));
 				}
 				if (cmd->FindExist("-noioctl", false)) {
-					MSCDEX_SetCDInterface(CDROM_USE_SDL, num);
+					MSCDEX_SetCDInterface(0, num);
 				}
 				newdrive  = new cdromDrive(drive,temp_line.c_str(),sizes[0],bit8size,sizes[2],0,mediaid,error);
 				// Check Mscdex, if it worked out...
@@ -1411,7 +1411,7 @@ public:
 				return;
 			}
 
-			MSCDEX_SetCDInterface(CDROM_USE_SDL, -1);
+			MSCDEX_SetCDInterface(0, -1);
 			// create new drives for all images
 			std::vector<DOS_Drive*> isoDisks;
 			std::vector<std::string>::size_type i;