[MPlayer-cvslog] r27787 - in trunk: configure stream/stream.h

[diego]

Author: diego
Date: Thu Oct 16 20:28:38 2008
New Revision: 27787

Log:
Move DEFAULT_CDROM_DEVICE/DEFAULT_DVD_DEVICE to stream.h where it belongs.
config.h should only contain option definitions, no code.


Modified:
   trunk/configure
   trunk/stream/stream.h

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Thu Oct 16 20:28:38 2008
@@ -8204,33 +8204,6 @@ $_def_dvdnav
 
 $_def_vcd
 
-#ifdef __sun
-#define	DEFAULT_CDROM_DEVICE	"/vol/dev/aliases/cdrom0"
-#define DEFAULT_DVD_DEVICE	DEFAULT_CDROM_DEVICE
-#elif defined(__MINGW32__) || defined(__CYGWIN__) || defined(__OS2__)
-#define DEFAULT_CDROM_DEVICE    "D:"
-#define DEFAULT_DVD_DEVICE	DEFAULT_CDROM_DEVICE
-#elif defined(__APPLE__) || defined(__DARWIN__)
-#define DEFAULT_CDROM_DEVICE    "/dev/disk1"
-#define DEFAULT_DVD_DEVICE	"/dev/rdiskN"
-#elif defined(__OpenBSD__)
-#define DEFAULT_CDROM_DEVICE	"/dev/rcd0a"
-#define DEFAULT_DVD_DEVICE	DEFAULT_CDROM_DEVICE
-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-#define DEFAULT_CDROM_DEVICE	"/dev/acd0"
-#define DEFAULT_DVD_DEVICE	DEFAULT_CDROM_DEVICE
-#elif defined(__DragonFly__)
-#define DEFAULT_CDROM_DEVICE	"/dev/cd0"
-#define DEFAULT_DVD_DEVICE	DEFAULT_CDROM_DEVICE
-#elif defined(__AMIGAOS4__)
-#define DEFAULT_CDROM_DEVICE    "a1ide.device:2"
-#define DEFAULT_DVD_DEVICE	DEFAULT_CDROM_DEVICE
-#else
-#define DEFAULT_CDROM_DEVICE    "/dev/cdrom"
-#define DEFAULT_DVD_DEVICE	"/dev/dvd"
-#endif
-
-
 /* define this to use iconv(3) function to codepage conversions */
 $_def_iconv
 

Modified: trunk/stream/stream.h
==============================================================================
--- trunk/stream/stream.h	(original)
+++ trunk/stream/stream.h	Thu Oct 16 20:28:38 2008
@@ -65,6 +65,33 @@
 #define STREAM_CTRL_GET_ANGLE 10
 #define STREAM_CTRL_SET_ANGLE 11
 
+#ifdef __sun
+#define	DEFAULT_CDROM_DEVICE	"/vol/dev/aliases/cdrom0"
+#define DEFAULT_DVD_DEVICE	DEFAULT_CDROM_DEVICE
+#elif defined(__MINGW32__) || defined(__CYGWIN__) || defined(__OS2__)
+#define DEFAULT_CDROM_DEVICE    "D:"
+#define DEFAULT_DVD_DEVICE	DEFAULT_CDROM_DEVICE
+#elif defined(__APPLE__) || defined(__DARWIN__)
+#define DEFAULT_CDROM_DEVICE    "/dev/disk1"
+#define DEFAULT_DVD_DEVICE	"/dev/rdiskN"
+#elif defined(__OpenBSD__)
+#define DEFAULT_CDROM_DEVICE	"/dev/rcd0a"
+#define DEFAULT_DVD_DEVICE	DEFAULT_CDROM_DEVICE
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#define DEFAULT_CDROM_DEVICE	"/dev/acd0"
+#define DEFAULT_DVD_DEVICE	DEFAULT_CDROM_DEVICE
+#elif defined(__DragonFly__)
+#define DEFAULT_CDROM_DEVICE	"/dev/cd0"
+#define DEFAULT_DVD_DEVICE	DEFAULT_CDROM_DEVICE
+#elif defined(__AMIGAOS4__)
+#define DEFAULT_CDROM_DEVICE    "a1ide.device:2"
+#define DEFAULT_DVD_DEVICE	DEFAULT_CDROM_DEVICE
+#else
+#define DEFAULT_CDROM_DEVICE    "/dev/cdrom"
+#define DEFAULT_DVD_DEVICE	"/dev/dvd"
+#endif
+
+
 #ifdef CONFIG_NETWORK
 #include "network.h"
 #endif