Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

CD-ROM support is so pass? :)

  • Loading branch information
slouken committed Sep 5, 2009
1 parent 81e592a commit c34d66b061fa2934c85b1a50828ce0e20e03eb6e
Showing with 3 additions and 9,394 deletions.
  1. +1 −1 TODO
  2. +1 −79 configure.in
  3. +0 −2 include/SDL.h
  4. +0 −186 include/SDL_cdrom.h
  5. +0 −17 include/SDL_config.h.in
  6. +0 −3 include/SDL_config_dreamcast.h
  7. +0 −3 include/SDL_config_iphoneos.h
  8. +0 −3 include/SDL_config_macosx.h
  9. +0 −3 include/SDL_config_minimal.h
  10. +0 −3 include/SDL_config_nintendods.h
  11. +0 −3 include/SDL_config_os2.h
  12. +0 −1 include/SDL_config_pandora.h
  13. +0 −7 include/SDL_config_win32.h
  14. +0 −26 src/SDL.c
  15. +0 −357 src/cdrom/SDL_cdrom.c
  16. +0 −78 src/cdrom/SDL_syscdrom.h
  17. +0 −665 src/cdrom/aix/SDL_syscdrom.c
  18. +0 −427 src/cdrom/beos/SDL_syscdrom.cc
  19. +0 −550 src/cdrom/bsdi/SDL_syscdrom.c
  20. +0 −187 src/cdrom/dc/SDL_syscdrom.c
  21. +0 −44 src/cdrom/dummy/SDL_syscdrom.c
  22. +0 −422 src/cdrom/freebsd/SDL_syscdrom.c
  23. +0 −585 src/cdrom/linux/SDL_syscdrom.c
  24. +0 −397 src/cdrom/macosx/AudioFilePlayer.c
  25. +0 −178 src/cdrom/macosx/AudioFilePlayer.h
  26. +0 −657 src/cdrom/macosx/AudioFileReaderThread.c
  27. +0 −669 src/cdrom/macosx/CDPlayer.c
  28. +0 −72 src/cdrom/macosx/CDPlayer.h
  29. +0 −205 src/cdrom/macosx/SDLOSXCAGuard.c
  30. +0 −116 src/cdrom/macosx/SDLOSXCAGuard.h
  31. +0 −523 src/cdrom/macosx/SDL_syscdrom.c
  32. +0 −136 src/cdrom/macosx/SDL_syscdrom_c.h
  33. +0 −339 src/cdrom/mint/SDL_syscdrom.c
  34. +0 −430 src/cdrom/openbsd/SDL_syscdrom.c
  35. +0 −442 src/cdrom/os2/SDL_syscdrom.c
  36. +0 −464 src/cdrom/osf/SDL_syscdrom.c
  37. +0 −507 src/cdrom/qnx/SDL_syscdrom.c
  38. +0 −400 src/cdrom/win32/SDL_syscdrom.c
  39. +1 −4 test/Makefile.in
  40. +0 −203 test/testcdrom.c
2 TODO
@@ -50,4 +50,4 @@ we should do it though, since the 1.2 series should not break binary
compatibility in this way.

