Qt: remove the no-qt-blingbling option. Use the toolbar editor.

[vlc] / include / vlc_config_cat.h

diff --git a/include/vlc_config_cat.h b/include/vlc_config_cat.h
index 931fc52afcaf56b52e2f859c19cb437de7eab5a7..da5c2c38b956b527d5471c51c8090a597351f63f 100644 (file)
--- a/include/vlc_config_cat.h
+++ b/include/vlc_config_cat.h
@@ -22,12 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#if !defined( __LIBVLC__ )
-  #error You are not libvlc or one of its plugins. You cannot include this file
-#endif
-
-#ifndef _VLC_HELP_H
-#define _VLC_HELP_H 1
+#ifndef VLC_HELP_H
+#define VLC_HELP_H 1
 
 /*
  *  First, we need help strings for the General Settings and for the
@@ -110,9 +106,9 @@
     "Common settings you may want to alter are HTTP proxy or " \
     "caching settings." )
 
-#define ACCESS_FILTER_TITLE N_( "Access filters" )
-#define ACCESS_FILTER_HELP N_( \
-    "Access filters are special modules that allow advanced operations on " \
+#define STREAM_FILTER_TITLE N_( "Stream filters" )
+#define STREAM_FILTER_HELP N_( \
+    "Stream filters are special modules that allow advanced operations on " \
     "the input side of VLC. You should not touch anything here unless you " \
     "know what you are doing." )
 
@@ -239,12 +235,7 @@
 #define UNKNOWN_HELP N_("There is no help available for these modules.")
 
 /* This function is deprecated and is kept only for compatibility */
-static inline char * GetCapabilityHelp( char *psz_capability, int i_type)
-{
-    return " ";
-}
-
-static struct config_category_t categories_array[] =
+static const struct config_category_t categories_array[] =
 {
     /* Interface */
     { CAT_INTERFACE, INTF_TITLE, INTF_HELP },
@@ -269,11 +260,11 @@ static struct config_category_t categories_array[] =
     { CAT_INPUT, INPUT_TITLE, INPUT_HELP },
     { SUBCAT_INPUT_GENERAL, ADVANCED_TITLE, ADVANCED_HELP },
     { SUBCAT_INPUT_ACCESS, ACCESS_TITLE, ACCESS_HELP },
-    { SUBCAT_INPUT_ACCESS_FILTER, ACCESS_FILTER_TITLE, ACCESS_FILTER_HELP },
     { SUBCAT_INPUT_DEMUX, DEMUX_TITLE, DEMUX_HELP },
     { SUBCAT_INPUT_VCODEC, VDEC_TITLE, VDEC_HELP },
     { SUBCAT_INPUT_ACODEC, ADEC_TITLE, ADEC_HELP },
     { SUBCAT_INPUT_SCODEC, SDEC_TITLE, SDEC_HELP },
+    { SUBCAT_INPUT_STREAM_FILTER, STREAM_FILTER_TITLE, STREAM_FILTER_HELP },
 
     { CAT_SOUT, SOUT_TITLE, SOUT_HELP },
     { SUBCAT_SOUT_GENERAL, GENERAL_TITLE, SOUT_GENERAL_HELP },
@@ -295,7 +286,8 @@ static struct config_category_t categories_array[] =
     { -1, NULL, NULL }
 };
 
-static inline char *config_CategoryNameGet( int i_value )
+LIBVLC_USED
+static inline const char *config_CategoryNameGet( int i_value )
 {
     int i = 0 ;
     while( categories_array[i].psz_name != NULL )
@@ -309,7 +301,8 @@ static inline char *config_CategoryNameGet( int i_value )
     return NULL;
 }
 
-static inline char *config_CategoryHelpGet( int i_value )
+LIBVLC_USED
+static inline const char *config_CategoryHelpGet( int i_value )
 {
     int i = 0 ;
     while( categories_array[i].psz_help != NULL )