From 2241aa2262c92732958fa19f3866a0258cfafc69 Mon Sep 17 00:00:00 2001
From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
Date: Wed, 11 Aug 2010 18:18:51 +0300
Subject: [PATCH] Move disc defaults to libvlc-module.c, fix Windows VCD and CD
 long text

---
 include/vlc_config.h | 16 ----------------
 src/libvlc-module.c  | 40 ++++++++++++++++++++++++++++++----------
 2 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/include/vlc_config.h b/include/vlc_config.h
index 4be010747c..7b284b8e80 100644
--- a/include/vlc_config.h
+++ b/include/vlc_config.h
@@ -78,22 +78,6 @@
  * mark it to be presented */
 #define DEFAULT_PTS_DELAY               (3*CLOCK_FREQ/10)
 
-/* DVD and VCD devices */
-#if !defined( WIN32 ) && !defined( UNDER_CE )
-#if defined(__OpenBSD__)
-#   define CD_DEVICE      "/dev/cd0c"
-#   define DVD_DEVICE     "/dev/cd0c"
-#else
-#   define CD_DEVICE      "/dev/cdrom"
-#   define DVD_DEVICE     "/dev/dvd"
-#endif
-#else
-#   define CD_DEVICE      "D:"
-#   define DVD_DEVICE     NULL
-#endif
-#define VCD_DEVICE        CD_DEVICE
-#define CDAUDIO_DEVICE    CD_DEVICE
-
 /*****************************************************************************
  * Audio configuration
  *****************************************************************************/
diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index ef3fad81df..270b43bda0 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -843,24 +843,44 @@ static const char *const ppsz_clock_descriptions[] =
     "Load this subtitle file. To be used when autodetect cannot detect " \
     "your subtitle file.")
 
+/* DVD and VCD devices */
 #define DVD_DEV_TEXT N_("DVD device")
+#define VCD_DEV_TEXT N_("VCD device")
+#define CDAUDIO_DEV_TEXT N_("Audio CD device")
+
 #ifdef WIN32
-#define DVD_DEV_LONGTEXT N_( \
+# define DVD_DEV_LONGTEXT N_( \
     "This is the default DVD drive (or file) to use. Don't forget the colon " \
-    "after the drive letter (eg. D:)")
+    "after the drive letter (e.g. D:)")
+# define VCD_DEV_LONGTEXT N_( \
+    "This is the default VCD drive (or file) to use. Don't forget the colon " \
+    "after the drive letter (e.g. D:)")
+# define CDAUDIO_DEV_LONGTEXT N_( \
+    "This is the default Audio CD drive (or file) to use. Don't forget the " \
+    "colon after the drive letter (e.g. D:)")
+# define DVD_DEVICE     NULL
+# define CD_DEVICE      "D:"
+
 #else
-#define DVD_DEV_LONGTEXT N_( \
+# define DVD_DEV_LONGTEXT N_( \
     "This is the default DVD device to use.")
-#endif
-
-#define VCD_DEV_TEXT N_("VCD device")
-#define VCD_DEV_LONGTEXT N_( \
+# define VCD_DEV_LONGTEXT N_( \
     "This is the default VCD device to use." )
-
-#define CDAUDIO_DEV_TEXT N_("Audio CD device")
-#define CDAUDIO_DEV_LONGTEXT N_( \
+# define CDAUDIO_DEV_LONGTEXT N_( \
     "This is the default Audio CD device to use." )
 
+# if defined(__OpenBSD__)
+#  define DVD_DEVICE     "/dev/cd0c"
+#  define CD_DEVICE      "/dev/cd0c"
+# else
+#  define DVD_DEVICE     "/dev/dvd"
+#  define CD_DEVICE      "/dev/cdrom"
+# endif
+#endif
+
+#define VCD_DEVICE       CD_DEVICE
+#define CDAUDIO_DEVICE   CD_DEVICE
+
 #define IPV6_TEXT N_("Force IPv6")
 #define IPV6_LONGTEXT N_( \
     "IPv6 will be used by default for all connections.")
-- 
2.39.2