Requests:
* PCM and CDROM volume control (deprecated, but possible)
* PCM volume control (deprecated, but possible)
@@ -206,7 +206,6 @@ fi
# Standard C sources
SOURCES="$SOURCES $srcdir/src/*.c"
SOURCES="$SOURCES $srcdir/src/audio/*.c"
SOURCES="$SOURCES $srcdir/src/cdrom/*.c"
SOURCES="$SOURCES $srcdir/src/cpuinfo/*.c"
SOURCES="$SOURCES $srcdir/src/events/*.c"
SOURCES="$SOURCES $srcdir/src/file/*.c"
@@ -265,12 +264,6 @@ if test x$enable_power != xyes; then
else
SOURCES="$SOURCES $srcdir/src/power/*.c"
fi
AC_ARG_ENABLE(cdrom,
AC_HELP_STRING([--enable-cdrom], [Enable the cdrom subsystem [[default=yes]]]),
, enable_cdrom=yes)
if test x$enable_cdrom != xyes; then
AC_DEFINE(SDL_CDROM_DISABLED)
fi
AC_ARG_ENABLE(threads,
AC_HELP_STRING([--enable-threads], [Enable the threading subsystem [[default=yes]]]),
, enable_threads=yes)
@@ -2481,41 +2474,6 @@ case "$host" in
;;
esac
fi
# Set up files for the cdrom library
if test x$enable_cdrom = xyes; then
case $ARCH in
linux|solaris)
AC_DEFINE(SDL_CDROM_LINUX)
SOURCES="$SOURCES $srcdir/src/cdrom/linux/*.c"
have_cdrom=yes
;;
*freebsd*)
AC_DEFINE(SDL_CDROM_FREEBSD)
SOURCES="$SOURCES $srcdir/src/cdrom/freebsd/*.c"
have_cdrom=yes
;;
*openbsd*|*netbsd*)
AC_DEFINE(SDL_CDROM_OPENBSD)
SOURCES="$SOURCES $srcdir/src/cdrom/openbsd/*.c"
have_cdrom=yes
;;
bsdi)
AC_DEFINE(SDL_CDROM_BSDI)
SOURCES="$SOURCES $srcdir/src/cdrom/bsdi/*.c"
have_cdrom=yes
;;
aix)
AC_DEFINE(SDL_CDROM_AIX)
SOURCES="$SOURCES $srcdir/src/cdrom/aix/*.c"
have_cdrom=yes
;;
osf)
AC_DEFINE(SDL_CDROM_OSF)
SOURCES="$SOURCES $srcdir/src/cdrom/osf/*.c"
have_cdrom=yes
;;
esac
fi
# Set up files for the thread library
if test x$enable_threads = xyes -a x$use_pthreads != xyes -a x$use_pth != xyes -a x$ARCH = xirix; then
AC_DEFINE(SDL_THREAD_SPROC)
@@ -2560,12 +2518,6 @@ case "$host" in
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lasound"
have_audio=yes
fi
# Set up files for the cdrom library
if test x$enable_cdrom = xyes; then
AC_DEFINE(SDL_CDROM_QNX)
SOURCES="$SOURCES $srcdir/src/cdrom/qnx/*.c"
have_cdrom=yes
fi
# Set up files for the timer library
if test x$enable_timers = xyes; then
AC_DEFINE(SDL_TIMER_UNIX)
@@ -2743,12 +2695,6 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
SOURCES="$SOURCES $srcdir/src/power/windows/SDL_syspower.c"
have_power=yes
fi
# Set up files for the cdrom library
if test x$enable_cdrom = xyes; then
AC_DEFINE(SDL_CDROM_WIN32)
SOURCES="$SOURCES $srcdir/src/cdrom/win32/*.c"
have_cdrom=yes
fi
# Set up files for the thread library
if test x$enable_threads = xyes; then
AC_DEFINE(SDL_THREAD_WIN32)
@@ -2801,12 +2747,6 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
SOURCES="$SOURCES $srcdir/src/joystick/beos/*.cc"
have_joystick=yes
fi
# Set up files for the cdrom library
if test x$enable_cdrom = xyes; then
AC_DEFINE(SDL_CDROM_BEOS)
SOURCES="$SOURCES $srcdir/src/cdrom/beos/*.cc"
have_cdrom=yes
fi
# Set up files for the thread library
if test x$enable_threads = xyes; then
AC_DEFINE(SDL_THREAD_BEOS)
@@ -2910,12 +2850,6 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
SOURCES="$SOURCES $srcdir/src/power/macosx/*.c"
have_power=yes
fi
# Set up files for the cdrom library
if test x$enable_cdrom = xyes; then
AC_DEFINE(SDL_CDROM_MACOSX)
SOURCES="$SOURCES $srcdir/src/cdrom/macosx/*.c"
have_cdrom=yes
fi
# Set up files for the timer library
if test x$enable_timers = xyes; then
AC_DEFINE(SDL_TIMER_UNIX)
@@ -2929,7 +2863,7 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Carbon"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,IOKit"
# If either the audio or CD driver is used, add the AudioUnit framework
if test x$enable_audio = xyes -o x$enable_cdrom = xyes; then
if test x$enable_audio = xyes; then
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,CoreAudio -Wl,-framework,AudioToolbox -Wl,-framework,AudioUnit"
fi
;;
@@ -2959,12 +2893,6 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
SOURCES="$SOURCES $srcdir/src/joystick/mint/*.c"
have_joystick=yes
fi
# Set up files for the cdrom library
if test x$enable_cdrom = xyes; then
AC_DEFINE(SDL_CDROM_MINT)
SOURCES="$SOURCES $srcdir/src/cdrom/mint/*.c"
have_cdrom=yes
fi
# Set up files for the timer library
if test x$enable_timers = xyes; then
if test x$enable_threads = xyes -a x$enable_pth = xyes; then
@@ -3025,12 +2953,6 @@ if test x$have_haptic != xyes; then
fi
SOURCES="$SOURCES $srcdir/src/haptic/dummy/*.c"
fi
if test x$have_cdrom != xyes; then
if test x$enable_cdrom = xyes; then
AC_DEFINE(SDL_CDROM_DISABLED)
fi
SOURCES="$SOURCES $srcdir/src/cdrom/dummy/*.c"
fi
if test x$have_threads != xyes; then
if test x$enable_threads = xyes; then
AC_DEFINE(SDL_THREADS_DISABLED)
@@ -78,7 +78,6 @@ Enjoy!
#include "SDL_stdinc.h"
#include "SDL_atomic.h"
#include "SDL_audio.h"
#include "SDL_cdrom.h"
#include "SDL_cpuinfo.h"
#include "SDL_endian.h"
#include "SDL_error.h"
@@ -109,7 +108,6 @@ extern "C" {
#define SDL_INIT_TIMER 0x00000001
#define SDL_INIT_AUDIO 0x00000010
#define SDL_INIT_VIDEO 0x00000020
#define SDL_INIT_CDROM 0x00000100
#define SDL_INIT_JOYSTICK 0x00000200
#define SDL_INIT_HAPTIC 0x00001000
#define SDL_INIT_NOPARACHUTE 0x00100000 /* Don't catch fatal signals */

This file was deleted.

@@ -160,7 +160,6 @@

/* Allow disabling of core subsystems */
#undef SDL_AUDIO_DISABLED
#undef SDL_CDROM_DISABLED
#undef SDL_CPUINFO_DISABLED
#undef SDL_EVENTS_DISABLED
#undef SDL_FILE_DISABLED
@@ -204,22 +203,6 @@
#undef SDL_AUDIO_DRIVER_FUSIONSOUND
#undef SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC

/* Enable various cdrom drivers */
#undef SDL_CDROM_AIX
#undef SDL_CDROM_BEOS
#undef SDL_CDROM_BSDI
#undef SDL_CDROM_DC
#undef SDL_CDROM_DUMMY
#undef SDL_CDROM_FREEBSD
#undef SDL_CDROM_LINUX
#undef SDL_CDROM_MACOSX
#undef SDL_CDROM_MINT
#undef SDL_CDROM_OPENBSD
#undef SDL_CDROM_OS2
#undef SDL_CDROM_OSF
#undef SDL_CDROM_QNX
#undef SDL_CDROM_WIN32

/* Enable various input drivers */
#undef SDL_INPUT_LINUXEV
#undef SDL_INPUT_TSLIB
@@ -88,9 +88,6 @@ typedef unsigned long uintptr_t;
#define SDL_AUDIO_DRIVER_DISK 1
#define SDL_AUDIO_DRIVER_DUMMY 1

/* Enable various cdrom drivers */
#define SDL_CDROM_DC 1

/* Enable various input drivers */
#define SDL_JOYSTICK_DC 1
#define SDL_HAPTIC_DUMMY 1

0 comments on commit c34d66b

Please sign in to comment.