Dummy audio and video drivers are enabled (thanks Ryan!)

libsdl-org · Jul 2, 2001 · 6c07a1b · 6c07a1b
1 parent 5b090bc
commit 6c07a1b
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 21 deletions.
diff --git a/configure.in b/configure.in
@@ -368,21 +368,19 @@ CheckNAS()
     fi
 }
 
-
 dnl rcg07142001 See if the user wants the disk writer audio driver...
 CheckDiskAudio()
 {
     AC_ARG_ENABLE(diskaudio,
-[  --enable-diskaudio  	  support the disk writer audio driver [default=no]],
-                  , enable_diskaudio=no)
+[  --enable-diskaudio  	  support the disk writer audio driver [default=yes]],
+                  , enable_diskaudio=yes)
     if test x$enable_audio = xyes -a x$enable_diskaudio = xyes; then
         CFLAGS="$CFLAGS -DDISKAUD_SUPPORT"
         AUDIO_SUBDIRS="$AUDIO_SUBDIRS disk"
         AUDIO_DRIVERS="$AUDIO_DRIVERS disk/libaudio_disk.la"
     fi
 }
 
-
 dnl See if we can use x86 assembly blitters
 CheckNASM()
 {
@@ -810,8 +808,8 @@ dnl rcg04172001 Set up the Null video driver.
 CheckDummyVideo()
 {
     AC_ARG_ENABLE(video-dummy,
-[  --enable-video-dummy    use dummy video driver [default=no]],
-                  , enable_video_dummy=no)
+[  --enable-video-dummy    use dummy video driver [default=yes]],
+                  , enable_video_dummy=yes)
     if test x$enable_video_dummy = xyes; then
       CFLAGS="$CFLAGS -DENABLE_DUMMYVIDEO"
       VIDEO_SUBDIRS="$VIDEO_SUBDIRS dummy"
@@ -902,7 +900,7 @@ CheckPTHREAD()
                   , enable_pthreads=yes)
     dnl This is used on Linux for glibc binary compatibility (Doh!)
     AC_ARG_ENABLE(pthread-sem,
-[    --enable-pthread-sem  use pthread semaphores [default=yes]],
+[  --enable-pthread-sem    use pthread semaphores [default=yes]],
                   , enable_pthread_sem=yes)
     ac_save_libs="$LIBS"
     case "$target" in

diff --git a/src/audio/disk/SDL_diskaudio.c b/src/audio/disk/SDL_diskaudio.c
@@ -80,23 +80,30 @@ static int DISKAUD_Available(void)
     int exists = 0;
     struct stat statbuf;
     const char *fname = DISKAUD_GetOutputFilename();
-
+	const char *envr = getenv("SDL_AUDIODRIVER");
 	available = 0;
 
-    if (stat(fname, &statbuf) == 0)
-        exists = 1;
-
-    fd = open(fname, O_WRONLY | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR);
-	if ( fd != -1 ) {
-		available = 1;
-		close(fd);
-        if (!exists) {
-            unlink(fname);
-        }
+	if ((envr) && (strcmp(envr, DISKAUD_DRIVER_NAME) == 0)) {
+		if (stat(fname, &statbuf) == 0)
+			exists = 1;
+
+		fd = open(fname, O_WRONLY | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR);
+		if ( fd != -1 ) {
+			available = 1;
+			close(fd);
+			if (!exists) {
+				unlink(fname);
+			}
+		}
 	}
 	return(available);
 #else
-    return(1);
+	const char *envr = getenv("SDL_AUDIODRIVER");
+	if ((envr) && (strcmp(envr, DISKAUD_DRIVER_NAME) == 0)) {
+		return(1);
+	}
+
+	return(0);
 #endif
 }
 

diff --git a/src/video/dummy/SDL_nullvideo.c b/src/video/dummy/SDL_nullvideo.c
@@ -55,6 +55,8 @@ static char rcsid =
 #include "SDL_nullevents_c.h"
 #include "SDL_nullmouse_c.h"
 
+#define DUMMYVID_DRIVER_NAME "dummy"
+
 /* Initialization/Query functions */
 static int DUMMY_VideoInit(_THIS, SDL_PixelFormat *vformat);
 static SDL_Rect **DUMMY_ListModes(_THIS, SDL_PixelFormat *format, Uint32 flags);
@@ -76,7 +78,12 @@ static void DUMMY_UpdateRects(_THIS, int numrects, SDL_Rect *rects);
 
 static int DUMMY_Available(void)
 {
-	return 1; /* Always available ! */
+	const char *envr = getenv("SDL_VIDEODRIVER");
+	if ((envr) && (strcmp(envr, DUMMYVID_DRIVER_NAME) == 0)) {
+		return(1);
+	}
+
+	return(0);
 }
 
 static void DUMMY_DeleteDevice(SDL_VideoDevice *device)
@@ -136,7 +143,7 @@ static SDL_VideoDevice *DUMMY_CreateDevice(int devindex)
 }
 
 VideoBootStrap DUMMY_bootstrap = {
-	"dummy", "SDL dummy video driver",
+	DUMMYVID_DRIVER_NAME, "SDL dummy video driver",
 	DUMMY_Available, DUMMY_CreateDevice
 };