Add description for demux2 (Closes:#1780)

diff --git a/include/vlc_help.h b/include/vlc_help.h
index d1c94c1c3129f11dc9afbeaa1d9ddd52c325fe14..5a914aa35815849f75cb48ce5bb29dbc93cb3f85 100644 (file)
--- a/include/vlc_help.h
+++ b/include/vlc_help.h
@@ -2,7 +2,7 @@
  * vlc_help.h: Help strings
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: vlc_help.h,v 1.8 2004/02/06 03:52:09 hartman Exp $
+ * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
  *          Anil Daoud <anil@videolan.org>
@@ -73,6 +73,9 @@
 #define DEMUX_TITLE N_("Demuxers settings")
 #define DEMUX_HELP N_( "These settings affect demuxer modules.")
 
+#define DEMUX2_TITLE N_("Demuxers settings (new generation)")
+#define DEMUX2_HELP N_("These settings affect new generation demuxer modules.")
+
 #define INTERFACE_TITLE N_("Interface plugins settings")
 #define INTERFACE_HELP  N_( \
     "Interface plugins can be enabled in the Interface section and " \
@@ -133,6 +136,8 @@ static char * GetCapabilityHelp( char *psz_capability, int i_type)
         return i_type == 1 ? DECODER_TITLE : DECODER_HELP;
     if( !strcasecmp(psz_capability,"demux") )
         return i_type == 1 ? DEMUX_TITLE : DEMUX_HELP;
+    if( !strcasecmp(psz_capability,"demux2") )
+        return i_type == 1 ? DEMUX2_TITLE : DEMUX2_HELP;
     if( !strcasecmp(psz_capability,"interface") )
         return i_type == 1 ? INTERFACE_TITLE : INTERFACE_HELP;
     if( !strcasecmp(psz_capability,"sout access") )

diff --git a/include/vlc_interface.h b/include/vlc_interface.h
index 8ab8aa5f54efa7f99b17edc35b7de77ba1eae3db..fa1c5019a3f41218d2b1855701a58bc982b12888 100644 (file)
--- a/include/vlc_interface.h
+++ b/include/vlc_interface.h
@@ -4,7 +4,7 @@
  * interface, such as message output.
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: vlc_interface.h,v 1.10 2004/03/01 18:31:12 gbazin Exp $
+ * $Id$
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -136,6 +136,7 @@ VLC_EXPORT( void,              intf_Destroy,    ( intf_thread_t * ) );
 #define INTF_DIALOG_SAT         5
 
 #define INTF_DIALOG_STREAMWIZARD 8
+#define INTF_DIALOG_WIZARD 9
 
 #define INTF_DIALOG_PLAYLIST   10
 #define INTF_DIALOG_MESSAGES   11