Mercurial > mplayer.hg

changeset 27753:6c915906bbc6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move DEFAULT_CDROM_DEVICE/DEFAULT_DVD_DEVICE to stream.h where it belongs. config.h should only contain option definitions, no logic.
author diego
date Thu, 16 Oct 2008 18:28:38 +0000
parents bfebea06911d
children 08d18fe9da52
files configure stream/stream.h
diffstat 2 files changed, 27 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Thu Oct 16 18:26:01 2008 +0000
+++ b/configure	Thu Oct 16 18:28:38 2008 +0000
@@ -8204,33 +8204,6 @@
 
 $_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
 
--- a/stream/stream.h	Thu Oct 16 18:26:01 2008 +0000
+++ b/stream/stream.h	Thu Oct 16 18:28:38 2008 +0000
@@ -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