*Reversed my previous configuration change.

I'd better used dvd_title or so but INPUT_TITLE_VAR is also used in
gtk_open.c and I can't find a neat way to prevent this, so I leave this
option in main.c.

diff --git a/plugins/dvd/dvd.c b/plugins/dvd/dvd.c
index 3a060b76d225e59be25ffcfa280dadbd544f2cc3..2e2b857f1f011add352f92c8720f0cd8a913848b 100644 (file)
--- a/plugins/dvd/dvd.c
+++ b/plugins/dvd/dvd.c
@@ -2,7 +2,7 @@
  * dvd.c : DVD input module for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: dvd.c,v 1.19 2002/02/25 18:42:09 stef Exp $
+ * $Id: dvd.c,v 1.20 2002/02/26 01:17:13 stef Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -52,12 +52,6 @@ static void UnprobeLibDVDCSS( void );
  * Build configuration tree.
  *****************************************************************************/
 MODULE_CONFIG_START
-ADD_CATEGORY_HINT( "Play Options", NULL )
-ADD_INTEGER ( INPUT_TITLE_VAR, -1, NULL, "choose title", NULL )
-ADD_INTEGER ( INPUT_CHAPTER_VAR, -1, NULL, "choose chapter", NULL )
-ADD_INTEGER ( INPUT_ANGLE_VAR, -1, NULL, "choose angle", NULL )
-ADD_CATEGORY_HINT( "Misc Options", NULL )
-ADD_STRING  ( INPUT_DVD_DEVICE_VAR, "/dev/dvd", NULL, "DVD device", NULL )
 MODULE_CONFIG_STOP
 
 MODULE_INIT_START

diff --git a/plugins/dvdread/dvdread.c b/plugins/dvdread/dvdread.c
index 18429e9a2bbdadee9a1b003d25b3eb79243993c7..4dfbc4d849b3339161371fa5022a845ea2560ff7 100644 (file)
--- a/plugins/dvdread/dvdread.c
+++ b/plugins/dvdread/dvdread.c
@@ -2,7 +2,7 @@
  * dvdread.c : DvdRead input module for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: dvdread.c,v 1.9 2002/02/25 18:42:09 stef Exp $
+ * $Id: dvdread.c,v 1.10 2002/02/26 01:17:13 stef Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -38,12 +38,6 @@ void _M( input_getfunctions )( function_list_t * p_function_list );
  * Build configuration tree.
  *****************************************************************************/
 MODULE_CONFIG_START
-ADD_CATEGORY_HINT( "Play Options", NULL )
-ADD_INTEGER ( INPUT_TITLE_VAR, -1, NULL, "choose title", NULL )
-ADD_INTEGER ( INPUT_CHAPTER_VAR, -1, NULL, "choose chapter", NULL )
-ADD_INTEGER ( INPUT_ANGLE_VAR, -1, NULL, "choose angle", NULL )
-ADD_CATEGORY_HINT( "Misc Options", NULL )
-ADD_STRING  ( INPUT_DVD_DEVICE_VAR, "/dev/dvd", NULL, "DVD device", NULL )
 MODULE_CONFIG_STOP
 
 MODULE_INIT_START

diff --git a/src/interface/main.c b/src/interface/main.c
index 30b9a80a8265c7d02fc05ff7fa299f9f3c2aa103..d6f89f37bc37ed012351439cdbe8146e0993f9cd 100644 (file)
--- a/src/interface/main.c
+++ b/src/interface/main.c
@@ -4,7 +4,7 @@
  * and spawn threads.
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: main.c,v 1.154 2002/02/25 18:42:09 stef Exp $
+ * $Id: main.c,v 1.155 2002/02/26 01:17:13 stef Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -162,10 +162,14 @@ ADD_STRING  ( INPUT_CHANNEL_SERVER_VAR, "localhost", NULL,
 ADD_INTEGER ( INPUT_CHANNEL_PORT_VAR, 6010, NULL, "channel server port", NULL )
 ADD_STRING  ( INPUT_IFACE_VAR, "eth0", NULL, "network interface", NULL )
 
-ADD_INTEGER ( INPUT_CHANNEL_VAR, -1, NULL, "choose channel", NULL )
+ADD_INTEGER ( INPUT_TITLE_VAR, -1, NULL, "choose title", NULL )
+ADD_INTEGER ( INPUT_CHAPTER_VAR, -1, NULL, "choose chapter", NULL )
+ADD_INTEGER ( INPUT_ANGLE_VAR, -1, NULL, "chosse angle", NULL )
 ADD_INTEGER ( INPUT_AUDIO_VAR, -1, NULL, "choose audio", NULL )
+ADD_INTEGER ( INPUT_CHANNEL_VAR, -1, NULL, "choose channel", NULL )
 ADD_INTEGER ( INPUT_SUBTITLE_VAR, -1, NULL, "choose subtitles", NULL )
 
+ADD_STRING  ( INPUT_DVD_DEVICE_VAR, "/dev/dvd", NULL, "DVD device", NULL )
 ADD_STRING  ( INPUT_VCD_DEVICE_VAR, "/dev/cdrom", NULL, "VCD device", NULL )
 
 /* Decoder options */