*Adaptation to new configuration scheme for dvd, dvdread and spdif

plugins/ac3_spdif/ac3_spdif.c

@@ -2,7 +2,7 @@
  * ac3_spdif.c: ac3 pass-through to external decoder with enabled soundcard
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: ac3_spdif.c,v 1.16 2002/02/24 22:06:50 sam Exp $
+ * $Id: ac3_spdif.c,v 1.17 2002/02/25 18:42:09 stef Exp $
  *
  * Authors: Stphane Borel <stef@via.ecp.fr>
  *          Juha Yrjola <jyrjola@cc.hut.fi>
@@ -69,6 +69,7 @@ void _M( adec_getfunctions )( function_list_t * p_function_list )
  * Build configuration tree.
  *****************************************************************************/
 MODULE_CONFIG_START
+ADD_BOOL( AOUT_SPDIF_VAR, NULL, "enable AC3 pass-through mode", NULL )
 MODULE_CONFIG_STOP
 
 MODULE_INIT_START

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.18 2002/01/07 02:12:29 sam Exp $
+ * $Id: dvd.c,v 1.19 2002/02/25 18:42:09 stef Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -52,6 +52,12 @@ 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

plugins/dvdread/dvdread.c

@@ -2,7 +2,7 @@
  * dvdread.c : DvdRead input module for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: dvdread.c,v 1.8 2002/01/23 03:15:31 stef Exp $
+ * $Id: dvdread.c,v 1.9 2002/02/25 18:42:09 stef Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -38,6 +38,12 @@ 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

src/interface/main.c

@@ -4,7 +4,7 @@
  * and spawn threads.
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: main.c,v 1.153 2002/02/24 20:51:10 gbazin Exp $
+ * $Id: main.c,v 1.154 2002/02/25 18:42:09 stef Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -132,7 +132,6 @@ ADD_BOOL    ( AOUT_NOAUDIO_VAR, NULL, "disable audio", NULL )
 ADD_PLUGIN  ( AOUT_METHOD_VAR, MODULE_CAPABILITY_AOUT, NULL, NULL,
               "audio output method", NULL )
 ADD_BOOL    ( AOUT_MONO_VAR, NULL, "mono audio", NULL )
-ADD_BOOL    ( AOUT_SPDIF_VAR, NULL, "AC3 pass-through mode", NULL )
 ADD_INTEGER ( AOUT_VOLUME_VAR, VOLUME_DEFAULT, NULL, "VLC output volume", NULL)
 ADD_INTEGER ( AOUT_RATE_VAR, 44100, NULL, "VLC output frequency", NULL )
 ADD_INTEGER ( AOUT_DESYNC_VAR, 0, NULL, "Compensate desynchronization of the "
@@ -163,14 +162,10 @@ 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_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_AUDIO_VAR, -1, NULL, "choose audio", 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 */