* include/configuration.h: added a new flag to the configuration stucture to

indicate wether it is an "advanced" option or not. The goal with this is to
hide the user from all the strange options that very seldom needs to be
changed. added an extra argument to all the add_* macros to indicate wether
the item is advanced or not.
* src/libvlc.h: added an "show advanced options" config option default
disabled
* src/libvlc.c: the advanced options are not listed by vlc --help and
friends unless --advanced is used
* modules/gtk/preferences.c: the gtk/gnome preferences dialog don't show
advanced options unless advanced is set
all: set the advanced flag to VLC_FALSE or VLC_TRUE for all options, by
using some common sense. Please check and correct

note: All interfaces should still work like they used to, see the change in
modules/gtk/preferences.c to find out how to "hide" options.

second note: I think I've changed all the modules, but I could not test
everyone for compilation, expect some broken modules (the fix is to add ",
VLC_TRUE" as last argument to the add_* I forgot)
parent 2d227502
......@@ -1336,6 +1336,7 @@ then
PLUGINS="${PLUGINS} ipv6"],[AC_MSG_RESULT(no)])
fi
dnl
dnl AVI demux plugin
dnl
......@@ -1753,7 +1754,7 @@ then
LDFLAGS_vorbis="${LDFLAGS_vorbis} -lvorbis -logg"
],[])
fi
dnl
dnl Tremor plugin
dnl
......
......@@ -4,7 +4,7 @@
* It includes functions allowing to declare, get or set configuration options.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: configuration.h,v 1.23 2003/01/06 00:37:29 garf Exp $
* $Id: configuration.h,v 1.24 2003/02/20 01:52:45 sigmunau Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -69,7 +69,7 @@ struct module_config_t
vlc_mutex_t *p_lock; /* Lock to use when modifying the config */
vlc_bool_t b_dirty; /* Dirty flag to indicate a config change */
vlc_bool_t b_advanced; /* Flag to indicate an advanced option */
};
/*****************************************************************************
......@@ -119,8 +119,8 @@ VLC_EXPORT( void, config_UnsetCallbacks, ( module_config_t * ) );
* allow for a more user friendly interface.
*****************************************************************************/
#define add_category_hint( text, longtext ) \
{ static module_config_t tmp = { CONFIG_HINT_CATEGORY, NULL, NULL, '\0', text, longtext }; p_config[ i_config ] = tmp; } i_config++
#define add_category_hint( text, longtext, advc ) \
{ static module_config_t tmp = { CONFIG_HINT_CATEGORY, NULL, NULL, '\0', text, longtext }; p_config[ i_config ] = tmp; p_config[i_config].b_advanced = advc; } i_config++
#define add_subcategory_hint( text, longtext ) \
{ static module_config_t tmp = { CONFIG_HINT_SUBCATEGORY, NULL, NULL, '\0', text, longtext }; p_config[ i_config ] = tmp; } i_config++
#define end_subcategory_hint \
......@@ -128,38 +128,38 @@ VLC_EXPORT( void, config_UnsetCallbacks, ( module_config_t * ) );
#define add_usage_hint( text ) \
{ static module_config_t tmp = { CONFIG_HINT_USAGE, NULL, NULL, '\0', text }; p_config[ i_config ] = tmp; } i_config++
#define add_string( name, psz_value, p_callback, text, longtext ) \
{ static module_config_t tmp = { CONFIG_ITEM_STRING, NULL, name, '\0', text, longtext, psz_value }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; } i_config++
#define add_string( name, psz_value, p_callback, text, longtext, advc ) \
{ static module_config_t tmp = { CONFIG_ITEM_STRING, NULL, name, '\0', text, longtext, psz_value }; tmp.b_advanced = advc; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; } i_config++
#define add_string_from_list( name, psz_value, ppsz_list, p_callback, text, \
longtext ) \
{ static module_config_t tmp = { CONFIG_ITEM_STRING, NULL, name, '\0', text, longtext, psz_value, 0, 0, 0, 0, 0, 0, NULL, ppsz_list }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; } i_config++
#define add_file( name, psz_value, p_callback, text, longtext ) \
{ static module_config_t tmp = { CONFIG_ITEM_FILE, NULL, name, '\0', text, longtext, psz_value, 0, 0 }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; } i_config++
#define add_module( name, psz_caps, psz_value, p_callback, text, longtext ) \
{ static module_config_t tmp = { CONFIG_ITEM_MODULE, psz_caps, name, '\0', text, longtext, psz_value }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; } i_config++
#define add_integer( name, i_value, p_callback, text, longtext ) \
{ static module_config_t tmp = { CONFIG_ITEM_INTEGER, NULL, name, '\0', text, longtext, NULL, i_value }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; } i_config++
#define add_integer_with_range( name, i_value, i_min, i_max, p_callback, text, longtext ) \
{ static module_config_t tmp = { CONFIG_ITEM_INTEGER, NULL, name, '\0', text, longtext, NULL, i_value, 0, i_min, i_max }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; } i_config++
#define add_float( name, f_value, p_callback, text, longtext ) \
{ static module_config_t tmp = { CONFIG_ITEM_FLOAT, NULL, name, '\0', text, longtext, NULL, 0, f_value }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; } i_config++
#define add_float_with_range( name, f_value, f_min, f_max, p_callback, text, longtext ) \
{ static module_config_t tmp = { CONFIG_ITEM_FLOAT, NULL, name, '\0', text, longtext, NULL, 0, f_value, 0, 0, f_min, f_max }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; } i_config++
#define add_bool( name, b_value, p_callback, text, longtext ) \
{ static module_config_t tmp = { CONFIG_ITEM_BOOL, NULL, name, '\0', text, longtext, NULL, b_value }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; } i_config++
longtext, advc ) \
{ static module_config_t tmp = { CONFIG_ITEM_STRING, NULL, name, '\0', text, longtext, psz_value, 0, 0, 0, 0, 0, 0, NULL, ppsz_list }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; p_config[i_config].b_advanced = advc; } i_config++
#define add_file( name, psz_value, p_callback, text, longtext, advc ) \
{ static module_config_t tmp = { CONFIG_ITEM_FILE, NULL, name, '\0', text, longtext, psz_value, 0, 0 }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; p_config[i_config].b_advanced = advc; } i_config++
#define add_module( name, psz_caps, psz_value, p_callback, text, longtext, advc ) \
{ static module_config_t tmp = { CONFIG_ITEM_MODULE, psz_caps, name, '\0', text, longtext, psz_value }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; p_config[i_config].b_advanced = advc; } i_config++
#define add_integer( name, i_value, p_callback, text, longtext, advc ) \
{ static module_config_t tmp = { CONFIG_ITEM_INTEGER, NULL, name, '\0', text, longtext, NULL, i_value }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; p_config[i_config].b_advanced = advc; } i_config++
#define add_integer_with_range( name, i_value, i_min, i_max, p_callback, text, longtext, advc ) \
{ static module_config_t tmp = { CONFIG_ITEM_INTEGER, NULL, name, '\0', text, longtext, NULL, i_value, 0, i_min, i_max }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; p_config[i_config].b_advanced = advc; } i_config++
#define add_float( name, f_value, p_callback, text, longtext, advc ) \
{ static module_config_t tmp = { CONFIG_ITEM_FLOAT, NULL, name, '\0', text, longtext, NULL, 0, f_value }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; p_config[i_config].b_advanced = advc; } i_config++
#define add_float_with_range( name, f_value, f_min, f_max, p_callback, text, longtext, advc ) \
{ static module_config_t tmp = { CONFIG_ITEM_FLOAT, NULL, name, '\0', text, longtext, NULL, 0, f_value, 0, 0, f_min, f_max }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; p_config[i_config].b_advanced = advc; } i_config++
#define add_bool( name, b_value, p_callback, text, longtext, advc ) \
{ static module_config_t tmp = { CONFIG_ITEM_BOOL, NULL, name, '\0', text, longtext, NULL, b_value }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; p_config[i_config].b_advanced = advc; } i_config++
/* These should be seldom used. They were added just to provide easy shortcuts
* for the command line interface */
#define add_string_with_short( name, ch, psz_value, p_callback, text, ltext ) \
{ static module_config_t tmp = { CONFIG_ITEM_STRING, NULL, name, ch, text, ltext, psz_value }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; } i_config++
#define add_file_with_short( name, ch, psz_value, p_callback, text, ltext ) \
{ static module_config_t tmp = { CONFIG_ITEM_FILE, NULL, name, ch, text, ltext, psz_value }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; } i_config++
#define add_string_with_short( name, ch, psz_value, p_callback, text, ltext, advc ) \
{ static module_config_t tmp = { CONFIG_ITEM_STRING, NULL, name, ch, text, ltext, psz_value }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; p_config[i_config].b_advanced = advc; } i_config++
#define add_file_with_short( name, ch, psz_value, p_callback, text, ltext, advc ) \
{ static module_config_t tmp = { CONFIG_ITEM_FILE, NULL, name, ch, text, ltext, psz_value }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; p_config[i_config].b_advanced = advc; } i_config++
#define add_module_with_short( name, ch, psz_caps, psz_value, p_callback, \
text, ltext) \
{ static module_config_t tmp = { CONFIG_ITEM_MODULE, psz_caps, name, ch, text, ltext, psz_value }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; } i_config++
#define add_integer_with_short( name, ch, i_value, p_callback, text, ltext ) \
{ static module_config_t tmp = { CONFIG_ITEM_INTEGER, NULL, name, ch, text, ltext, NULL, i_value }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; } i_config++
#define add_float_with_short( name, ch, f_value, p_callback, text, ltext ) \
{ static module_config_t tmp = { CONFIG_ITEM_FLOAT, NULL, name, ch, text, ltext, NULL, 0, f_value }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; } i_config++
#define add_bool_with_short( name, ch, b_value, p_callback, text, ltext ) \
{ static module_config_t tmp = { CONFIG_ITEM_BOOL, NULL, name, ch, text, ltext, NULL, b_value }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; } i_config++
text, ltext, advc) \
{ static module_config_t tmp = { CONFIG_ITEM_MODULE, psz_caps, name, ch, text, ltext, psz_value }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; p_config[i_config].b_advanced = advc; } i_config++
#define add_integer_with_short( name, ch, i_value, p_callback, text, ltext, advc ) \
{ static module_config_t tmp = { CONFIG_ITEM_INTEGER, NULL, name, ch, text, ltext, NULL, i_value }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; p_config[i_config].b_advanced = advc; } i_config++
#define add_float_with_short( name, ch, f_value, p_callback, text, ltext, advc ) \
{ static module_config_t tmp = { CONFIG_ITEM_FLOAT, NULL, name, ch, text, ltext, NULL, 0, f_value }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; p_config[i_config].b_advanced = advc;} i_config++
#define add_bool_with_short( name, ch, b_value, p_callback, text, ltext, advc ) \
{ static module_config_t tmp = { CONFIG_ITEM_BOOL, NULL, name, ch, text, ltext, NULL, b_value }; p_config[ i_config ] = tmp; p_config[ i_config ].pf_callback = p_callback; p_config[i_config].b_advanced = advc;} i_config++
......@@ -2,7 +2,7 @@
* dvd.c : DVD input module for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: dvd.c,v 1.4 2003/01/28 22:03:21 sam Exp $
* $Id: dvd.c,v 1.5 2003/02/20 01:52:45 sigmunau Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -83,9 +83,10 @@ static char *cssmethod_list[] = { "title", "disc", "key", NULL };
vlc_module_begin();
int i;
add_category_hint( N_("[dvd:][device][@raw_device][@[title][,[chapter][,angle]]]"), NULL );
add_usage_hint( N_("[dvd:][device][@raw_device][@[title][,[chapter][,angle]]]") );
add_category_hint( N_("dvd"), NULL, VLC_TRUE );
add_string_from_list( "dvdcss-method", NULL, cssmethod_list, NULL,
CSSMETHOD_TEXT, CSSMETHOD_LONGTEXT );
CSSMETHOD_TEXT, CSSMETHOD_LONGTEXT, VLC_TRUE );
#ifdef GOD_DAMN_DMCA
set_description( _("DVD input module, uses libdvdcss if installed") );
i = 90;
......
......@@ -7,7 +7,7 @@
*****************************************************************************
*
* Copyright (C) 2001 VideoLAN
* $Id: dvd.c,v 1.1 2002/08/04 17:23:42 sam Exp $
* $Id: dvd.c,v 1.2 2003/02/20 01:52:45 sigmunau Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -48,7 +48,8 @@ void E_(CloseIntf) ( vlc_object_t * );
* Module descriptor
*****************************************************************************/
vlc_module_begin();
add_category_hint( "[dvdplay:][device][@[title][,[chapter][,angle]]]", NULL );
add_usage_hint( "[dvdplay:][device][@[title][,[chapter][,angle]]]" );
add_category_hint( "dvd", NULL, VLC_TRUE );
set_description( "dvdplay input module" );
add_submodule();
set_capability( "access", 120 );
......
......@@ -2,7 +2,7 @@
* dvdread.c : DvdRead input module for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: dvdread.c,v 1.3 2003/01/23 09:58:02 sam Exp $
* $Id: dvdread.c,v 1.4 2003/02/20 01:52:45 sigmunau Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -42,7 +42,7 @@ void E_(EndDVD) ( vlc_object_t * );
* Module descriptor
*****************************************************************************/
vlc_module_begin();
add_category_hint( "[dvdread:][device][@[title][,[chapter][,angle]]]", NULL );
add_category_hint( "[dvdread:][device][@[title][,[chapter][,angle]]]", NULL, VLC_TRUE );
set_description( _("DVDRead input module") );
add_submodule();
set_capability( "access", 110 );
......
......@@ -2,7 +2,7 @@
* file.c: file input (file: access plug-in)
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: file.c,v 1.10 2003/02/08 22:20:28 massiot Exp $
* $Id: file.c,v 1.11 2003/02/20 01:52:45 sigmunau Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -67,8 +67,8 @@ static ssize_t Read ( input_thread_t *, byte_t *, size_t );
vlc_module_begin();
set_description( _("Standard filesystem file reading") );
add_category_hint( N_("file"), NULL );
add_integer( "file-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT );
add_category_hint( N_("file"), NULL, VLC_TRUE );
add_integer( "file-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
set_capability( "access", 50 );
add_shortcut( "file" );
add_shortcut( "stream" );
......
......@@ -2,7 +2,7 @@
* ftp.c:
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: ftp.c,v 1.7 2003/02/07 23:36:55 marcari Exp $
* $Id: ftp.c,v 1.8 2003/02/20 01:52:45 sigmunau Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
......@@ -94,12 +94,12 @@ static int ftp_StopStream ( input_thread_t *);
vlc_module_begin();
set_description( _("ftp access module") );
set_capability( "access", 0 );
add_category_hint( "stream", NULL );
add_category_hint( "stream", NULL, VLC_FALSE );
add_integer( "ftp-caching", 2 * DEFAULT_PTS_DELAY / 1000, NULL,
CACHING_TEXT, CACHING_LONGTEXT );
add_string( "ftp-user", "anonymous", NULL, "ftp user name", "ftp user name" );
add_string( "ftp-pwd", "anonymous@dummy.org", NULL, "ftp password", "ftp password, be careful with that option..." );
add_string( "ftp-account", "anonymous", NULL, "ftp account", "ftp account" );
CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
add_string( "ftp-user", "anonymous", NULL, "ftp user name", "ftp user name", VLC_FALSE );
add_string( "ftp-pwd", "anonymous@dummy.org", NULL, "ftp password", "ftp password, be careful with that option...", VLC_FALSE );
add_string( "ftp-account", "anonymous", NULL, "ftp account", "ftp account", VLC_FALSE );
add_shortcut( "ftp" );
set_callbacks( Open, Close );
vlc_module_end();
......
......@@ -2,7 +2,7 @@
* http.c: HTTP access plug-in
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: http.c,v 1.23 2003/02/08 19:10:20 massiot Exp $
* $Id: http.c,v 1.24 2003/02/20 01:52:45 sigmunau Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -87,9 +87,9 @@ static ssize_t Read ( input_thread_t *, byte_t *, size_t );
"value should be set in miliseconds units." )
vlc_module_begin();
add_category_hint( N_("http"), NULL );
add_string( "http-proxy", NULL, NULL, PROXY_TEXT, PROXY_LONGTEXT );
add_integer( "http-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT );
add_category_hint( N_("http"), NULL, VLC_FALSE );
add_string( "http-proxy", NULL, NULL, PROXY_TEXT, PROXY_LONGTEXT, VLC_FALSE );
add_integer( "http-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
set_description( _("HTTP access module") );
set_capability( "access", 0 );
add_shortcut( "http" );
......
......@@ -2,7 +2,7 @@
* mms.c: MMS access plug-in
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: mms.c,v 1.18 2003/02/07 23:36:55 marcari Exp $
* $Id: mms.c,v 1.19 2003/02/20 01:52:45 sigmunau Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
......@@ -134,20 +134,20 @@ static void mms_ParseURL( url_t *p_url, char *psz_url );
vlc_module_begin();
set_description( _("MMS access module") );
set_capability( "access", 0 );
add_category_hint( "stream", NULL );
add_category_hint( "stream", NULL, VLC_TRUE );
add_integer( "mms-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL,
CACHING_TEXT, CACHING_LONGTEXT );
CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
add_bool( "mms-all", 0, NULL,
"force selection of all streams",
"force selection of all streams" );
"force selection of all streams", VLC_TRUE );
add_string( "mms-stream", NULL, NULL,
"streams selection",
"force this stream selection" );
"force this stream selection", VLC_TRUE );
add_integer( "mms-maxbitrate", 0, NULL,
"max bitrate",
"set max bitrate for auto streams selections" );
"set max bitrate for auto streams selections", VLC_FALSE );
add_shortcut( "mms" );
add_shortcut( "mmsu" );
add_shortcut( "mmst" );
......
......@@ -63,18 +63,21 @@ void E_(Close) ( vlc_object_t * );
#define LNB_SLOF_LONGTEXT ""
vlc_module_begin();
add_category_hint( N_("Input"), NULL );
add_integer( "frequency", 11954, NULL, FREQ_TEXT, FREQ_LONGTEXT );
add_integer( "polarization", 0, NULL, POL_TEXT, POL_LONGTEXT );
add_integer( "fec", 3, NULL, FEC_TEXT, FEC_LONGTEXT );
add_integer( "symbol-rate", 27500, NULL, SRATE_TEXT, SRATE_LONGTEXT );
add_bool( "diseqc", 0, NULL, DISEQC_TEXT, DISEQC_LONGTEXT );
add_category_hint( N_("Input"), NULL, VLC_FALSE );
add_integer( "frequency", 11954, NULL, FREQ_TEXT, FREQ_LONGTEXT,
VLC_FALSE );
add_integer( "polarization", 0, NULL, POL_TEXT, POL_LONGTEXT,
VLC_FALSE );
add_integer( "fec", 3, NULL, FEC_TEXT, FEC_LONGTEXT, VLC_FALSE );
add_integer( "symbol-rate", 27500, NULL, SRATE_TEXT, SRATE_LONGTEXT,
VLC_FALSE );
add_bool( "diseqc", 0, NULL, DISEQC_TEXT, DISEQC_LONGTEXT, VLC_FALSE );
add_integer( "lnb-lof1", 10000, NULL,
LNB_LOF1_TEXT, LNB_LOF1_LONGTEXT );
LNB_LOF1_TEXT, LNB_LOF1_LONGTEXT, VLC_FALSE );
add_integer( "lnb-lof2", 10000, NULL,
LNB_LOF2_TEXT, LNB_LOF2_LONGTEXT );
LNB_LOF2_TEXT, LNB_LOF2_LONGTEXT, VLC_FALSE );
add_integer( "lnb-slof", 11700, NULL,
LNB_SLOF_TEXT, LNB_SLOF_LONGTEXT );
LNB_SLOF_TEXT, LNB_SLOF_LONGTEXT, VLC_FALSE );
set_description( _("satellite input module") );
set_capability( "access", 0 );
add_shortcut( "sat" );
......
......@@ -2,7 +2,7 @@
* slp.c: SLP access plugin
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: slp.c,v 1.7 2003/01/22 16:16:27 lool Exp $
* $Id: slp.c,v 1.8 2003/02/20 01:52:45 sigmunau Exp $
*
* Authors: Loc Minier <lool@videolan.org>
*
......@@ -76,14 +76,14 @@ static int Demux ( input_thread_t * );
vlc_module_begin();
set_description( _("SLP access module") );
add_category_hint( N_("slp"), NULL );
add_string( "slp-attrids", "", NULL, ATTRIDS_TEXT, ATTRIDS_LONGTEXT );
add_category_hint( N_("slp"), NULL, VLC_TRUE );
add_string( "slp-attrids", "", NULL, ATTRIDS_TEXT, ATTRIDS_LONGTEXT, VLC_TRUE );
add_string( "slp-scopelist", "", NULL, SCOPELIST_TEXT,
SCOPELIST_LONGTEXT );
SCOPELIST_LONGTEXT, VLC_TRUE );
add_string( "slp-namingauthority", "*", NULL, NAMINGAUTHORITY_TEXT,
NAMINGAUTHORITY_LONGTEXT );
add_string( "slp-filter", "", NULL, FILTER_TEXT, FILTER_LONGTEXT );
add_string( "slp-lang", "", NULL, LANG_TEXT, LANG_LONGTEXT );
NAMINGAUTHORITY_LONGTEXT, VLC_TRUE );
add_string( "slp-filter", "", NULL, FILTER_TEXT, FILTER_LONGTEXT, VLC_TRUE );
add_string( "slp-lang", "", NULL, LANG_TEXT, LANG_LONGTEXT, VLC_TRUE );
add_submodule();
set_capability( "access", 0 );
set_callbacks( Open, Close );
......
......@@ -2,7 +2,7 @@
* udp.c: raw UDP & RTP access plug-in
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: udp.c,v 1.13 2003/02/12 13:42:43 massiot Exp $
* $Id: udp.c,v 1.14 2003/02/20 01:52:45 sigmunau Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Tristan Leteurtre <tooney@via.ecp.fr>
......@@ -79,8 +79,8 @@ static ssize_t RTPChoose( input_thread_t *, byte_t *, size_t );
vlc_module_begin();
set_description( _("raw UDP access module") );
add_category_hint( N_("udp"), NULL );
add_integer( "udp-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT );
add_category_hint( N_("udp"), NULL , VLC_TRUE );
add_integer( "udp-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
set_capability( "access", 0 );
add_shortcut( "udp" );
add_shortcut( "udpstream" );
......
......@@ -4,7 +4,7 @@
* (http://liba52.sf.net/).
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: a52tofloat32.c,v 1.12 2003/01/22 18:31:47 massiot Exp $
* $Id: a52tofloat32.c,v 1.13 2003/02/20 01:52:45 sigmunau Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
* Christophe Massiot <massiot@via.ecp.fr>
......@@ -82,8 +82,8 @@ struct aout_filter_sys_t
"listening room.")
vlc_module_begin();
add_category_hint( N_("Miscellaneous"), NULL );
add_bool( "a52-dynrng", 1, NULL, DYNRNG_TEXT, DYNRNG_LONGTEXT );
add_category_hint( N_("Miscellaneous"), NULL, VLC_FALSE );
add_bool( "a52-dynrng", 1, NULL, DYNRNG_TEXT, DYNRNG_LONGTEXT, VLC_FALSE );
set_description( _("ATSC A/52 aka AC-3 audio decoder module") );
set_capability( "audio filter", 100 );
set_callbacks( Create, Destroy );
......
......@@ -3,7 +3,7 @@
* using MAD (MPEG Audio Decoder)
*****************************************************************************
* Copyright (C) 2001 by Jean-Paul Saman
* $Id: mpgatofixed32.c,v 1.3 2003/01/20 17:52:26 massiot Exp $
* $Id: mpgatofixed32.c,v 1.4 2003/02/20 01:52:45 sigmunau Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Jean-Paul Saman <jpsaman@wxs.nl>
......@@ -57,7 +57,7 @@ struct aout_filter_sys_t
* Module descriptor
*****************************************************************************/
vlc_module_begin();
add_category_hint( N_("Miscellaneous"), NULL );
add_category_hint( N_("Miscellaneous"), NULL, VLC_TRUE );
set_description( _("MPEG audio decoder module") );
set_capability( "audio filter", 100 );
set_callbacks( Create, Destroy );
......
......@@ -2,7 +2,7 @@
* alsa.c : alsa plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: alsa.c,v 1.22 2003/02/10 17:43:21 massiot Exp $
* $Id: alsa.c,v 1.23 2003/02/20 01:52:45 sigmunau Exp $
*
* Authors: Henri Fallon <henri@videolan.org> - Original Author
* Jeffrey Baker <jwbaker@acm.org> - Port to ALSA 1.0 API
......@@ -94,10 +94,10 @@ static void ALSAFill ( aout_instance_t * );
"and permanently selects analog PCM output." )
vlc_module_begin();
add_category_hint( N_("ALSA"), NULL );
add_category_hint( N_("ALSA"), NULL, VLC_FALSE );
add_string( "alsadev", DEFAULT_ALSA_DEVICE, aout_FindAndRestart,
N_("ALSA device name"), NULL );
add_bool( "spdif", 1, NULL, SPDIF_TEXT, SPDIF_LONGTEXT );
N_("ALSA device name"), NULL, VLC_FALSE );
add_bool( "spdif", 1, NULL, SPDIF_TEXT, SPDIF_LONGTEXT, VLC_FALSE );
set_description( _("ALSA audio module") );
set_capability( "audio output", 50 );
set_callbacks( Open, Close );
......
......@@ -2,7 +2,7 @@
* file.c : audio output which writes the samples to a file
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: file.c,v 1.15 2003/02/08 19:10:20 massiot Exp $
* $Id: file.c,v 1.16 2003/02/20 01:52:45 sigmunau Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com>
......@@ -105,12 +105,12 @@ static int format_int[] = { VLC_FOURCC('u','8',' ',' '),
#define PATH_LONGTEXT N_("By default samples.raw")
vlc_module_begin();
add_category_hint( N_("Audio"), NULL );
add_category_hint( N_("Audio"), NULL, VLC_FALSE );
add_string_from_list( "audiofile-format", "s16", format_list, NULL,
FORMAT_TEXT, FORMAT_LONGTEXT );
FORMAT_TEXT, FORMAT_LONGTEXT, VLC_TRUE );
add_string( "audiofile-path", "audiofile.wav", NULL, PATH_TEXT,
PATH_LONGTEXT );
add_bool( "audiofile-wav", 1, NULL, WAV_TEXT, WAV_LONGTEXT );
PATH_LONGTEXT, VLC_FALSE );
add_bool( "audiofile-wav", 1, NULL, WAV_TEXT, WAV_LONGTEXT, VLC_TRUE );
set_description( _("file audio output module") );
set_capability( "audio output", 0 );
add_shortcut( "file" );
......
......@@ -2,7 +2,7 @@
* oss.c : OSS /dev/dsp module for vlc
*****************************************************************************
* Copyright (C) 2000-2002 VideoLAN
* $Id: oss.c,v 1.51 2003/02/10 17:43:21 massiot Exp $
* $Id: oss.c,v 1.52 2003/02/20 01:52:45 sigmunau Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -112,11 +112,11 @@ static mtime_t BufferDuration( aout_instance_t * p_aout );
"and permanently selects analog PCM output." )
vlc_module_begin();
add_category_hint( N_("OSS"), NULL );
add_category_hint( N_("OSS"), NULL, VLC_FALSE );
add_file( "dspdev", "/dev/dsp", aout_FindAndRestart,
N_("OSS dsp device"), NULL );
add_bool( "oss-buggy", 0, NULL, BUGGY_TEXT, BUGGY_LONGTEXT );
add_bool( "spdif", 1, NULL, SPDIF_TEXT, SPDIF_LONGTEXT );
N_("OSS dsp device"), NULL, VLC_FALSE );
add_bool( "oss-buggy", 0, NULL, BUGGY_TEXT, BUGGY_LONGTEXT, VLC_TRUE );
add_bool( "spdif", 1, NULL, SPDIF_TEXT, SPDIF_LONGTEXT, VLC_FALSE );
set_description( _("Linux OSS /dev/dsp module") );
set_capability( "audio output", 100 );
add_shortcut( "oss" );
......
......@@ -2,7 +2,7 @@
* a52old.c: A52 decoder module main file
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: a52old.c,v 1.8 2002/10/27 16:58:14 gbazin Exp $
* $Id: a52old.c,v 1.9 2003/02/20 01:52:45 sigmunau Exp $
*
* Authors: Michel Lespinasse <walken@zoy.org>
*
......@@ -56,11 +56,11 @@ static void BitstreamCallback ( bit_stream_t *, vlc_bool_t );
* Module descriptor
*****************************************************************************/
vlc_module_begin();
add_category_hint( N_("Miscellaneous"), NULL );
add_category_hint( N_("Miscellaneous"), NULL, VLC_TRUE );
add_module ( "a52-downmix", "downmix", NULL, NULL,
N_("A52 downmix module"), NULL );
N_("A52 downmix module"), NULL, VLC_TRUE );
add_module ( "a52-imdct", "imdct", NULL, NULL,
N_("A52 IMDCT module"), NULL );
N_("A52 IMDCT module"), NULL, VLC_TRUE );
set_description( _("software A52 decoder") );
set_capability( "decoder", 50 );
set_callbacks( OpenDecoder, NULL );
......
......@@ -2,7 +2,7 @@
* ffmpeg.c: video decoder using ffmpeg library
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: ffmpeg.c,v 1.24 2003/02/18 19:42:57 gbazin Exp $
* $Id: ffmpeg.c,v 1.25 2003/02/20 01:52:46 sigmunau Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
......@@ -96,45 +96,45 @@ static int ffmpeg_GetFfmpegCodec( vlc_fourcc_t, int *, int *, char ** );
"64 Qpel chroma"
vlc_module_begin();
add_category_hint( N_("ffmpeg"), NULL );
add_category_hint( N_("ffmpeg"), NULL, VLC_FALSE );
#if LIBAVCODEC_BUILD >= 4615
add_bool( "ffmpeg-dr", 0, NULL,
"direct rendering",
"direct rendering" );
"direct rendering", VLC_TRUE );
#endif
#if LIBAVCODEC_BUILD >= 4611
add_integer ( "ffmpeg-error-resilience", -1, NULL,
"error resilience", ERROR_RESILIENCE_LONGTEXT );
"error resilience", ERROR_RESILIENCE_LONGTEXT, VLC_TRUE );
add_integer ( "ffmpeg-workaround-bugs", 1, NULL,
"workaround bugs", WORKAROUND_BUGS_LONGTEXT );
"workaround bugs", WORKAROUND_BUGS_LONGTEXT, VLC_FALSE );
#endif
add_bool( "ffmpeg-hurry-up", 0, NULL, "hurry up", HURRY_UP_LONGTEXT );
add_bool( "ffmpeg-hurry-up", 0, NULL, "hurry up", HURRY_UP_LONGTEXT, VLC_FALSE );
add_category_hint( N_("Post processing"), NULL );
add_category_hint( N_("Post processing"), NULL, VLC_FALSE );
add_module( "ffmpeg-pp", "postprocessing",NULL, NULL,
N_( "ffmpeg postprocessing module" ), NULL );
N_( "ffmpeg postprocessing module" ), NULL, VLC_FALSE );
add_integer( "ffmpeg-pp-q", 0, NULL,
"post processing quality", POSTPROCESSING_Q_LONGTEXT );
"post processing quality", POSTPROCESSING_Q_LONGTEXT, VLC_FALSE );
add_bool( "ffmpeg-pp-auto", 0, NULL,
"auto-level Post processing quality", POSTPROCESSING_AQ_LONGTEXT );
"auto-level Post processing quality", POSTPROCESSING_AQ_LONGTEXT, VLC_FALSE );
add_bool( "ffmpeg-db-yv", 0, NULL,
"force vertical luminance deblocking",
"force vertical luminance deblocking (override other settings)" );
"force vertical luminance deblocking (override other settings)", VLC_TRUE );
add_bool( "ffmpeg-db-yh", 0, NULL,
"force horizontal luminance deblocking",
"force horizontal luminance deblocking (override other settings)" );
"force horizontal luminance deblocking (override other settings)", VLC_TRUE );
add_bool( "ffmpeg-db-cv", 0, NULL,
"force vertical chrominance deblocking",
"force vertical chrominance deblocking (override other settings)" );
"force vertical chrominance deblocking (override other settings)", VLC_TRUE );
add_bool( "ffmpeg-db-ch", 0, NULL,
"force horizontal chrominance deblocking",
"force horizontal chrominance deblocking (override other settings) " );
"force horizontal chrominance deblocking (override other settings) ", VLC_TRUE );
add_bool( "ffmpeg-dr-y", 0, NULL,
"force luminance deringing",
"force luminance deringing (override other settings)" );
"force luminance deringing (override other settings)", VLC_TRUE );
add_bool( "ffmpeg-dr-c", 0, NULL,
"force chrominance deringing",
"force chrominance deringing (override other settings)" );
"force chrominance deringing (override other settings)", VLC_TRUE );
set_description( _("ffmpeg audio/video decoder((MS)MPEG4,SVQ1,H263,WMV,WMA)") );
set_capability( "decoder", 70 );
......
......@@ -2,7 +2,7 @@
* video_parser.c : video parser thread
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: parser.c,v 1.10 2003/02/08 20:32:43 massiot Exp $
* $Id: parser.c,v 1.11 2003/02/20 01:52:46 sigmunau Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Samuel Hocevar <sam@via.ecp.fr>
......@@ -81,14 +81,14 @@ static void BitstreamCallback ( bit_stream_t *, vlc_bool_t );
"you won't get anything.")
vlc_module_begin();
add_category_hint( N_("Miscellaneous"), NULL );
add_category_hint( N_("Miscellaneous"), NULL, VLC_TRUE );
add_module ( "mpeg-idct", "idct", NULL, NULL,
VDEC_IDCT_TEXT, VDEC_IDCT_LONGTEXT );
VDEC_IDCT_TEXT, VDEC_IDCT_LONGTEXT, VLC_TRUE );
add_module ( "mpeg-motion", "motion compensation", NULL, NULL,
VDEC_MOTION_TEXT, VDEC_MOTION_LONGTEXT );
add_integer ( "vdec-smp", 0, NULL, VDEC_SMP_TEXT, VDEC_SMP_LONGTEXT );
VDEC_MOTION_TEXT, VDEC_MOTION_LONGTEXT, VLC_TRUE );
add_integer ( "vdec-smp", 0, NULL, VDEC_SMP_TEXT, VDEC_SMP_LONGTEXT, VLC_TRUE );
add_string ( "vpar-synchro", NULL, NULL, VPAR_SYNCHRO_TEXT,
VPAR_SYNCHRO_LONGTEXT );
VPAR_SYNCHRO_LONGTEXT, VLC_TRUE );
set_description( _("MPEG I/II video decoder module") );
set_capability( "decoder", 50 );
set_callbacks( OpenDecoder, NULL );
......
......@@ -2,7 +2,7 @@
* spudec.c : SPU decoder thread
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: spudec.c,v 1.15 2003/02/17 05:50:31 sam Exp $
* $Id: spudec.c,v 1.16 2003/02/20 01:52:46 sigmunau Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -53,14 +53,14 @@ static vout_thread_t *FindVout( spudec_thread_t * );
#define DEFAULT_FONT "font-eutopiabold36.rle"
vlc_module_begin();
add_category_hint( N_("subtitles"), NULL );
add_category_hint( N_("subtitles"), NULL, VLC_TRUE );
#if defined(SYS_DARWIN) || defined(SYS_BEOS) \
|| (defined(WIN32) && !defined(UNDER_CE))
add_file( "spudec-font", NULL, NULL,
FONT_TEXT, FONT_LONGTEXT );
FONT_TEXT, FONT_LONGTEXT, VLC_TRUE );
#else
add_file( "spudec-font", "share/" DEFAULT_FONT, NULL,
FONT_TEXT, FONT_LONGTEXT );
FONT_TEXT, FONT_LONGTEXT, VLC_TRUE );
#endif
set_description( _("subtitles decoder module") );
set_capability( "decoder", 50 );
......
......@@ -2,7 +2,7 @@
* xvid.c: a decoder for libxvidcore, the Xvid video codec
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: xvid.c,v 1.4 2003/01/07 21:49:01 fenrir Exp $
* $Id: xvid.c,v 1.5 2003/02/20 01:52:45 sigmunau Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -49,7 +49,7 @@ vlc_module_begin();
set_capability( "decoder", 50 );
set_callbacks( OpenDecoder, NULL );
add_bool( "xvid-direct-render", 0, NULL, "direct rendering",
"Use libxvidcore's direct rendering feature." );
"Use libxvidcore's direct rendering feature.", VLC_TRUE );
vlc_module_end();
/*****************************************************************************
......
......@@ -2,7 +2,7 @@
* geatures.c: control vlc with mouse gestures
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: gestures.c,v 1.1 2003/02/09 23:42:06 sigmunau Exp $
* $Id: gestures.c,v 1.2 2003/02/20 01:52:46 sigmunau Exp $
*
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
*
......@@ -86,10 +86,10 @@ static void RunIntf ( intf_thread_t *p_intf );
static char *button_list[] = { "left", "middle", "right", NULL };
vlc_module_begin();
add_category_hint( N_( "Gestures" ), NULL );
add_integer( "gestures-threshold", 30, NULL, THRESHOLD_TEXT, THRESHOLD_LONGTEXT );
add_category_hint( N_( "Gestures" ), NULL, VLC_FALSE );
add_integer( "gestures-threshold", 30, NULL, THRESHOLD_TEXT, THRESHOLD_LONGTEXT, VLC_TRUE );
add_string_from_list( "gestures-button", "right", button_list, NULL,
BUTTON_TEXT, BUTTON_LONGTEXT );
BUTTON_TEXT, BUTTON_LONGTEXT, VLC_FALSE );
set_description( _("mouse gestures control module") );
set_capability( "interface", 0 );
......
......@@ -2,7 +2,7 @@
* rc.c : remote control stdin/stdout plugin for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: rc.c,v 1.26 2003/02/17 16:56:02 gbazin Exp $
* $Id: rc.c,v 1.27 2003/02/20 01:52:46 sigmunau Exp $
*
* Authors: Peter Surda <shurdeek@panorama.sth.ac.at>
*
......@@ -81,10 +81,10 @@ static int AudioConfig ( vlc_object_t *, char const *,
#define TTY_LONGTEXT N_("Force the rc plugin to use stdin as if it was a TTY.")
vlc_module_begin();
add_category_hint( N_("Remote control"), NULL );
add_bool( "rc-show-pos", 0, NULL, POS_TEXT, POS_LONGTEXT );
add_category_hint( N_("Remote control"), NULL, VLC_TRUE );
add_bool( "rc-show-pos", 0, NULL, POS_TEXT, POS_LONGTEXT, VLC_TRUE );
#ifdef HAVE_ISATTY
add_bool( "fake-tty", 0, NULL, TTY_TEXT, TTY_LONGTEXT );
add_bool( "fake-tty", 0, NULL, TTY_TEXT, TTY_LONGTEXT, VLC_TRUE );
#endif
set_description( _("remote control interface module") );
set_capability( "interface", 20 );
......
......@@ -2,7 +2,7 @@
* avi.c : AVI file Stream input module for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: avi.c,v 1.34 2003/01/27 16:28:42 fenrir Exp $
* $Id: avi.c,v 1.35 2003/02/20 01:52:46 sigmunau Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
......@@ -57,13 +57,13 @@ static int AVIDemux_UnSeekable( input_thread_t *p_input );
* Module descriptor
*****************************************************************************/
vlc_module_begin();
add_category_hint( "demuxer", NULL );
add_category_hint( "avi-demuxer", NULL, VLC_TRUE );
add_bool( "avi-interleaved", 0, NULL,
"force interleaved method",
"force interleaved method" );