From 5a13b475ceef886157d0d87decab17a3b0e354f8 Mon Sep 17 00:00:00 2001 From: Sigmund Augdal Helberg Date: Thu, 20 Feb 2003 01:52:47 +0000 Subject: [PATCH] * 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) --- configure.ac.in | 3 +- include/configuration.h | 68 ++++---- modules/access/dvd/dvd.c | 7 +- modules/access/dvdplay/dvd.c | 5 +- modules/access/dvdread/dvdread.c | 4 +- modules/access/file.c | 6 +- modules/access/ftp.c | 12 +- modules/access/http.c | 8 +- modules/access/mms/mms.c | 12 +- modules/access/satellite/satellite.c | 21 ++- modules/access/slp.c | 14 +- modules/access/udp.c | 6 +- modules/audio_filter/converter/a52tofloat32.c | 6 +- .../audio_filter/converter/mpgatofixed32.c | 4 +- modules/audio_output/alsa.c | 8 +- modules/audio_output/file.c | 10 +- modules/audio_output/oss.c | 10 +- modules/codec/a52old/a52old.c | 8 +- modules/codec/ffmpeg/ffmpeg.c | 32 ++-- modules/codec/mpeg_video/parser.c | 12 +- modules/codec/spudec/spudec.c | 8 +- modules/codec/xvid.c | 4 +- modules/control/gestures.c | 8 +- modules/control/rc/rc.c | 8 +- modules/demux/avi/avi.c | 8 +- modules/demux/demuxdump.c | 6 +- modules/demux/mpeg/ts.c | 8 +- modules/demux/util/id3.c | 6 +- modules/demux/util/sub.c | 12 +- modules/encoder/ffmpeg/encoder.c | 16 +- modules/encoder/xvid.c | 46 ++--- modules/gui/beos/BeOS.cpp | 46 ++--- modules/gui/familiar/familiar.c | 6 +- modules/gui/gtk/gnome.c | 10 +- modules/gui/gtk/gtk.c | 8 +- modules/gui/gtk/preferences.c | 6 +- modules/gui/kde/interface.h | 2 +- modules/gui/kde/kde.cpp | 6 +- modules/gui/macosx/macosx.m | 10 +- modules/gui/win32/win32.cpp | 6 +- modules/gui/wxwindows/fileinfo.cpp | 5 +- modules/gui/wxwindows/wxwindows.cpp | 4 +- modules/misc/dummy/dummy.c | 6 +- modules/misc/logger/logger.c | 8 +- modules/misc/sap.c | 6 +- modules/video_filter/adjust.c | 12 +- modules/video_filter/clone.c | 6 +- modules/video_filter/crop.c | 8 +- .../video_filter/deinterlace/deinterlace.c | 6 +- modules/video_filter/distort.c | 6 +- modules/video_filter/motionblur.c | 6 +- modules/video_filter/transform.c | 6 +- modules/video_filter/wall.c | 10 +- modules/video_output/directx/directx.c | 10 +- modules/video_output/fb.c | 6 +- modules/video_output/ggi.c | 6 +- modules/video_output/mga/xmga.c | 8 +- modules/video_output/x11/x11.c | 10 +- modules/video_output/x11/xvideo.c | 14 +- modules/visualization/xosd/xosd.c | 12 +- src/libvlc.c | 7 +- src/libvlc.h | 164 +++++++++--------- src/misc/configuration.c | 3 +- 63 files changed, 417 insertions(+), 398 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index d183e86daf..a4c70546cd 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -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 diff --git a/include/configuration.h b/include/configuration.h index 16e7916947..048acb5a11 100644 --- a/include/configuration.h +++ b/include/configuration.h @@ -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 * @@ -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++ diff --git a/modules/access/dvd/dvd.c b/modules/access/dvd/dvd.c index 10b7e4cee9..a1b217e299 100644 --- a/modules/access/dvd/dvd.c +++ b/modules/access/dvd/dvd.c @@ -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 * @@ -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; diff --git a/modules/access/dvdplay/dvd.c b/modules/access/dvdplay/dvd.c index 28aa113884..60857f7a56 100644 --- a/modules/access/dvdplay/dvd.c +++ b/modules/access/dvdplay/dvd.c @@ -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 * @@ -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 ); diff --git a/modules/access/dvdread/dvdread.c b/modules/access/dvdread/dvdread.c index 2a7ddf2095..0e614e8dd8 100644 --- a/modules/access/dvdread/dvdread.c +++ b/modules/access/dvdread/dvdread.c @@ -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 * @@ -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 ); diff --git a/modules/access/file.c b/modules/access/file.c index e813366e42..6c50e803d7 100644 --- a/modules/access/file.c +++ b/modules/access/file.c @@ -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 * @@ -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" ); diff --git a/modules/access/ftp.c b/modules/access/ftp.c index 3f048ad3c9..588be58aa8 100644 --- a/modules/access/ftp.c +++ b/modules/access/ftp.c @@ -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 * @@ -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(); diff --git a/modules/access/http.c b/modules/access/http.c index 5bac482d6b..1c6962dceb 100644 --- a/modules/access/http.c +++ b/modules/access/http.c @@ -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 * @@ -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" ); diff --git a/modules/access/mms/mms.c b/modules/access/mms/mms.c index 861d8e7964..4469e81c2a 100644 --- a/modules/access/mms/mms.c +++ b/modules/access/mms/mms.c @@ -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 * @@ -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" ); diff --git a/modules/access/satellite/satellite.c b/modules/access/satellite/satellite.c index 87c8496de6..4b59acd4cf 100644 --- a/modules/access/satellite/satellite.c +++ b/modules/access/satellite/satellite.c @@ -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" ); diff --git a/modules/access/slp.c b/modules/access/slp.c index 908cab96bb..45cc05cb3f 100644 --- a/modules/access/slp.c +++ b/modules/access/slp.c @@ -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: Loïc Minier * @@ -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 ); diff --git a/modules/access/udp.c b/modules/access/udp.c index 47a01a36e4..03d5989102 100644 --- a/modules/access/udp.c +++ b/modules/access/udp.c @@ -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 * Tristan Leteurtre @@ -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" ); diff --git a/modules/audio_filter/converter/a52tofloat32.c b/modules/audio_filter/converter/a52tofloat32.c index 7c0f3d3cdf..3d21801e3f 100644 --- a/modules/audio_filter/converter/a52tofloat32.c +++ b/modules/audio_filter/converter/a52tofloat32.c @@ -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 * Christophe Massiot @@ -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 ); diff --git a/modules/audio_filter/converter/mpgatofixed32.c b/modules/audio_filter/converter/mpgatofixed32.c index d3f7638263..aa2ddc46f0 100644 --- a/modules/audio_filter/converter/mpgatofixed32.c +++ b/modules/audio_filter/converter/mpgatofixed32.c @@ -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 * Jean-Paul Saman @@ -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 ); diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c index 79adf8ed2e..cf7bb369ba 100644 --- a/modules/audio_output/alsa.c +++ b/modules/audio_output/alsa.c @@ -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 - Original Author * Jeffrey Baker - 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 ); diff --git a/modules/audio_output/file.c b/modules/audio_output/file.c index 1c948bf068..a3f2e24e53 100644 --- a/modules/audio_output/file.c +++ b/modules/audio_output/file.c @@ -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 * Gildas Bazin @@ -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" ); diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c index 8d7005e974..ba9befc42b 100644 --- a/modules/audio_output/oss.c +++ b/modules/audio_output/oss.c @@ -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 * Samuel Hocevar @@ -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" ); diff --git a/modules/codec/a52old/a52old.c b/modules/codec/a52old/a52old.c index 5c917651be..2a516e00cf 100644 --- a/modules/codec/a52old/a52old.c +++ b/modules/codec/a52old/a52old.c @@ -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 * @@ -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 ); diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c index e2fb21999d..5e900769a2 100644 --- a/modules/codec/ffmpeg/ffmpeg.c +++ b/modules/codec/ffmpeg/ffmpeg.c @@ -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 * @@ -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 ); diff --git a/modules/codec/mpeg_video/parser.c b/modules/codec/mpeg_video/parser.c index d8171e22ef..4295ebd95d 100644 --- a/modules/codec/mpeg_video/parser.c +++ b/modules/codec/mpeg_video/parser.c @@ -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 * Samuel Hocevar @@ -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 ); diff --git a/modules/codec/spudec/spudec.c b/modules/codec/spudec/spudec.c index 7ad06901ca..c4208f1caa 100644 --- a/modules/codec/spudec/spudec.c +++ b/modules/codec/spudec/spudec.c @@ -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 * @@ -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 ); diff --git a/modules/codec/xvid.c b/modules/codec/xvid.c index ab9f857f34..ff2fda6daa 100644 --- a/modules/codec/xvid.c +++ b/modules/codec/xvid.c @@ -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 * @@ -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(); /***************************************************************************** diff --git a/modules/control/gestures.c b/modules/control/gestures.c index 11471b0c4a..bf3782fe0b 100644 --- a/modules/control/gestures.c +++ b/modules/control/gestures.c @@ -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 * @@ -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 ); diff --git a/modules/control/rc/rc.c b/modules/control/rc/rc.c index 1028c56c7b..814dfd6d36 100644 --- a/modules/control/rc/rc.c +++ b/modules/control/rc/rc.c @@ -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 * @@ -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 ); diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c index c15e5a9d16..c91fc01788 100644 --- a/modules/demux/avi/avi.c +++ b/modules/demux/avi/avi.c @@ -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 * * 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" ); + "force interleaved method", VLC_TRUE ); add_bool( "avi-index", 0, NULL, "force index creation", - "force index creation" ); + "force index creation", VLC_TRUE ); set_description( "avi demuxer" ); set_capability( "demux", 212 ); diff --git a/modules/demux/demuxdump.c b/modules/demux/demuxdump.c index 6de982f456..cad828d7de 100644 --- a/modules/demux/demuxdump.c +++ b/modules/demux/demuxdump.c @@ -2,7 +2,7 @@ * demuxdump.c : Pseudo demux module for vlc (dump raw stream) ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: demuxdump.c,v 1.4 2003/02/02 09:17:39 titer Exp $ + * $Id: demuxdump.c,v 1.5 2003/02/20 01:52:46 sigmunau Exp $ * * Authors: Laurent Aimar * @@ -48,10 +48,10 @@ static void Desactivate ( vlc_object_t * ); vlc_module_begin(); set_description( _("Dump Demux input") ); set_capability( "demux", 0 ); - add_category_hint( "File", NULL ); + add_category_hint( "File", NULL, VLC_FALSE ); add_string( "demuxdump-file", NULL, NULL, "dump file name", - "file name for dumping raw stream read by demux" ); + "file name for dumping raw stream read by demux", VLC_FALSE ); set_callbacks( Activate, Desactivate ); add_shortcut( "dump" ); vlc_module_end(); diff --git a/modules/demux/mpeg/ts.c b/modules/demux/mpeg/ts.c index ad9e3a9716..609d9ce61e 100644 --- a/modules/demux/mpeg/ts.c +++ b/modules/demux/mpeg/ts.c @@ -2,7 +2,7 @@ * mpeg_ts.c : Transport Stream input module for vlc ***************************************************************************** * Copyright (C) 2000-2001 VideoLAN - * $Id: ts.c,v 1.17 2003/02/12 13:42:43 massiot Exp $ + * $Id: ts.c,v 1.18 2003/02/20 01:52:46 sigmunau Exp $ * * Authors: Henri Fallon * Johan Bilien @@ -115,10 +115,10 @@ vlc_module_begin(); set_capability( "demux", 170 ); add_shortcut( "ts_dvbpsi" ); #endif - add_category_hint( N_("Miscellaneous"), NULL ); + add_category_hint( N_("Miscellaneous"), NULL, VLC_TRUE ); add_bool( "vls-backwards-compat", 0, NULL, - VLS_BACKWARDS_COMPAT_TEXT, VLS_BACKWARDS_COMPAT_LONGTEXT ); - add_bool( "buggy-psi", 0, NULL, BUGGY_PSI_TEXT, BUGGY_PSI_LONGTEXT ); + VLS_BACKWARDS_COMPAT_TEXT, VLS_BACKWARDS_COMPAT_LONGTEXT, VLC_TRUE ); + add_bool( "buggy-psi", 0, NULL, BUGGY_PSI_TEXT, BUGGY_PSI_LONGTEXT, VLC_TRUE ); set_callbacks( Activate, Deactivate ); vlc_module_end(); diff --git a/modules/demux/util/id3.c b/modules/demux/util/id3.c index 9fd0ec8192..9d52fe1cd0 100644 --- a/modules/demux/util/id3.c +++ b/modules/demux/util/id3.c @@ -2,7 +2,7 @@ * id3.c: simple id3 tag skipper ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: id3.c,v 1.2 2002/10/13 14:26:48 sigmunau Exp $ + * $Id: id3.c,v 1.3 2003/02/20 01:52:46 sigmunau Exp $ * * Authors: Sigmund Augdal * @@ -89,7 +89,6 @@ static int SkipID3Tag( vlc_object_t *p_this ) version = p_peek[3]; /* These may become usfull later, */ revision = p_peek[4]; /* but we ignore them for now */ - b_footer = p_peek[5] & 0x10; i_size = (p_peek[6] << 21) + (p_peek[7] << 14) + @@ -108,7 +107,8 @@ static int SkipID3Tag( vlc_object_t *p_this ) return( VLC_EGENERIC ); } - msg_Dbg( p_input, "ID3 tag found, skiping %d bytes", i_size ); + msg_Dbg( p_input, "ID3v2.%d revision %d tag found, skiping %d bytes", + version, revision, i_size ); p_input->p_current_data += i_size; /* seek passed end of ID3 tag */ return ( VLC_SUCCESS ); } diff --git a/modules/demux/util/sub.c b/modules/demux/util/sub.c index 1d621039ae..083d887c8d 100644 --- a/modules/demux/util/sub.c +++ b/modules/demux/util/sub.c @@ -2,7 +2,7 @@ * sub.c ***************************************************************************** * Copyright (C) 1999-2001 VideoLAN - * $Id: sub.c,v 1.5 2003/02/09 13:25:42 fenrir Exp $ + * $Id: sub.c,v 1.6 2003/02/20 01:52:46 sigmunau Exp $ * * Authors: Laurent Aimar * @@ -69,18 +69,18 @@ static char *ppsz_sub_type[] = { "microdvd", "subrip", "ssa1", "ssa2-4", NULL }; vlc_module_begin(); set_description( _("text subtitle demux") ); set_capability( "subtitle demux", 12 ); - add_category_hint( "subtitle", NULL ); + add_category_hint( "subtitle", NULL, VLC_TRUE ); add_string( "sub-file", NULL, NULL, - "subtitle file name", "subtitle file name" ); + "subtitle file name", "subtitle file name", VLC_TRUE ); add_float( "sub-fps", 0.0, NULL, "override frames per second", - SUB_FPS_LONGTEXT ); + SUB_FPS_LONGTEXT, VLC_TRUE ); add_integer( "sub-delay", 0, NULL, "delay subtitles (in 1/10s)", - "delay subtitles (in 1/10s)" ); + "delay subtitles (in 1/10s)", VLC_TRUE ); add_string_from_list( "sub-type", NULL, ppsz_sub_type, NULL, "subtitle type", - SUB_TYPE_LONGTEXT ); + SUB_TYPE_LONGTEXT, VLC_TRUE ); set_callbacks( Open, NULL ); vlc_module_end(); diff --git a/modules/encoder/ffmpeg/encoder.c b/modules/encoder/ffmpeg/encoder.c index 16b6956d02..b101fe9da7 100644 --- a/modules/encoder/ffmpeg/encoder.c +++ b/modules/encoder/ffmpeg/encoder.c @@ -2,7 +2,7 @@ * encoder.c : audio/video encoder using ffmpeg library ***************************************************************************** * Copyright (C) 2002 VideoLAN - * $Id: encoder.c,v 1.1 2003/01/22 10:41:57 fenrir Exp $ + * $Id: encoder.c,v 1.2 2003/02/20 01:52:46 sigmunau Exp $ * * Authors: Laurent Aimar * @@ -55,17 +55,17 @@ vlc_module_begin(); add_submodule(); set_capability( "video encoder", 100 ); set_callbacks( E_( OpenEncoderVideo ), E_( CloseEncoderVideo ) ); - add_category_hint( "video setting", NULL ); - add_integer( "encoder-ffmpeg-video-bitrate", 1000, NULL, "bitrate (kb/s)", "bitrate (kb/s)" ); - add_integer( "encoder-ffmpeg-video-max-key-interval", 10, NULL, "max key interval", "maximum value of frames between two keyframes" ); - add_integer( "encoder-ffmpeg-min-quantizer", 2, NULL, "min quantizer", "range 1-31" ); - add_integer( "encoder-ffmpeg-max-quantizer", 31, NULL, "max quantizer", "range 1-31" ); + add_category_hint( "video setting", NULL, VLC_TRUE ); + add_integer( "encoder-ffmpeg-video-bitrate", 1000, NULL, "bitrate (kb/s)", "bitrate (kb/s)", VLC_TRUE ); + add_integer( "encoder-ffmpeg-video-max-key-interval", 10, NULL, "max key interval", "maximum value of frames between two keyframes", VLC_TRUE ); + add_integer( "encoder-ffmpeg-min-quantizer", 2, NULL, "min quantizer", "range 1-31", VLC_TRUE ); + add_integer( "encoder-ffmpeg-max-quantizer", 31, NULL, "max quantizer", "range 1-31", VLC_TRUE ); add_submodule(); set_capability( "audio encoder", 50 ); set_callbacks( E_( OpenEncoderAudio ), E_( CloseEncoderAudio ) ); - add_category_hint( "audio setting", NULL ); - add_integer( "encoder-ffmpeg-audio-bitrate", 64, NULL, "bitrate (kb/s)", "bitrate (kb/s)" ); + add_category_hint( "audio setting", NULL, VLC_TRUE ); + add_integer( "encoder-ffmpeg-audio-bitrate", 64, NULL, "bitrate (kb/s)", "bitrate (kb/s)", VLC_TRUE ); vlc_module_end(); diff --git a/modules/encoder/xvid.c b/modules/encoder/xvid.c index c86589fd43..732a45590c 100644 --- a/modules/encoder/xvid.c +++ b/modules/encoder/xvid.c @@ -2,7 +2,7 @@ * xvid.c: an encoder for libxvidcore, the Xvid video codec ***************************************************************************** * Copyright (C) 2002 VideoLAN - * $Id: xvid.c,v 1.1 2003/01/22 10:41:57 fenrir Exp $ + * $Id: xvid.c,v 1.2 2003/02/20 01:52:46 sigmunau Exp $ * * Authors: Laurent Aimar * @@ -60,30 +60,30 @@ vlc_module_begin(); set_callbacks( OpenEncoder, CloseEncoder ); add_shortcut( "xvid" ); - add_category_hint( "general setting", NULL ); - add_integer( "encoder-xvid-bitrate", 1000, NULL, "bitrate (kb/s)", "bitrate (kb/s)" ); - add_integer( "encoder-xvid-min-quantizer", 2, NULL, "min quantizer", "range 1-31" ); - add_integer( "encoder-xvid-max-quantizer", 31, NULL, "max quantizer", "1-31" ); - add_integer( "encoder-xvid-max-key-interval", -1, NULL, "max key interval", "maximum value of frames between two keyframes" ); + add_category_hint( "general setting", NULL, VLC_TRUE ); + add_integer( "encoder-xvid-bitrate", 1000, NULL, "bitrate (kb/s)", "bitrate (kb/s)", VLC_TRUE ); + add_integer( "encoder-xvid-min-quantizer", 2, NULL, "min quantizer", "range 1-31", VLC_TRUE ); + add_integer( "encoder-xvid-max-quantizer", 31, NULL, "max quantizer", "1-31", VLC_TRUE ); + add_integer( "encoder-xvid-max-key-interval", -1, NULL, "max key interval", "maximum value of frames between two keyframes", VLC_TRUE ); add_category_hint( "advanced setting", NULL ); - add_integer( "encoder-xvid-reaction-delay-factor", -1, NULL, "rc reaction delay factor", "rate controler parameters"); - add_integer( "encoder-xvid-averaging-period", -1, NULL, "rc averaging period", "rate controler parameters" ); - add_integer( "encoder-xvid-buffer", -1, NULL, "rc buffer", "rate controler parameters" ); + add_integer( "encoder-xvid-reaction-delay-factor", -1, NULL, "rc reaction delay factor", "rate controler parameters", VLC_TRUE); + add_integer( "encoder-xvid-averaging-period", -1, NULL, "rc averaging period", "rate controler parameters", VLC_TRUE ); + add_integer( "encoder-xvid-buffer", -1, NULL, "rc buffer", "rate controler parameters", VLC_TRUE ); add_category_hint( "advanced frame setting", NULL ); - add_string_from_list( "encoder-xvid-quantization", "MPEG", ppsz_xvid_quant_algo, NULL, "quantization algorithm", "" ); - add_bool( "encoder-xvid-halfpel", 1, NULL, "half pixel motion estimation.", "" ); - add_bool( "encoder-xvid-4mv", 0, NULL, "fourc vector per macroblock(need halfpel)", "" ); - add_bool( "encoder-xvid-lumi-mask", 0, NULL, "use a lumimasking algorithm", "" ); - add_bool( "encoder-xvid-adaptive-quant", 0, NULL, "perform an adaptative quantization", "" ); - add_bool( "encoder-xvid-interlacing", 0, NULL, "use MPEG4 interlaced mode", "" ); - add_string_from_list( "encoder-xvid-me", "", ppsz_xvid_me, NULL, "motion estimation", "" ); - add_bool( "encoder-xvid-motion-advanceddiamond", 1, NULL, "motion advanceddiamond", "" ); - add_bool( "encoder-xvid-motion-halfpeldiamond", 1, NULL, "motion halfpel diamond", "" ); - add_bool( "encoder-xvid-motion-halfpelrefine", 1, NULL, "motion halfpelrefine", "" ); - add_bool( "encoder-xvid-motion-extsearch", 1, NULL, "motion extsearch", "" ); - add_bool( "encoder-xvid-motion-earlystop", 1, NULL, "motion earlystop", "" ); - add_bool( "encoder-xvid-motion-quickstop", 1, NULL, "motion quickstop", "" ); - add_bool( "encoder-xvid-motion-usesquares", 0, NULL, "use a square search", "" ); + add_string_from_list( "encoder-xvid-quantization", "MPEG", ppsz_xvid_quant_algo, NULL, "quantization algorithm", "", VLC_TRUE ); + add_bool( "encoder-xvid-halfpel", 1, NULL, "half pixel motion estimation.", "", VLC_TRUE ); + add_bool( "encoder-xvid-4mv", 0, NULL, "fourc vector per macroblock(need halfpel)", "", VLC_TRUE ); + add_bool( "encoder-xvid-lumi-mask", 0, NULL, "use a lumimasking algorithm", "", VLC_TRUE ); + add_bool( "encoder-xvid-adaptive-quant", 0, NULL, "perform an adaptative quantization", "", VLC_TRUE ); + add_bool( "encoder-xvid-interlacing", 0, NULL, "use MPEG4 interlaced mode", "", VLC_TRUE ); + add_string_from_list( "encoder-xvid-me", "", ppsz_xvid_me, NULL, "motion estimation", "", VLC_TRUE ); + add_bool( "encoder-xvid-motion-advanceddiamond", 1, NULL, "motion advanceddiamond", "", VLC_TRUE ); + add_bool( "encoder-xvid-motion-halfpeldiamond", 1, NULL, "motion halfpel diamond", "", VLC_TRUE ); + add_bool( "encoder-xvid-motion-halfpelrefine", 1, NULL, "motion halfpelrefine", "", VLC_TRUE ); + add_bool( "encoder-xvid-motion-extsearch", 1, NULL, "motion extsearch", "", VLC_TRUE ); + add_bool( "encoder-xvid-motion-earlystop", 1, NULL, "motion earlystop", "", VLC_TRUE ); + add_bool( "encoder-xvid-motion-quickstop", 1, NULL, "motion quickstop", "", VLC_TRUE ); + add_bool( "encoder-xvid-motion-usesquares", 0, NULL, "use a square search", "", VLC_TRUE ); vlc_module_end(); diff --git a/modules/gui/beos/BeOS.cpp b/modules/gui/beos/BeOS.cpp index b89ac679b4..92278f1686 100644 --- a/modules/gui/beos/BeOS.cpp +++ b/modules/gui/beos/BeOS.cpp @@ -2,7 +2,7 @@ * beos.cpp : BeOS plugin for vlc ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN - * $Id: BeOS.cpp,v 1.6 2003/02/09 17:10:52 stippi Exp $ + * $Id: BeOS.cpp,v 1.7 2003/02/20 01:52:46 sigmunau Exp $ * * Authors: Jean-Marc Dressler * Samuel Hocevar @@ -51,28 +51,28 @@ vlc_module_begin(); add_submodule(); set_capability( "interface", 100 ); set_callbacks( E_(OpenIntf), E_(CloseIntf) ); - add_integer( "beos-intf-width", 0, NULL, "", "" ); - add_integer( "beos-intf-height", 0, NULL, "", "" ); - add_integer( "beos-intf-xpos", 0, NULL, "", "" ); - add_integer( "beos-intf-ypos", 0, NULL, "", "" ); - add_integer( "beos-playlist-width", 0, NULL, "", "" ); - add_integer( "beos-playlist-height", 0, NULL, "", "" ); - add_integer( "beos-playlist-xpos", 0, NULL, "", "" ); - add_integer( "beos-playlist-ypos", 0, NULL, "", "" ); - add_bool( "beos-playlist-show", 0, NULL, "", "" ); - add_integer( "beos-messages-width", 0, NULL, "", "" ); - add_integer( "beos-messages-height", 0, NULL, "", "" ); - add_integer( "beos-messages-xpos", 0, NULL, "", "" ); - add_integer( "beos-messages-ypos", 0, NULL, "", "" ); - add_bool( "beos-messages-show", 0, NULL, "", "" ); - add_integer( "beos-settings-width", 0, NULL, "", "" ); - add_integer( "beos-settings-height", 0, NULL, "", "" ); - add_integer( "beos-settings-xpos", 0, NULL, "", "" ); - add_integer( "beos-settings-ypos", 0, NULL, "", "" ); - add_bool( "beos-settings-show", 0, NULL, "", "" ); - add_integer( "beos-screenshot-format", 0, NULL, "", "" ); - add_string( "beos-screenshot-path", 0, NULL, "", "" ); - add_bool( "beos-use-dvd-menus", 0, NULL, "", "" ); + add_integer( "beos-intf-width", 0, NULL, "", "", VLC_TRUE ); + add_integer( "beos-intf-height", 0, NULL, "", "", VLC_TRUE ); + add_integer( "beos-intf-xpos", 0, NULL, "", "", VLC_TRUE ); + add_integer( "beos-intf-ypos", 0, NULL, "", "", VLC_TRUE ); + add_integer( "beos-playlist-width", 0, NULL, "", "", VLC_TRUE ); + add_integer( "beos-playlist-height", 0, NULL, "", "", VLC_TRUE ); + add_integer( "beos-playlist-xpos", 0, NULL, "", "", VLC_TRUE ); + add_integer( "beos-playlist-ypos", 0, NULL, "", "", VLC_TRUE ); + add_bool( "beos-playlist-show", 0, NULL, "", "", VLC_TRUE ); + add_integer( "beos-messages-width", 0, NULL, "", "", VLC_TRUE ); + add_integer( "beos-messages-height", 0, NULL, "", "", VLC_TRUE ); + add_integer( "beos-messages-xpos", 0, NULL, "", "", VLC_TRUE ); + add_integer( "beos-messages-ypos", 0, NULL, "", "", VLC_TRUE ); + add_bool( "beos-messages-show", 0, NULL, "", "", VLC_TRUE ); + add_integer( "beos-settings-width", 0, NULL, "", "", VLC_TRUE ); + add_integer( "beos-settings-height", 0, NULL, "", "", VLC_TRUE ); + add_integer( "beos-settings-xpos", 0, NULL, "", "", VLC_TRUE ); + add_integer( "beos-settings-ypos", 0, NULL, "", "", VLC_TRUE ); + add_bool( "beos-settings-show", 0, NULL, "", "", VLC_TRUE ); + add_integer( "beos-screenshot-format", 0, NULL, "", "", VLC_TRUE ); + add_string( "beos-screenshot-path", 0, NULL, "", "", VLC_TRUE ); + add_bool( "beos-use-dvd-menus", 0, NULL, "", "", VLC_TRUE ); add_submodule(); set_capability( "video output", 100 ); set_callbacks( E_(OpenVideo), E_(CloseVideo) ); diff --git a/modules/gui/familiar/familiar.c b/modules/gui/familiar/familiar.c index 2d1f968594..dadc0efb88 100644 --- a/modules/gui/familiar/familiar.c +++ b/modules/gui/familiar/familiar.c @@ -2,7 +2,7 @@ * familiar.c : familiar plugin for vlc ***************************************************************************** * Copyright (C) 2002 VideoLAN - * $Id: familiar.c,v 1.28 2003/01/27 17:41:01 ipkiss Exp $ + * $Id: familiar.c,v 1.29 2003/02/20 01:52:46 sigmunau Exp $ * * Authors: Jean-Paul Saman * @@ -66,8 +66,8 @@ gint E_(GtkModeManage) ( intf_thread_t * p_intf ); * Module descriptor *****************************************************************************/ vlc_module_begin(); - add_category_hint( N_("Miscellaneous"), NULL ); - add_bool( "familiar-autoplayfile", 1, GtkAutoPlayFile, AUTOPLAYFILE_TEXT, AUTOPLAYFILE_LONGTEXT ); + add_category_hint( N_("Miscellaneous"), NULL, VLC_TRUE ); + add_bool( "familiar-autoplayfile", 1, GtkAutoPlayFile, AUTOPLAYFILE_TEXT, AUTOPLAYFILE_LONGTEXT, VLC_TRUE ); set_description( _("Familiar Linux Gtk+ interface module") ); set_capability( "interface", 70 ); set_callbacks( Open, Close ); diff --git a/modules/gui/gtk/gnome.c b/modules/gui/gtk/gnome.c index 09f2920c0e..5d968d4eca 100644 --- a/modules/gui/gtk/gnome.c +++ b/modules/gui/gtk/gnome.c @@ -2,7 +2,7 @@ * gnome.c : Gnome plugin for vlc ***************************************************************************** * Copyright (C) 2000 VideoLAN - * $Id: gnome.c,v 1.10 2003/02/05 22:11:52 sam Exp $ + * $Id: gnome.c,v 1.11 2003/02/20 01:52:46 sigmunau Exp $ * * Authors: Samuel Hocevar * @@ -69,13 +69,13 @@ vlc_module_begin(); #else int i = getenv( "DISPLAY" ) == NULL ? 15 : 100; #endif - add_category_hint( N_("GNOME"), NULL ); + add_category_hint( N_("GNOME"), NULL, VLC_FALSE ); add_bool( "gnome-tooltips", 1, E_(GtkHideTooltips), - TOOLTIPS_TEXT, TOOLTIPS_LONGTEXT ); + TOOLTIPS_TEXT, TOOLTIPS_LONGTEXT, VLC_FALSE ); add_bool( "gnome-toolbartext", 1, GtkHideToolbarText, TOOLBAR_TEXT, - TOOLBAR_LONGTEXT ); + TOOLBAR_LONGTEXT, VLC_FALSE ); add_integer( "gnome-prefs-maxh", 480, NULL, - PREFS_MAXH_TEXT, PREFS_MAXH_LONGTEXT ); + PREFS_MAXH_TEXT, PREFS_MAXH_LONGTEXT, VLC_TRUE ); set_description( _("GNOME interface module") ); set_capability( "interface", i ); diff --git a/modules/gui/gtk/gtk.c b/modules/gui/gtk/gtk.c index 57053797ad..3e141baea8 100644 --- a/modules/gui/gtk/gtk.c +++ b/modules/gui/gtk/gtk.c @@ -2,7 +2,7 @@ * gtk.c : Gtk+ plugin for vlc ***************************************************************************** * Copyright (C) 2000-2001 VideoLAN - * $Id: gtk.c,v 1.15 2003/02/05 22:11:52 sam Exp $ + * $Id: gtk.c,v 1.16 2003/02/20 01:52:46 sigmunau Exp $ * * Authors: Samuel Hocevar * @@ -68,11 +68,11 @@ vlc_module_begin(); #else int i = getenv( "DISPLAY" ) == NULL ? 10 : 90; #endif - add_category_hint( N_("Gtk+"), NULL ); + add_category_hint( N_("Gtk+"), NULL, VLC_FALSE ); add_bool( "gtk-tooltips", 1, E_(GtkHideTooltips), - TOOLTIPS_TEXT, TOOLTIPS_LONGTEXT ); + TOOLTIPS_TEXT, TOOLTIPS_LONGTEXT, VLC_FALSE ); add_integer( "gtk-prefs-maxh", 480, NULL, - PREFS_MAXH_TEXT, PREFS_MAXH_LONGTEXT ); + PREFS_MAXH_TEXT, PREFS_MAXH_LONGTEXT, VLC_TRUE ); set_description( _("Gtk+ interface module") ); set_capability( "interface", i ); diff --git a/modules/gui/gtk/preferences.c b/modules/gui/gtk/preferences.c index a1a61218b5..75224a53cb 100644 --- a/modules/gui/gtk/preferences.c +++ b/modules/gui/gtk/preferences.c @@ -2,7 +2,7 @@ * gtk_preferences.c: functions to handle the preferences dialog box. ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN - * $Id: preferences.c,v 1.8 2003/01/27 17:41:01 ipkiss Exp $ + * $Id: preferences.c,v 1.9 2003/02/20 01:52:46 sigmunau Exp $ * * Authors: Gildas Bazin * Loïc Minier @@ -233,6 +233,10 @@ static void GtkCreateConfigDialog( char *psz_module_name, if( p_item ) do { + if( p_item->b_advanced && !config_GetInt( p_intf, "advanced" )) + { + continue; + } switch( p_item->i_type ) { diff --git a/modules/gui/kde/interface.h b/modules/gui/kde/interface.h index 1756999558..59534e6163 100644 --- a/modules/gui/kde/interface.h +++ b/modules/gui/kde/interface.h @@ -37,7 +37,7 @@ class KInterface : public KMainWindow Q_OBJECT public: KInterface(intf_thread_t *p_intf, QWidget *parent=0, - const char *name=0); + const char *name="VLC"); ~KInterface(); public slots: diff --git a/modules/gui/kde/kde.cpp b/modules/gui/kde/kde.cpp index 15f976e833..5bd02bf4f3 100644 --- a/modules/gui/kde/kde.cpp +++ b/modules/gui/kde/kde.cpp @@ -2,7 +2,7 @@ * kde.cpp : KDE plugin for vlc ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: kde.cpp,v 1.8 2003/02/02 01:37:03 sam Exp $ + * $Id: kde.cpp,v 1.9 2003/02/20 01:52:46 sigmunau Exp $ * * Authors: Andres Krapf Sun Mar 25 2001 * @@ -51,8 +51,8 @@ static void run(intf_thread_t *p_intf); *****************************************************************************/ vlc_module_begin(); int i = getenv( "DISPLAY" ) == NULL ? 8 : 85; - add_category_hint( "kde", NULL ); - add_file( "kdeuirc", DATA_PATH "/ui.rc", NULL, N_( "path to ui.rc file" ), NULL ); + add_category_hint( "kde", NULL, VLC_TRUE ); + add_file( "kdeuirc", DATA_PATH "/ui.rc", NULL, N_( "path to ui.rc file" ), NULL, VLC_TRUE ); set_description( _("KDE interface module") ); set_capability( "interface", i ); set_program( "kvlc" ); diff --git a/modules/gui/macosx/macosx.m b/modules/gui/macosx/macosx.m index be85917a4c..c6e18a8fdf 100644 --- a/modules/gui/macosx/macosx.m +++ b/modules/gui/macosx/macosx.m @@ -2,7 +2,7 @@ * macosx.m: MacOS X plugin for vlc ***************************************************************************** * Copyright (C) 2001-2003 VideoLAN - * $Id: macosx.m,v 1.2 2003/01/15 00:49:49 jlj Exp $ + * $Id: macosx.m,v 1.3 2003/02/20 01:52:46 sigmunau Exp $ * * Authors: Colin Delacroix * Eugenio Jarosiewicz @@ -58,12 +58,12 @@ vlc_module_begin(); add_submodule(); set_capability( "video output", 100 ); set_callbacks( E_(OpenVideo), E_(CloseVideo) ); - add_category_hint( N_("Video"), NULL ); - add_integer( "macosx-vdev", 0, NULL, VDEV_TEXT, VDEV_TEXT ); + add_category_hint( N_("Video"), NULL, VLC_FALSE ); + add_integer( "macosx-vdev", 0, NULL, VDEV_TEXT, VDEV_TEXT, VLC_FALSE ); add_submodule(); set_capability( "audio output", 100 ); set_callbacks( E_(OpenAudio), E_(CloseAudio) ); - add_category_hint( N_("Audio"), NULL ); - add_integer( "macosx-adev", 0, NULL, ADEV_TEXT, ADEV_TEXT ); + add_category_hint( N_("Audio"), NULL, VLC_FALSE ); + add_integer( "macosx-adev", 0, NULL, ADEV_TEXT, ADEV_TEXT, VLC_FALSE ); vlc_module_end(); diff --git a/modules/gui/win32/win32.cpp b/modules/gui/win32/win32.cpp index 2633aa9f5e..388ab80c8a 100644 --- a/modules/gui/win32/win32.cpp +++ b/modules/gui/win32/win32.cpp @@ -2,7 +2,7 @@ * win32.cpp : Win32 interface plugin for vlc ***************************************************************************** * Copyright (C) 2002-2003 VideoLAN - * $Id: win32.cpp,v 1.15 2003/02/12 02:11:58 ipkiss Exp $ + * $Id: win32.cpp,v 1.16 2003/02/20 01:52:46 sigmunau Exp $ * * Authors: Olivier Teulière * @@ -305,8 +305,8 @@ int Win32Manage( intf_thread_t *p_intf ) " Enter -1 if you want to keep all messages." ) vlc_module_begin(); - add_category_hint( N_("Miscellaneous"), NULL ); - add_integer( "intfwin-max-lines", 500, NULL, MAX_LINES_TEXT, MAX_LINES_LONGTEXT ); + add_category_hint( N_("Miscellaneous"), NULL, VLC_TRUE ); + add_integer( "intfwin-max-lines", 500, NULL, MAX_LINES_TEXT, MAX_LINES_LONGTEXT, VLC_TRUE ); set_description( _("Native Windows interface module") ); set_capability( "interface", 100 ); set_callbacks( E_(Open), E_(Close) ); diff --git a/modules/gui/wxwindows/fileinfo.cpp b/modules/gui/wxwindows/fileinfo.cpp index 10231d1fb1..f4e12d3960 100644 --- a/modules/gui/wxwindows/fileinfo.cpp +++ b/modules/gui/wxwindows/fileinfo.cpp @@ -2,7 +2,7 @@ * fileinfo.cpp : wxWindows plugin for vlc ***************************************************************************** * Copyright (C) 2000-2001 VideoLAN - * $Id: fileinfo.cpp,v 1.2 2003/01/28 21:08:29 sam Exp $ + * $Id: fileinfo.cpp,v 1.3 2003/02/20 01:52:46 sigmunau Exp $ * * Authors: Sigmund Augdal * @@ -77,7 +77,7 @@ FileInfo::FileInfo( intf_thread_t *_p_intf, Interface *_p_main_interface ): intf_thread_t *p_intf = _p_intf; input_thread_t *p_input; - wxTreeCtrl *tree = new wxTreeCtrl( this, -1 ); + wxTreeCtrl *tree = new wxTreeCtrl( this, -1, wxDefaultPosition, wxDefaultSize, wxTR_HAS_BUTTONS|wxTR_HIDE_ROOT ); p_input = p_intf->p_sys->p_input; /* Create the OK button */ wxButton *ok_button = new wxButton( this, wxID_OK, _("OK") ); @@ -99,7 +99,6 @@ FileInfo::FileInfo( intf_thread_t *_p_intf, Interface *_p_main_interface ): vlc_mutex_lock( &p_input->stream.stream_lock ); wxTreeItemId root = tree->AddRoot( p_input->psz_name ); tree->Expand( root ); - tree->EnsureVisible( root ); input_info_category_t *p_cat = p_input->stream.p_info; while ( p_cat ) { diff --git a/modules/gui/wxwindows/wxwindows.cpp b/modules/gui/wxwindows/wxwindows.cpp index af01f156f3..0ec003ff3c 100644 --- a/modules/gui/wxwindows/wxwindows.cpp +++ b/modules/gui/wxwindows/wxwindows.cpp @@ -2,7 +2,7 @@ * wxwindows.cpp : wxWindows plugin for vlc ***************************************************************************** * Copyright (C) 2000-2001 VideoLAN - * $Id: wxwindows.cpp,v 1.11 2003/01/28 20:02:03 sam Exp $ + * $Id: wxwindows.cpp,v 1.12 2003/02/20 01:52:46 sigmunau Exp $ * * Authors: Gildas Bazin * @@ -79,7 +79,7 @@ private: * Module descriptor *****************************************************************************/ vlc_module_begin(); - add_category_hint( N_("wxWindows"), NULL ); + add_category_hint( N_("wxWindows"), NULL, VLC_TRUE ); set_description( (char *) _("wxWindows interface module") ); set_capability( "interface", 50 ); set_callbacks( Open, Close ); diff --git a/modules/misc/dummy/dummy.c b/modules/misc/dummy/dummy.c index e3e72d042e..0c9101d8d2 100644 --- a/modules/misc/dummy/dummy.c +++ b/modules/misc/dummy/dummy.c @@ -2,7 +2,7 @@ * dummy.c : dummy plugin for vlc ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN - * $Id: dummy.c,v 1.2 2002/08/07 21:36:56 massiot Exp $ + * $Id: dummy.c,v 1.3 2003/02/20 01:52:46 sigmunau Exp $ * * Authors: Samuel Hocevar * @@ -61,7 +61,7 @@ vlc_module_begin(); add_submodule(); set_capability( "video output", 1 ); set_callbacks( E_(OpenVideo), NULL ); - add_category_hint( N_("Video"), NULL ); - add_string( "dummy-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT ); + add_category_hint( N_("Video"), NULL, VLC_FALSE ); + add_string( "dummy-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, VLC_FALSE ); vlc_module_end(); diff --git a/modules/misc/logger/logger.c b/modules/misc/logger/logger.c index 8457516839..685cae646c 100644 --- a/modules/misc/logger/logger.c +++ b/modules/misc/logger/logger.c @@ -2,7 +2,7 @@ * logger.c : file logging plugin for vlc ***************************************************************************** * Copyright (C) 2002 VideoLAN - * $Id: logger.c,v 1.3 2002/10/03 17:01:58 gbazin Exp $ + * $Id: logger.c,v 1.4 2003/02/20 01:52:46 sigmunau Exp $ * * Authors: Samuel Hocevar * @@ -82,9 +82,9 @@ static void HtmlPrint ( const msg_item_t *, FILE * ); * Module descriptor *****************************************************************************/ vlc_module_begin(); - add_category_hint( N_("Miscellaneous"), NULL ); - add_string( "logfile", NULL, NULL, N_("log filename"), N_("Specify the log filename.") ); - add_string( "logmode", NULL, NULL, N_("log format"), N_("Specify the log format. Available choices are \"text\" (default) and \"html\"") ); + add_category_hint( N_("Miscellaneous"), NULL, VLC_FALSE ); + add_string( "logfile", NULL, NULL, N_("log filename"), N_("Specify the log filename."), VLC_FALSE ); + add_string( "logmode", NULL, NULL, N_("log format"), N_("Specify the log format. Available choices are \"text\" (default) and \"html\""), VLC_FALSE ); set_description( _("file logging interface module") ); set_capability( "interface", 0 ); set_callbacks( Open, Close ); diff --git a/modules/misc/sap.c b/modules/misc/sap.c index dd4f882758..6614fc5056 100644 --- a/modules/misc/sap.c +++ b/modules/misc/sap.c @@ -2,7 +2,7 @@ * sap.c : SAP interface module ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: sap.c,v 1.7 2003/01/21 18:43:54 lool Exp $ + * $Id: sap.c,v 1.8 2003/02/20 01:52:46 sigmunau Exp $ * * Authors: Arnaud Schauly * @@ -128,9 +128,9 @@ struct media_descr_t { * Module descriptor *****************************************************************************/ vlc_module_begin(); - add_category_hint( N_("SAP"), NULL ); + add_category_hint( N_("SAP"), NULL, VLC_TRUE ); add_string( "sap-addr", NULL, NULL, - "SAP multicast address", "SAP multicast address" ); + "SAP multicast address", "SAP multicast address", VLC_TRUE ); set_description( _("SAP interface module") ); set_capability( "interface", 0 ); set_callbacks( Activate, NULL); diff --git a/modules/video_filter/adjust.c b/modules/video_filter/adjust.c index 329b139934..c565825a15 100644 --- a/modules/video_filter/adjust.c +++ b/modules/video_filter/adjust.c @@ -2,7 +2,7 @@ * adjust.c : Contrast/Hue/Saturation/Brightness video plugin for vlc ***************************************************************************** * Copyright (C) 2000, 2001, 2002, 2003 VideoLAN - * $Id: adjust.c,v 1.9 2003/01/17 16:18:03 sam Exp $ + * $Id: adjust.c,v 1.10 2003/02/20 01:52:46 sigmunau Exp $ * * Authors: Simon Latapie * @@ -68,11 +68,11 @@ static int SendEvents( vlc_object_t *, char const *, vlc_module_begin(); - add_category_hint( N_("Adjust"), NULL ); - add_float_with_range( "contrast", 1.0, 0.0, 2.0, NULL, CONT_TEXT, CONT_LONGTEXT ); - add_float_with_range( "brightness", 1.0, 0.0, 2.0, NULL, LUM_TEXT, LUM_LONGTEXT ); - add_integer_with_range( "hue", 0, 0, 360, NULL, HUE_TEXT, HUE_LONGTEXT ); - add_float_with_range( "saturation", 1.0, 0.0, 3.0, NULL, SAT_TEXT, SAT_LONGTEXT ); + add_category_hint( N_("Adjust"), NULL, VLC_FALSE ); + add_float_with_range( "contrast", 1.0, 0.0, 2.0, NULL, CONT_TEXT, CONT_LONGTEXT, VLC_FALSE ); + add_float_with_range( "brightness", 1.0, 0.0, 2.0, NULL, LUM_TEXT, LUM_LONGTEXT, VLC_FALSE ); + add_integer_with_range( "hue", 0, 0, 360, NULL, HUE_TEXT, HUE_LONGTEXT, VLC_FALSE ); + add_float_with_range( "saturation", 1.0, 0.0, 3.0, NULL, SAT_TEXT, SAT_LONGTEXT, VLC_FALSE ); set_description( _("contrast/hue/saturation/brightness filter") ); set_capability( "video filter", 0 ); add_shortcut( "adjust" ); diff --git a/modules/video_filter/clone.c b/modules/video_filter/clone.c index b660a2faf9..5c0b775012 100644 --- a/modules/video_filter/clone.c +++ b/modules/video_filter/clone.c @@ -2,7 +2,7 @@ * clone.c : Clone video plugin for vlc ***************************************************************************** * Copyright (C) 2002, 2003 VideoLAN - * $Id: clone.c,v 1.6 2003/01/28 22:03:21 sam Exp $ + * $Id: clone.c,v 1.7 2003/02/20 01:52:46 sigmunau Exp $ * * Authors: Samuel Hocevar * @@ -55,8 +55,8 @@ static int SendEvents( vlc_object_t *, char const *, "clone the video") vlc_module_begin(); - add_category_hint( N_("Miscellaneous"), NULL ); - add_integer( "clone-count", 2, NULL, COUNT_TEXT, COUNT_LONGTEXT ); + add_category_hint( N_("Clone"), NULL, VLC_FALSE ); + add_integer( "clone-count", 2, NULL, COUNT_TEXT, COUNT_LONGTEXT, VLC_FALSE ); set_description( _("image clone video module") ); set_capability( "video filter", 0 ); add_shortcut( "clone" ); diff --git a/modules/video_filter/crop.c b/modules/video_filter/crop.c index 8e61671a8d..90ebb9fbba 100644 --- a/modules/video_filter/crop.c +++ b/modules/video_filter/crop.c @@ -2,7 +2,7 @@ * crop.c : Crop video plugin for vlc ***************************************************************************** * Copyright (C) 2002, 2003 VideoLAN - * $Id: crop.c,v 1.7 2003/01/17 16:18:03 sam Exp $ + * $Id: crop.c,v 1.8 2003/02/20 01:52:46 sigmunau Exp $ * * Authors: Samuel Hocevar * @@ -58,9 +58,9 @@ static int SendEvents( vlc_object_t *, char const *, #define AUTOCROP_LONGTEXT N_("Activate automatic black border cropping") vlc_module_begin(); - add_category_hint( N_("Miscellaneous"), NULL ); - add_string( "crop-geometry", NULL, NULL, GEOMETRY_TEXT, GEOMETRY_LONGTEXT ); - add_bool( "autocrop", 0, NULL, AUTOCROP_TEXT, AUTOCROP_LONGTEXT ); + add_category_hint( N_("Crop"), NULL, VLC_FALSE ); + add_string( "crop-geometry", NULL, NULL, GEOMETRY_TEXT, GEOMETRY_LONGTEXT, VLC_FALSE ); + add_bool( "autocrop", 0, NULL, AUTOCROP_TEXT, AUTOCROP_LONGTEXT, VLC_FALSE ); set_description( _("image crop video module") ); set_capability( "video filter", 0 ); add_shortcut( "crop" ); diff --git a/modules/video_filter/deinterlace/deinterlace.c b/modules/video_filter/deinterlace/deinterlace.c index 0b20d92905..a295d5b897 100644 --- a/modules/video_filter/deinterlace/deinterlace.c +++ b/modules/video_filter/deinterlace/deinterlace.c @@ -2,7 +2,7 @@ * deinterlace.c : deinterlacer plugin for vlc ***************************************************************************** * Copyright (C) 2000, 2001, 2002, 2003 VideoLAN - * $Id: deinterlace.c,v 1.8 2003/01/28 13:03:13 gbazin Exp $ + * $Id: deinterlace.c,v 1.9 2003/02/20 01:52:46 sigmunau Exp $ * * Authors: Samuel Hocevar * @@ -78,9 +78,9 @@ static int FilterCallback ( vlc_object_t *, char const *, static char *mode_list[] = { "discard", "blend", "mean", "bob", "linear", NULL }; vlc_module_begin(); - add_category_hint( N_("Miscellaneous"), NULL ); + add_category_hint( N_("Deinterlace"), NULL, VLC_FALSE ); add_string_from_list( "deinterlace-mode", "discard", mode_list, NULL, - MODE_TEXT, MODE_LONGTEXT ); + MODE_TEXT, MODE_LONGTEXT, VLC_FALSE ); set_description( _("deinterlacing module") ); set_capability( "video filter", 0 ); add_shortcut( "deinterlace" ); diff --git a/modules/video_filter/distort.c b/modules/video_filter/distort.c index 62a9edc220..b12371b985 100644 --- a/modules/video_filter/distort.c +++ b/modules/video_filter/distort.c @@ -2,7 +2,7 @@ * distort.c : Misc video effects plugin for vlc ***************************************************************************** * Copyright (C) 2000, 2001, 2002, 2003 VideoLAN - * $Id: distort.c,v 1.6 2003/01/17 16:18:03 sam Exp $ + * $Id: distort.c,v 1.7 2003/02/20 01:52:46 sigmunau Exp $ * * Authors: Samuel Hocevar * @@ -62,9 +62,9 @@ static int SendEvents ( vlc_object_t *, char const *, static char *mode_list[] = { "wave", "ripple", NULL }; vlc_module_begin(); - add_category_hint( N_("Miscellaneous"), NULL ); + add_category_hint( N_("Distort"), NULL, VLC_FALSE ); add_string_from_list( "distort-mode", "wave", mode_list, NULL, - MODE_TEXT, MODE_LONGTEXT ); + MODE_TEXT, MODE_LONGTEXT, VLC_FALSE ); set_description( _("miscellaneous video effects module") ); set_capability( "video filter", 0 ); add_shortcut( "distort" ); diff --git a/modules/video_filter/motionblur.c b/modules/video_filter/motionblur.c index 665088d130..a6503b5e79 100644 --- a/modules/video_filter/motionblur.c +++ b/modules/video_filter/motionblur.c @@ -2,7 +2,7 @@ * motion_blur.c : motion blur filter for vlc ***************************************************************************** * Copyright (C) 2000, 2001, 2002, 2003 VideoLAN - * $Id: motionblur.c,v 1.7 2003/01/28 22:03:21 sam Exp $ + * $Id: motionblur.c,v 1.8 2003/02/20 01:52:46 sigmunau Exp $ * * Authors: Sigmund Augdal * @@ -55,8 +55,8 @@ static int SendEvents( vlc_object_t *, char const *, #define MODE_LONGTEXT N_("The degree of blurring from 1 to 127") vlc_module_begin(); - add_category_hint( N_("Miscellaneous"), NULL ); - add_integer( "blur-factor", 80, NULL, MODE_TEXT, MODE_LONGTEXT ); + add_category_hint( N_("Miscellaneous"), NULL, VLC_FALSE ); + add_integer( "blur-factor", 80, NULL, MODE_TEXT, MODE_LONGTEXT, VLC_FALSE ); set_description( _("Motion blur filter") ); set_capability( "video filter", 0 ); set_callbacks( Create, Destroy ); diff --git a/modules/video_filter/transform.c b/modules/video_filter/transform.c index b61eaac158..a5b9384780 100644 --- a/modules/video_filter/transform.c +++ b/modules/video_filter/transform.c @@ -2,7 +2,7 @@ * transform.c : transform image plugin for vlc ***************************************************************************** * Copyright (C) 2000, 2001, 2002, 2003 VideoLAN - * $Id: transform.c,v 1.8 2003/02/09 12:19:09 sam Exp $ + * $Id: transform.c,v 1.9 2003/02/20 01:52:46 sigmunau Exp $ * * Authors: Samuel Hocevar * @@ -60,9 +60,9 @@ static int SendEvents( vlc_object_t *, char const *, static char *type_list[] = { "90", "180", "270", "hflip", "vflip", NULL }; vlc_module_begin(); - add_category_hint( N_("Miscellaneous"), NULL ); + add_category_hint( N_("Miscellaneous"), NULL, VLC_FALSE ); add_string_from_list( "transform-type", "90", type_list, NULL, - TYPE_TEXT, TYPE_LONGTEXT); + TYPE_TEXT, TYPE_LONGTEXT, VLC_FALSE); set_description( _("image transformation module") ); set_capability( "video filter", 0 ); add_shortcut( "transform" ); diff --git a/modules/video_filter/wall.c b/modules/video_filter/wall.c index e50168d3f9..80b5568388 100644 --- a/modules/video_filter/wall.c +++ b/modules/video_filter/wall.c @@ -2,7 +2,7 @@ * wall.c : Wall video plugin for vlc ***************************************************************************** * Copyright (C) 2000, 2001, 2002, 2003 VideoLAN - * $Id: wall.c,v 1.6 2003/01/17 16:18:03 sam Exp $ + * $Id: wall.c,v 1.7 2003/02/20 01:52:46 sigmunau Exp $ * * Authors: Samuel Hocevar * @@ -63,10 +63,10 @@ static int SendEvents( vlc_object_t *, char const *, "defaults to all") vlc_module_begin(); - add_category_hint( N_("Miscellaneous"), NULL ); - add_integer( "wall-cols", 3, NULL, COLS_TEXT, COLS_LONGTEXT ); - add_integer( "wall-rows", 3, NULL, ROWS_TEXT, ROWS_LONGTEXT ); - add_string( "wall-active", NULL, NULL, ACTIVE_TEXT, ACTIVE_LONGTEXT ); + add_category_hint( N_("Miscellaneous"), NULL, VLC_FALSE ); + add_integer( "wall-cols", 3, NULL, COLS_TEXT, COLS_LONGTEXT, VLC_FALSE ); + add_integer( "wall-rows", 3, NULL, ROWS_TEXT, ROWS_LONGTEXT, VLC_FALSE ); + add_string( "wall-active", NULL, NULL, ACTIVE_TEXT, ACTIVE_LONGTEXT, VLC_FALSE ); set_description( _("image wall video module") ); set_capability( "video filter", 0 ); add_shortcut( "wall" ); diff --git a/modules/video_output/directx/directx.c b/modules/video_output/directx/directx.c index 59988ed3e7..ec754976cb 100644 --- a/modules/video_output/directx/directx.c +++ b/modules/video_output/directx/directx.c @@ -2,7 +2,7 @@ * vout.c: Windows DirectX video output display method ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: directx.c,v 1.12 2003/02/01 18:54:10 sam Exp $ + * $Id: directx.c,v 1.13 2003/02/20 01:52:46 sigmunau Exp $ * * Authors: Gildas Bazin * @@ -104,10 +104,10 @@ static int DirectXGetSurfaceDesc ( vout_thread_t *p_vout, picture_t *p_pic ); "This option doesn't have any effect when using overlays." ) vlc_module_begin(); - add_category_hint( N_("Video"), NULL ); - add_bool( "directx-on-top", 0, NULL, ON_TOP_TEXT, ON_TOP_LONGTEXT ); - add_bool( "directx-hw-yuv", 1, NULL, HW_YUV_TEXT, HW_YUV_LONGTEXT ); - add_bool( "directx-use-sysmem", 0, NULL, SYSMEM_TEXT, SYSMEM_LONGTEXT ); + add_category_hint( N_("Video"), NULL, VLC_FALSE ); + add_bool( "directx-on-top", 0, NULL, ON_TOP_TEXT, ON_TOP_LONGTEXT, VLC_FALSE ); + add_bool( "directx-hw-yuv", 1, NULL, HW_YUV_TEXT, HW_YUV_LONGTEXT, VLC_TRUE ); + add_bool( "directx-use-sysmem", 0, NULL, SYSMEM_TEXT, SYSMEM_LONGTEXT, VLC_TRUE ); set_description( _("DirectX video module") ); set_capability( "video output", 100 ); add_shortcut( "directx" ); diff --git a/modules/video_output/fb.c b/modules/video_output/fb.c index f3d4c25566..17144ba159 100644 --- a/modules/video_output/fb.c +++ b/modules/video_output/fb.c @@ -2,7 +2,7 @@ * fb.c : framebuffer plugin for vlc ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN - * $Id: fb.c,v 1.2 2003/02/15 04:43:19 ipkiss Exp $ + * $Id: fb.c,v 1.3 2003/02/20 01:52:46 sigmunau Exp $ * * Authors: Samuel Hocevar * @@ -65,8 +65,8 @@ static void GfxMode ( int i_tty ); #define FB_DEV_VAR "fbdev" vlc_module_begin(); - add_category_hint( N_("Miscellaneous"), NULL ); - add_string( FB_DEV_VAR, "/dev/fb0", NULL, N_("framebuffer device"), NULL ); + add_category_hint( N_("Frame Buffer"), NULL, VLC_FALSE ); + add_string( FB_DEV_VAR, "/dev/fb0", NULL, N_("framebuffer device"), NULL, VLC_FALSE ); set_description( _("Linux console framebuffer module") ); set_capability( "video output", 30 ); set_callbacks( Create, Destroy ); diff --git a/modules/video_output/ggi.c b/modules/video_output/ggi.c index 4635d5cccc..9a45bfbedc 100644 --- a/modules/video_output/ggi.c +++ b/modules/video_output/ggi.c @@ -2,7 +2,7 @@ * ggi.c : GGI plugin for vlc ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN - * $Id: ggi.c,v 1.3 2003/02/02 00:46:58 sam Exp $ + * $Id: ggi.c,v 1.4 2003/02/20 01:52:46 sigmunau Exp $ * * Authors: Vincent Seguin * Samuel Hocevar @@ -59,8 +59,8 @@ static void SetPalette ( vout_thread_t *, u16 *, u16 *, u16 * ); " environment variable.") vlc_module_begin(); - add_category_hint( N_("Miscellaneous"), NULL ); - add_string( "ggi-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT ); + add_category_hint( N_("Miscellaneous"), NULL, VLC_FALSE ); + add_string( "ggi-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, VLC_TRUE ); set_description( "General Graphics Interface video output" ); set_capability( "video output", 30 ); set_callbacks( Create, Destroy ); diff --git a/modules/video_output/mga/xmga.c b/modules/video_output/mga/xmga.c index 7ee986f568..ce4ae3763f 100644 --- a/modules/video_output/mga/xmga.c +++ b/modules/video_output/mga/xmga.c @@ -2,7 +2,7 @@ * xmga.c : X11 MGA plugin for vlc ***************************************************************************** * Copyright (C) 1998-2001 VideoLAN - * $Id: xmga.c,v 1.2 2003/02/02 00:46:58 sam Exp $ + * $Id: xmga.c,v 1.3 2003/02/20 01:52:46 sigmunau Exp $ * * Authors: Vincent Seguin * Samuel Hocevar @@ -101,9 +101,9 @@ static void ToggleCursor ( vout_thread_t * ); "use the value of the DISPLAY environment variable.") vlc_module_begin(); - add_category_hint( N_("Miscellaneous"), NULL ); - add_string( "xmga-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT ); - add_bool( "xmga-altfullscreen", 0, NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT ); + add_category_hint( N_("Miscellaneous"), NULL, VLC_TRUE ); + add_string( "xmga-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, VLC_TRUE ); + add_bool( "xmga-altfullscreen", 0, NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT, VLC_TRUE ); set_description( _("X11 MGA module") ); set_capability( "video output", 60 ); set_callbacks( Create, Destroy ); diff --git a/modules/video_output/x11/x11.c b/modules/video_output/x11/x11.c index a795522317..0de457c097 100644 --- a/modules/video_output/x11/x11.c +++ b/modules/video_output/x11/x11.c @@ -2,7 +2,7 @@ * x11.c : X11 plugin for vlc ***************************************************************************** * Copyright (C) 1998-2001 VideoLAN - * $Id: x11.c,v 1.4 2003/02/02 00:46:58 sam Exp $ + * $Id: x11.c,v 1.5 2003/02/20 01:52:46 sigmunau Exp $ * * Authors: Vincent Seguin * Samuel Hocevar @@ -59,11 +59,11 @@ extern void E_(Deactivate) ( vlc_object_t * ); "Use shared memory to communicate between VLC and the X server.") vlc_module_begin(); - add_category_hint( N_("X11"), NULL ); - add_string( "x11-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT ); - add_bool( "x11-altfullscreen", 0, NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT ); + add_category_hint( N_("X11"), NULL, VLC_TRUE ); + add_string( "x11-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, VLC_TRUE ); + add_bool( "x11-altfullscreen", 0, NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT, VLC_TRUE ); #ifdef HAVE_SYS_SHM_H - add_bool( "x11-shm", 1, NULL, SHM_TEXT, SHM_LONGTEXT ); + add_bool( "x11-shm", 1, NULL, SHM_TEXT, SHM_LONGTEXT, VLC_TRUE ); #endif set_description( _("X11 module") ); set_capability( "video output", 50 ); diff --git a/modules/video_output/x11/xvideo.c b/modules/video_output/x11/xvideo.c index 882bf265d7..0e1eae7919 100644 --- a/modules/video_output/x11/xvideo.c +++ b/modules/video_output/x11/xvideo.c @@ -2,7 +2,7 @@ * xvideo.c : Xvideo plugin for vlc ***************************************************************************** * Copyright (C) 1998-2001 VideoLAN - * $Id: xvideo.c,v 1.4 2003/02/02 00:46:58 sam Exp $ + * $Id: xvideo.c,v 1.5 2003/02/20 01:52:46 sigmunau Exp $ * * Authors: Shane Harper * Vincent Seguin @@ -70,13 +70,13 @@ extern void E_(Deactivate) ( vlc_object_t * ); "Use shared memory to communicate between VLC and the X server.") vlc_module_begin(); - add_category_hint( N_("XVideo"), NULL ); - add_string( "xvideo-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT ); - add_integer( "xvideo-adaptor", -1, NULL, ADAPTOR_TEXT, ADAPTOR_LONGTEXT ); - add_bool( "xvideo-altfullscreen", 0, NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT ); - add_string( "xvideo-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT ); + add_category_hint( N_("XVideo"), NULL, VLC_TRUE ); + add_string( "xvideo-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, VLC_TRUE ); + add_integer( "xvideo-adaptor", -1, NULL, ADAPTOR_TEXT, ADAPTOR_LONGTEXT, VLC_TRUE ); + add_bool( "xvideo-altfullscreen", 0, NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT, VLC_TRUE ); + add_string( "xvideo-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, VLC_TRUE ); #ifdef HAVE_SYS_SHM_H - add_bool( "xvideo-shm", 1, NULL, SHM_TEXT, SHM_LONGTEXT ); + add_bool( "xvideo-shm", 1, NULL, SHM_TEXT, SHM_LONGTEXT, VLC_TRUE ); #endif set_description( _("XVideo extension module") ); set_capability( "video output", 150 ); diff --git a/modules/visualization/xosd/xosd.c b/modules/visualization/xosd/xosd.c index 23297ed94a..eae258e9da 100644 --- a/modules/visualization/xosd/xosd.c +++ b/modules/visualization/xosd/xosd.c @@ -2,7 +2,7 @@ * xosd.c : X On Screen Display interface ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: xosd.c,v 1.7 2003/02/03 01:32:37 sam Exp $ + * $Id: xosd.c,v 1.8 2003/02/20 01:52:46 sigmunau Exp $ * * Authors: Loïc Minier * @@ -73,13 +73,13 @@ static void Run ( intf_thread_t * ); vlc_module_begin(); int i = getenv( "DISPLAY" ) == NULL ? 10 : 90; - add_category_hint( N_("XOSD module"), NULL ); - add_bool( "xosd-position", 1, NULL, POSITION_TEXT, POSITION_LONGTEXT ); - add_integer( "xosd-text-offset", 0, NULL, TXT_OFS_TEXT, TXT_OFS_LONGTEXT ); + add_category_hint( N_("XOSD module"), NULL, VLC_TRUE ); + add_bool( "xosd-position", 1, NULL, POSITION_TEXT, POSITION_LONGTEXT, VLC_TRUE ); + add_integer( "xosd-text-offset", 0, NULL, TXT_OFS_TEXT, TXT_OFS_LONGTEXT, VLC_TRUE ); add_integer( "xosd-shadow-offset", 1, NULL, - SHD_OFS_TEXT, SHD_OFS_LONGTEXT ); + SHD_OFS_TEXT, SHD_OFS_LONGTEXT, VLC_TRUE ); add_string( "xosd-font", "-misc-fixed-medium-r-*-*-*-300-*-*-*-*-*-*", - NULL, FONT_TEXT, FONT_LONGTEXT ); + NULL, FONT_TEXT, FONT_LONGTEXT, VLC_TRUE ); set_description( _("xosd interface module") ); set_capability( "interface", i ); set_callbacks( Open, Close ); diff --git a/src/libvlc.c b/src/libvlc.c index dbe0e9e2df..62f4774564 100644 --- a/src/libvlc.c +++ b/src/libvlc.c @@ -2,7 +2,7 @@ * libvlc.c: main libvlc source ***************************************************************************** * Copyright (C) 1998-2002 VideoLAN - * $Id: libvlc.c,v 1.65 2003/02/19 10:02:57 gbazin Exp $ + * $Id: libvlc.c,v 1.66 2003/02/20 01:52:46 sigmunau Exp $ * * Authors: Vincent Seguin * Samuel Hocevar @@ -1122,7 +1122,10 @@ static void Usage( vlc_t *p_this, char const *psz_module_name ) char *psz_bra = NULL, *psz_type = NULL, *psz_ket = NULL; char *psz_suf = "", *psz_prefix = NULL; int i; - + if ( p_item->b_advanced && !config_GetInt( p_this, "advanced" )) + { + continue; + } switch( p_item->i_type ) { case CONFIG_HINT_CATEGORY: diff --git a/src/libvlc.h b/src/libvlc.h index a8367e977a..d670dc43f1 100644 --- a/src/libvlc.h +++ b/src/libvlc.h @@ -2,7 +2,7 @@ * libvlc.h: main libvlc header ***************************************************************************** * Copyright (C) 1998-2002 VideoLAN - * $Id: libvlc.h,v 1.43 2003/02/18 18:33:44 titer Exp $ + * $Id: libvlc.h,v 1.44 2003/02/20 01:52:46 sigmunau Exp $ * * Authors: Vincent Seguin * Samuel Hocevar @@ -60,6 +60,11 @@ static char *ppsz_sout_vcodec[] = { "", "mpeg1", "mpeg2", "mpeg4", NULL }; "When this option is turned on, the messages sent to the console will " \ "be colorized. Your terminal needs Linux color support for this to work.") +#define ADVANCED_TEXT N_("show advanced options") +#define ADVANCED_LONGTEXT N_( \ + "When this option is turned on, the interfaces will show all the " \ + "available options, including those that most users should never touch") + #define INTF_PATH_TEXT N_("interface default search path") #define INTF_PATH_LONGTEXT N_( \ "This option allows you to set the default path that the interface will " \ @@ -430,138 +435,139 @@ static char *ppsz_sout_vcodec[] = { "", "mpeg1", "mpeg2", "mpeg4", NULL }; vlc_module_begin(); /* Interface options */ - add_category_hint( N_("Interface"), NULL); + add_category_hint( N_("Interface"), NULL, VLC_FALSE ); add_module_with_short( "intf", 'I', "interface", NULL, NULL, - INTF_TEXT, INTF_LONGTEXT ); - add_string( "extraintf", NULL, NULL, EXTRAINTF_TEXT, EXTRAINTF_LONGTEXT ); + INTF_TEXT, INTF_LONGTEXT, VLC_TRUE ); + add_string( "extraintf", NULL, NULL, EXTRAINTF_TEXT, EXTRAINTF_LONGTEXT, VLC_TRUE ); add_integer_with_short( "verbose", 'v', -1, NULL, - VERBOSE_TEXT, VERBOSE_LONGTEXT ); - add_bool_with_short( "quiet", 'q', 0, NULL, QUIET_TEXT, QUIET_LONGTEXT ); - add_bool( "color", 0, NULL, COLOR_TEXT, COLOR_LONGTEXT ); - add_string( "search-path", NULL, NULL, INTF_PATH_TEXT, INTF_PATH_LONGTEXT ); + VERBOSE_TEXT, VERBOSE_LONGTEXT, VLC_FALSE ); + add_bool_with_short( "quiet", 'q', 0, NULL, QUIET_TEXT, QUIET_LONGTEXT, VLC_TRUE ); + add_bool( "color", 0, NULL, COLOR_TEXT, COLOR_LONGTEXT, VLC_TRUE ); + add_bool( "advanced", 0, NULL, ADVANCED_TEXT, ADVANCED_LONGTEXT, VLC_FALSE ); + add_string( "search-path", NULL, NULL, INTF_PATH_TEXT, INTF_PATH_LONGTEXT, VLC_TRUE ); add_string( "plugin-path", NULL, NULL, - PLUGIN_PATH_TEXT, PLUGIN_PATH_LONGTEXT ); + PLUGIN_PATH_TEXT, PLUGIN_PATH_LONGTEXT, VLC_TRUE ); /* Audio options */ - add_category_hint( N_("Audio"), NULL); + add_category_hint( N_("Audio"), NULL, VLC_FALSE ); add_module_with_short( "aout", 'A', "audio output", NULL, NULL, - AOUT_TEXT, AOUT_LONGTEXT ); - add_bool( "audio", 1, NULL, AUDIO_TEXT, AUDIO_LONGTEXT ); + AOUT_TEXT, AOUT_LONGTEXT, VLC_FALSE ); + add_bool( "audio", 1, NULL, AUDIO_TEXT, AUDIO_LONGTEXT, VLC_TRUE ); add_integer_with_range( "volume", AOUT_VOLUME_DEFAULT, AOUT_VOLUME_MIN, AOUT_VOLUME_MAX, NULL, VOLUME_TEXT, - VOLUME_LONGTEXT ); + VOLUME_LONGTEXT, VLC_FALSE ); add_integer_with_range( "saved-volume", AOUT_VOLUME_DEFAULT, AOUT_VOLUME_MIN, AOUT_VOLUME_MAX, NULL, - VOLUME_SAVE_TEXT, VOLUME_SAVE_LONGTEXT ); - add_integer( "aout-rate", -1, NULL, AOUT_RATE_TEXT, AOUT_RATE_LONGTEXT ); - add_integer( "desync", 0, NULL, DESYNC_TEXT, DESYNC_LONGTEXT ); - add_bool( "headphone", 0, NULL, HEADPHONE_TEXT, HEADPHONE_LONGTEXT ); + VOLUME_SAVE_TEXT, VOLUME_SAVE_LONGTEXT, VLC_TRUE ); + add_integer( "aout-rate", -1, NULL, AOUT_RATE_TEXT, AOUT_RATE_LONGTEXT, VLC_TRUE ); + add_integer( "desync", 0, NULL, DESYNC_TEXT, DESYNC_LONGTEXT, VLC_TRUE ); + add_bool( "headphone", 0, NULL, HEADPHONE_TEXT, HEADPHONE_LONGTEXT, VLC_FALSE ); add_integer( "headphone-dim", 5, NULL, HEADPHONE_DIM_TEXT, - HEADPHONE_DIM_LONGTEXT ); + HEADPHONE_DIM_LONGTEXT, VLC_TRUE ); /* Video options */ - add_category_hint( N_("Video"), NULL ); + add_category_hint( N_("Video"), NULL, VLC_FALSE ); add_module_with_short( "vout", 'V', "video output", NULL, NULL, - VOUT_TEXT, VOUT_LONGTEXT ); - add_bool( "video", 1, NULL, VIDEO_TEXT, VIDEO_LONGTEXT ); - add_integer( "width", -1, NULL, WIDTH_TEXT, WIDTH_LONGTEXT ); - add_integer( "height", -1, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT ); - add_float( "zoom", 1, NULL, ZOOM_TEXT, ZOOM_LONGTEXT ); - add_bool( "grayscale", 0, NULL, GRAYSCALE_TEXT, GRAYSCALE_LONGTEXT ); - add_bool( "fullscreen", 0, NULL, FULLSCREEN_TEXT, FULLSCREEN_LONGTEXT ); - add_bool( "overlay", 1, NULL, OVERLAY_TEXT, OVERLAY_LONGTEXT ); - add_integer( "spumargin", -1, NULL, SPUMARGIN_TEXT, SPUMARGIN_LONGTEXT ); + VOUT_TEXT, VOUT_LONGTEXT, VLC_FALSE ); + add_bool( "video", 1, NULL, VIDEO_TEXT, VIDEO_LONGTEXT, VLC_TRUE ); + add_integer( "width", -1, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, VLC_TRUE ); + add_integer( "height", -1, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT, VLC_TRUE ); + add_float( "zoom", 1, NULL, ZOOM_TEXT, ZOOM_LONGTEXT, VLC_TRUE ); + add_bool( "grayscale", 0, NULL, GRAYSCALE_TEXT, GRAYSCALE_LONGTEXT, VLC_TRUE ); + add_bool( "fullscreen", 0, NULL, FULLSCREEN_TEXT, FULLSCREEN_LONGTEXT, VLC_FALSE ); + add_bool( "overlay", 1, NULL, OVERLAY_TEXT, OVERLAY_LONGTEXT, VLC_TRUE ); + add_integer( "spumargin", -1, NULL, SPUMARGIN_TEXT, SPUMARGIN_LONGTEXT, VLC_TRUE ); add_module( "filter", "video filter", NULL, NULL, - FILTER_TEXT, FILTER_LONGTEXT ); + FILTER_TEXT, FILTER_LONGTEXT, VLC_TRUE ); add_string( "aspect-ratio", "", NULL, - ASPECT_RATIO_TEXT, ASPECT_RATIO_TEXT ); + ASPECT_RATIO_TEXT, ASPECT_RATIO_TEXT, VLC_TRUE ); #if 0 add_string( "pixel-ratio", "1", NULL, PIXEL_RATIO_TEXT, PIXEL_RATIO_TEXT ); #endif /* Input options */ - add_category_hint( N_("Input"), NULL ); + add_category_hint( N_("Input"), NULL, VLC_FALSE ); add_integer( "server-port", 1234, NULL, - SERVER_PORT_TEXT, SERVER_PORT_LONGTEXT ); + SERVER_PORT_TEXT, SERVER_PORT_LONGTEXT, VLC_FALSE ); add_bool( "network-channel", 0, NULL, - NETCHANNEL_TEXT, NETCHANNEL_LONGTEXT ); + NETCHANNEL_TEXT, NETCHANNEL_LONGTEXT, VLC_TRUE ); add_string( "channel-server", "localhost", NULL, - CHAN_SERV_TEXT, CHAN_SERV_LONGTEXT ); + CHAN_SERV_TEXT, CHAN_SERV_LONGTEXT, VLC_TRUE ); add_integer( "channel-port", 6010, NULL, - CHAN_PORT_TEXT, CHAN_PORT_LONGTEXT ); - add_integer( "mtu", 1500, NULL, MTU_TEXT, MTU_LONGTEXT ); + CHAN_PORT_TEXT, CHAN_PORT_LONGTEXT, VLC_TRUE ); + add_integer( "mtu", 1500, NULL, MTU_TEXT, MTU_LONGTEXT, VLC_TRUE ); #ifdef SYS_DARWIN - add_string( "iface", "en0", NULL, IFACE_TEXT, IFACE_LONGTEXT ); + add_string( "iface", "en0", NULL, IFACE_TEXT, IFACE_LONGTEXT, VLC_TRUE ); #else - add_string( "iface", "eth0", NULL, IFACE_TEXT, IFACE_LONGTEXT ); + add_string( "iface", "eth0", NULL, IFACE_TEXT, IFACE_LONGTEXT, VLC_TRUE ); #endif - add_string( "iface-addr", "", NULL, IFACE_ADDR_TEXT, IFACE_ADDR_LONGTEXT ); - add_integer( "ttl", 1, NULL, TTL_TEXT, TTL_LONGTEXT ); + add_string( "iface-addr", "", NULL, IFACE_ADDR_TEXT, IFACE_ADDR_LONGTEXT, VLC_TRUE ); + add_integer( "ttl", 1, NULL, TTL_TEXT, TTL_LONGTEXT, VLC_TRUE ); add_integer( "program", 0, NULL, - INPUT_PROGRAM_TEXT, INPUT_PROGRAM_LONGTEXT ); + INPUT_PROGRAM_TEXT, INPUT_PROGRAM_LONGTEXT, VLC_TRUE ); add_integer( "audio-type", -1, NULL, - INPUT_AUDIO_TEXT, INPUT_AUDIO_LONGTEXT ); + INPUT_AUDIO_TEXT, INPUT_AUDIO_LONGTEXT, VLC_TRUE ); add_integer( "audio-channel", -1, NULL, - INPUT_CHAN_TEXT, INPUT_CHAN_LONGTEXT ); + INPUT_CHAN_TEXT, INPUT_CHAN_LONGTEXT, VLC_TRUE ); add_integer( "spu-channel", -1, NULL, - INPUT_SUBT_TEXT, INPUT_SUBT_LONGTEXT ); + INPUT_SUBT_TEXT, INPUT_SUBT_LONGTEXT, VLC_TRUE ); - add_string( "dvd", DVD_DEVICE, NULL, DVD_DEV_TEXT, DVD_DEV_LONGTEXT ); - add_string( "vcd", VCD_DEVICE, NULL, VCD_DEV_TEXT, VCD_DEV_LONGTEXT ); + add_string( "dvd", DVD_DEVICE, NULL, DVD_DEV_TEXT, DVD_DEV_LONGTEXT, VLC_FALSE ); + add_string( "vcd", VCD_DEVICE, NULL, VCD_DEV_TEXT, VCD_DEV_LONGTEXT, VLC_FALSE ); - add_bool_with_short( "ipv6", '6', 0, NULL, IPV6_TEXT, IPV6_LONGTEXT ); - add_bool_with_short( "ipv4", '4', 0, NULL, IPV4_TEXT, IPV4_LONGTEXT ); + add_bool_with_short( "ipv6", '6', 0, NULL, IPV6_TEXT, IPV6_LONGTEXT, VLC_FALSE ); + add_bool_with_short( "ipv4", '4', 0, NULL, IPV4_TEXT, IPV4_LONGTEXT, VLC_FALSE ); /* Decoder options */ - add_category_hint( N_("Decoders"), NULL ); - add_module( "codec", "decoder", NULL, NULL, CODEC_TEXT, CODEC_LONGTEXT ); + add_category_hint( N_("Decoders"), NULL, VLC_TRUE ); + add_module( "codec", "decoder", NULL, NULL, CODEC_TEXT, CODEC_LONGTEXT, VLC_TRUE ); - add_category_hint( N_("Encoders"), NULL ); - add_module( "video-encoder", "video encoder", NULL, NULL, ENCODER_VIDEO_TEXT, ENCODER_VIDEO_LONGTEXT ); - add_module( "audio-encoder", "audio encoder", NULL, NULL, ENCODER_AUDIO_TEXT, ENCODER_AUDIO_LONGTEXT ); + add_category_hint( N_("Encoders"), NULL, VLC_TRUE ); + add_module( "video-encoder", "video encoder", NULL, NULL, ENCODER_VIDEO_TEXT, ENCODER_VIDEO_LONGTEXT, VLC_TRUE ); + add_module( "audio-encoder", "audio encoder", NULL, NULL, ENCODER_AUDIO_TEXT, ENCODER_AUDIO_LONGTEXT, VLC_TRUE ); /* Stream output options */ - add_category_hint( N_("Stream output"), NULL ); - add_string( "sout", NULL, NULL, SOUT_TEXT, SOUT_LONGTEXT ); - add_bool( "sout-audio", 1, NULL, SOUT_AUDIO_TEXT, SOUT_AUDIO_LONGTEXT ); - add_bool( "sout-video", 1, NULL, SOUT_VIDEO_TEXT, SOUT_VIDEO_LONGTEXT ); - add_string_from_list( "sout-acodec", "", ppsz_sout_acodec, NULL, SOUT_ACODEC_TEXT, SOUT_ACODEC_LONGTEXT ); - add_string_from_list( "sout-vcodec", "", ppsz_sout_vcodec, NULL, SOUT_VCODEC_TEXT, SOUT_VCODEC_LONGTEXT ); + add_category_hint( N_("Stream output"), NULL, VLC_TRUE ); + add_string( "sout", NULL, NULL, SOUT_TEXT, SOUT_LONGTEXT, VLC_TRUE ); + add_bool( "sout-audio", 1, NULL, SOUT_AUDIO_TEXT, SOUT_AUDIO_LONGTEXT, VLC_TRUE ); + add_bool( "sout-video", 1, NULL, SOUT_VIDEO_TEXT, SOUT_VIDEO_LONGTEXT, VLC_TRUE ); + add_string_from_list( "sout-acodec", "", ppsz_sout_acodec, NULL, SOUT_ACODEC_TEXT, SOUT_ACODEC_LONGTEXT, VLC_TRUE ); + add_string_from_list( "sout-vcodec", "", ppsz_sout_vcodec, NULL, SOUT_VCODEC_TEXT, SOUT_VCODEC_LONGTEXT, VLC_TRUE ); add_module( "packetizer", "packetizer", NULL, NULL, - PACKETIZER_TEXT, PACKETIZER_LONGTEXT ); - add_module( "mux", "sout mux", NULL, NULL, MUX_TEXT, MUX_LONGTEXT ); + PACKETIZER_TEXT, PACKETIZER_LONGTEXT, VLC_TRUE ); + add_module( "mux", "sout mux", NULL, NULL, MUX_TEXT, MUX_LONGTEXT, VLC_TRUE ); add_module( "access_output", "sout access", NULL, NULL, - ACCESS_OUTPUT_TEXT, ACCESS_OUTPUT_LONGTEXT ); + ACCESS_OUTPUT_TEXT, ACCESS_OUTPUT_LONGTEXT, VLC_TRUE ); /* CPU options */ - add_category_hint( N_("CPU"), NULL ); + add_category_hint( N_("CPU"), NULL, VLC_FALSE ); #if defined( __i386__ ) - add_bool( "mmx", 1, NULL, MMX_TEXT, MMX_LONGTEXT ); - add_bool( "3dn", 1, NULL, THREE_DN_TEXT, THREE_DN_LONGTEXT ); - add_bool( "mmxext", 1, NULL, MMXEXT_TEXT, MMXEXT_LONGTEXT ); - add_bool( "sse", 1, NULL, SSE_TEXT, SSE_LONGTEXT ); + add_bool( "mmx", 1, NULL, MMX_TEXT, MMX_LONGTEXT, VLC_FALSE ); + add_bool( "3dn", 1, NULL, THREE_DN_TEXT, THREE_DN_LONGTEXT, VLC_FALSE ); + add_bool( "mmxext", 1, NULL, MMXEXT_TEXT, MMXEXT_LONGTEXT, VLC_FALSE ); + add_bool( "sse", 1, NULL, SSE_TEXT, SSE_LONGTEXT, VLC_FALSE ); #endif #if defined( __powerpc__ ) || defined( SYS_DARWIN ) - add_bool( "altivec", 1, NULL, ALTIVEC_TEXT, ALTIVEC_LONGTEXT ); + add_bool( "altivec", 1, NULL, ALTIVEC_TEXT, ALTIVEC_LONGTEXT, VLC_FALSE ); #endif /* Playlist options */ - add_category_hint( N_("Playlist"), NULL ); - add_bool_with_short( "random", 'Z', 0, NULL, RANDOM_TEXT, RANDOM_LONGTEXT ); - add_bool( "playlist", 0, NULL, LAUNCH_TEXT, LAUNCH_LONGTEXT ); - add_bool( "enqueue", 0, NULL, ENQUEUE_TEXT, ENQUEUE_LONGTEXT ); - add_bool( "loop", 0, NULL, LOOP_TEXT, LOOP_LONGTEXT ); + add_category_hint( N_("Playlist"), NULL, VLC_FALSE ); + add_bool_with_short( "random", 'Z', 0, NULL, RANDOM_TEXT, RANDOM_LONGTEXT, VLC_FALSE ); + add_bool( "playlist", 0, NULL, LAUNCH_TEXT, LAUNCH_LONGTEXT, VLC_FALSE ); + add_bool( "enqueue", 0, NULL, ENQUEUE_TEXT, ENQUEUE_LONGTEXT, VLC_FALSE ); + add_bool( "loop", 0, NULL, LOOP_TEXT, LOOP_LONGTEXT, VLC_FALSE ); /* Misc options */ - add_category_hint( N_("Miscellaneous"), NULL ); - add_module( "memcpy", "memcpy", NULL, NULL, MEMCPY_TEXT, MEMCPY_LONGTEXT ); - add_module( "access", "access", NULL, NULL, ACCESS_TEXT, ACCESS_LONGTEXT ); - add_module( "demux", "demux", NULL, NULL, DEMUX_TEXT, DEMUX_LONGTEXT ); + add_category_hint( N_("Miscellaneous"), NULL, VLC_TRUE ); + add_module( "memcpy", "memcpy", NULL, NULL, MEMCPY_TEXT, MEMCPY_LONGTEXT, VLC_TRUE ); + add_module( "access", "access", NULL, NULL, ACCESS_TEXT, ACCESS_LONGTEXT, VLC_TRUE ); + add_module( "demux", "demux", NULL, NULL, DEMUX_TEXT, DEMUX_LONGTEXT, VLC_TRUE ); #if defined(WIN32) - add_bool( "fast-mutex", 0, NULL, FAST_MUTEX_TEXT, FAST_MUTEX_LONGTEXT ); - add_integer( "win9x-cv-method", 0, NULL, WIN9X_CV_TEXT, WIN9X_CV_LONGTEXT ); + add_bool( "fast-mutex", 0, NULL, FAST_MUTEX_TEXT, FAST_MUTEX_LONGTEXT, VLC_TRUE ); + add_integer( "win9x-cv-method", 0, NULL, WIN9X_CV_TEXT, WIN9X_CV_LONGTEXT, VLC_TRUE ); #endif /* Usage (mainly useful for cmd line stuff) */ diff --git a/src/misc/configuration.c b/src/misc/configuration.c index 04efb87638..4f8235bdba 100644 --- a/src/misc/configuration.c +++ b/src/misc/configuration.c @@ -2,7 +2,7 @@ * configuration.c management of the modules configuration ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: configuration.c,v 1.50 2003/01/30 20:59:36 sam Exp $ + * $Id: configuration.c,v 1.51 2003/02/20 01:52:47 sigmunau Exp $ * * Authors: Gildas Bazin * @@ -391,6 +391,7 @@ void config_Duplicate( module_t *p_module, module_config_t *p_orig ) p_module->p_config[i].f_min = p_orig[i].f_min; p_module->p_config[i].f_max = p_orig[i].f_max; p_module->p_config[i].b_dirty = p_orig[i].b_dirty; + p_module->p_config[i].b_advanced = p_orig[i].b_advanced; p_module->p_config[i].psz_type = p_orig[i].psz_type ? strdup( _(p_orig[i].psz_type) ) : NULL; -- 2.39.2