more

CHANGELOG

@@ -1,4 +1,8 @@
 0.83.9
+  - Physical CD drives are now mountable in SDL2 builds
+    just like SDL1 builds, so commands like "MOUNT -CD"
+    should work in both SDL1 and SDL2 builds. Some code
+    is adoptped from the SDL2_CDROM library. (Wengier)
   - INT 13h now obeys the "hard drive data rate limit"
     setting, using the same disk I/O delay code as
     INT 21h file I/O. [Issue #2039]
@@ -139,10 +143,6 @@
     show a warning dialog instead of exiting. (Wengier)
   - Fixed the mouse sensitivity menu option (under the
     "DOS" menu) not working. (Wengier)
-  - Fixed physical CD drives not working in the SDL2
-    version. Now commands like "MOUNT -CD" should work
-    in SDL2 builds just like SDL1 builds. Some code
-    is adoptped from the SDL2_CDROM library.(Wengier)
   - Fixed the color palette problem when switching to
     graphic mode from mono mode. (Wengier)
   - Fixed full-screen TTF output may not fully cover

CREDITS.md

@@ -14,8 +14,8 @@ A list of features ported from DOSBox SVN Daum:
 * GUI menu bar (heavily improved since then)
 * Some commands (PROMPT, MOUSE, VOL, DEVICE, etc)
 * Basic support for automatic drive mounting (Windows)
-* Printer output
-* NE2000 Ethernet
+* Printer output (improved since then by Wengier)
+* NE2000 Ethernet (improved since then by Wengier)
 * MT-32 emulation (MUNT)
 * Internal 3dfx Voodoo card emulation (improved since then by Wengier and joncampbell123 along with code ported from DOSBox ECE)
 * Some support for FluidSynth MIDI synthesizer
@@ -80,8 +80,14 @@ SN76496 emulation (MAME project; GPLv2+) src/hardware/sn76496.h src/hardware/tan
 
 3dfx Voodoo Graphics SST-1/2 emulation (Aaron Giles; BSD 3-clause) src/hardware/voodoo_emu.cpp
 
+HQ2X and HQ3X render scaler (ScummVM, Maxim Stepin; GPLv2+) src/gui/render_templates_hq2x.h
+
 PC-98 FM board emulation (Neko Project II; BSD 3-clause) src/hardware/snd_pc98/*
 
 QCOW image support (Michael Greger; GPLv2+) src/ints/qcow2_disk.cpp
 
-HQ2X and HQ3X render scaler (ScummVM, Maxim Stepin; GPLv2+) src/gui/render_templates_hq2x.h
+PhysFS archive support (Ryan Gordon; zlib licence) src/libs/physfs/*
+
+Tiny File Dialogs (vareille; zlib licence) src/libs/tinyfiledialogs/*
+
+MAME CHD support (Romain Tisserand; BSD 3-clause) src/libs/libchdr/*

src/dos/cdrom.cpp

@@ -41,6 +41,10 @@
 #elif defined(MACOSX)
 #define SDL_CDROM_MACOSX
 #include "../../vs2015/sdl/src/cdrom/macosx/SDL_syscdrom.c"
+#include "../../vs2015/sdl/src/cdrom/macosx/AudioFilePlayer.c"
+#include "../../vs2015/sdl/src/cdrom/macosx/AudioFileReaderThread.c"
+#include "../../vs2015/sdl/src/cdrom/macosx/CDPlayer.c"
+#include "../../vs2015/sdl/src/cdrom/macosx/SDLOSXCAGuard.c"
 #else
 #define SDL_CDROM_DUMMY
 #include "../../vs2015/sdl/src/cdrom/dummy/SDL_syscdrom.c"

src/dos/cdrom_ioctl_linux.cpp

@@ -88,13 +88,9 @@ bool CDROM_Interface_Ioctl::SetDevice(char* path, int forceCD)
 	bool success = CDROM_Interface_SDL::SetDevice(path, forceCD);
 	
 	if (success) {
-#if defined(C_SDL2)
-        strcpy(device_name, "unknown");
-#else
 		const char* tmp = SDL_CDName(forceCD);
 		if (tmp) safe_strncpy(device_name, tmp, 512);
 		else success = false;
-#endif
 	}
 	
 	return success;

vs2015/sdl/src/cdrom/macosx/CDPlayer.c

@@ -554,7 +554,11 @@ static OSStatus CheckInit ()
     callbackSem = SDL_CreateSemaphore(0);
 
     /* Start callback thread */
+#if defined(C_SDL2)
+    SDL_CreateThread(RunCallBackThread, "CDPlayer", NULL);
+#else
     SDL_CreateThread(RunCallBackThread, NULL);
+#endif
 
     { /*try {*/
         ComponentDescription desc;