Set default DVD defice

diff --git a/include/vlc_config.h b/include/vlc_config.h
index 51561cc5e5780ecea3750a891a30cdce65e89567..323b948908d9f101b7570846956b0b221b68815f 100644 (file)
--- a/include/vlc_config.h
+++ b/include/vlc_config.h
@@ -87,12 +87,14 @@
 
 /* DVD and VCD devices */
 #if !defined( WIN32 ) && !defined( UNDER_CE )
-#   define VCD_DEVICE "/dev/cdrom"
-#   define CDAUDIO_DEVICE "/dev/cdrom"
+#   define CD_DEVICE      "dev/cdrom"
+#   define DVD_DEVICE     "/dev/dvd"
 #else
-#   define VCD_DEVICE "D:"
-#   define CDAUDIO_DEVICE "D:"
+#   define CD_DEVICE      "D:"
+#   define DVD_DEVICE     CD_DEVICE
 #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 7d1817093abe1193df26324aeb2f7f1e4a285465..515365dad679fa420e5101b9954708d3c7e7d0da 100644 (file)
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -1613,7 +1613,7 @@ vlc_module_begin();
 
     set_section( N_( "Default devices") , NULL );
 
-    add_file( "dvd", NULL, NULL, DVD_DEV_TEXT, DVD_DEV_LONGTEXT,
+    add_file( "dvd", DVD_DEVICE, NULL, DVD_DEV_TEXT, DVD_DEV_LONGTEXT,
               VLC_FALSE );
     add_file( "vcd", VCD_DEVICE, NULL, VCD_DEV_TEXT, VCD_DEV_LONGTEXT,
               VLC_FALSE );