From: Rémi Denis-Courmont <rem@videolan.org>
Date: Wed, 28 Nov 2007 18:38:36 +0000 (+0000)
Subject: Set default DVD defice
X-Git-Tag: 0.9.0-test0~4332
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=a256154f987e0d19f1a6a6bfb469508942180aac;p=vlc

Set default DVD defice
---

diff --git a/include/vlc_config.h b/include/vlc_config.h
index 51561cc5e5..323b948908 100644
--- 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 7d1817093a..515365dad6 100644
--- 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 );