Commit 0170377d authored by gbazin's avatar gbazin

* changed ADD_BOOL and ADD_BOOL_WITH_SHORT config macros to accept a
default value as an argument.
* modified the command line parsing to accept --foo and --no-foo when a
"foo" boolean config option is defined.
* modified the help menu to indicate if the option is enabled or
disabled by default.
parent 9df1a97b
......@@ -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.10 2002/05/03 20:49:30 sam Exp $
* $Id: configuration.h,v 1.11 2002/05/30 08:17:04 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -141,27 +141,25 @@ void config_UnsetCallbacks( module_config_t * );
#define ADD_FLOAT( name, f_value, p_callback, text, longtext ) \
{ MODULE_CONFIG_ITEM_FLOAT, name, '\0', text, longtext, NULL, 0, f_value, \
p_callback, NULL, 0 },
#define ADD_BOOL( name, p_callback, text, longtext ) \
{ MODULE_CONFIG_ITEM_BOOL, name, '\0', text, longtext, NULL, 0, 0, \
#define ADD_BOOL( name, b_value, p_callback, text, longtext ) \
{ MODULE_CONFIG_ITEM_BOOL, name, '\0', text, longtext, NULL, b_value, 0, \
p_callback, NULL, 0 },
#define ADD_STRING_WITH_SHORT( name, ch, value, p_callback, text, longtext ) \
{ MODULE_CONFIG_ITEM_STRING, name, ch, text, longtext, value, 0, 0, \
#define ADD_STRING_WITH_SHORT( name, ch, psz_value, p_callback, text, ltext ) \
{ MODULE_CONFIG_ITEM_STRING, name, ch, text, ltext, psz_value, 0, 0, \
p_callback, NULL, 0 },
#define ADD_FILE_WITH_SHORT( name, ch, psz_value, p_callback, text, longtext ) \
{ MODULE_CONFIG_ITEM_FILE, name, ch, text, longtext, psz_value, 0, 0, \
#define ADD_FILE_WITH_SHORT( name, ch, psz_value, p_callback, text, ltext ) \
{ MODULE_CONFIG_ITEM_FILE, name, ch, text, ltext, psz_value, 0, 0, \
p_callback, NULL, 0 },
#define ADD_MODULE_WITH_SHORT( name, ch, i_capability, psz_value, p_callback, \
text, longtext) \
{ MODULE_CONFIG_ITEM_MODULE, name, ch, text, longtext, psz_value, \
text, ltext) \
{ MODULE_CONFIG_ITEM_MODULE, name, ch, text, ltext, psz_value, \
i_capability, 0, p_callback, NULL, 0 },
#define ADD_INTEGER_WITH_SHORT( name, ch, i_value, p_callback, text, \
longtext ) \
{ MODULE_CONFIG_ITEM_INTEGER, name, ch, text, longtext, NULL, i_value, 0, \
#define ADD_INTEGER_WITH_SHORT( name, ch, i_value, p_callback, text, ltext ) \
{ MODULE_CONFIG_ITEM_INTEGER, name, ch, text, ltext, NULL, i_value, 0, \
p_callback, NULL, 0 },
#define ADD_FLOAT_WITH_SHORT( name, f_value, p_callback, text, longtext ) \
{ MODULE_CONFIG_ITEM_FLOAT, name, ch, text, longtext, NULL, 0, f_value, \
#define ADD_FLOAT_WITH_SHORT( name, ch, f_value, p_callback, text, ltext ) \
{ MODULE_CONFIG_ITEM_FLOAT, name, ch, text, ltext, NULL, 0, f_value, \
p_callback, NULL, 0 },
#define ADD_BOOL_WITH_SHORT( name, ch, p_callback, text, longtext ) \
{ MODULE_CONFIG_ITEM_BOOL, name, ch, text, longtext, NULL, 0, 0, \
#define ADD_BOOL_WITH_SHORT( name, ch, b_value, p_callback, text, ltext ) \
{ MODULE_CONFIG_ITEM_BOOL, name, ch, text, ltext, NULL, b_value, 0, \
p_callback, NULL, 0 },
......@@ -2,7 +2,7 @@
* modules.h : Module management functions.
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: modules.h,v 1.50 2002/05/18 17:47:46 sam Exp $
* $Id: modules.h,v 1.51 2002/05/30 08:17:04 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -132,6 +132,7 @@ typedef struct module_s
struct module_config_s *p_config; /* Module configuration structure */
vlc_mutex_t config_lock; /* lock used to modify the config */
unsigned int i_config_items; /* number of configuration items */
unsigned int i_bool_items; /* number of bool config items */
/*
* Variables used internally by the module manager
......
......@@ -2,7 +2,7 @@
* modules_inner.h : Macros used from within a module.
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: modules_inner.h,v 1.21 2002/05/22 17:17:45 sam Exp $
* $Id: modules_inner.h,v 1.22 2002/05/30 08:17:04 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -93,13 +93,15 @@
#define MODULE_INIT_STOP \
} while( 0 ); \
p_module->pp_shortcuts[ i_shortcut ] = NULL; \
p_module->i_config_items = 0; \
p_module->i_config_items = p_module->i_bool_items = 0; \
for( p_item = p_config; \
p_item->i_type != MODULE_CONFIG_HINT_END; \
p_item++ ) \
{ \
if( p_item->i_type & MODULE_CONFIG_ITEM ) \
p_module->i_config_items++; \
if( p_item->i_type == MODULE_CONFIG_ITEM_BOOL ) \
p_module->i_bool_items++; \
} \
vlc_mutex_init( &p_module->config_lock ); \
p_module->p_config = config_Duplicate( p_config ); \
......
......@@ -4,7 +4,7 @@
* (http://liba52.sf.net/).
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: a52.c,v 1.13 2002/05/27 16:01:42 fenrir Exp $
* $Id: a52.c,v 1.14 2002/05/30 08:17:04 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -72,7 +72,7 @@ void _M( adec_getfunctions )( function_list_t * p_function_list )
/*****************************************************************************
* Build configuration structure.
*****************************************************************************/
#define DYNRNG_TEXT N_("disable A/52 dynamic range compression")
#define DYNRNG_TEXT N_("A/52 dynamic range compression")
#define DYNRNG_LONGTEXT N_( \
"Dynamic range compression makes the loud sounds softer, and the soft " \
"sounds louder, so you can more easily listen to the stream in a noisy " \
......@@ -82,7 +82,7 @@ void _M( adec_getfunctions )( function_list_t * p_function_list )
MODULE_CONFIG_START
ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL )
ADD_BOOL ( "a52-no-dynrng", NULL, DYNRNG_TEXT, DYNRNG_LONGTEXT )
ADD_BOOL ( "a52-dynrng", 1, NULL, DYNRNG_TEXT, DYNRNG_LONGTEXT )
MODULE_CONFIG_STOP
MODULE_INIT_START
......@@ -209,7 +209,7 @@ static int InitThread( a52_adec_thread_t * p_a52_adec )
return -1;
}
p_a52_adec->b_dynrng = !config_GetIntVariable( "a52-no-dynrng" );
p_a52_adec->b_dynrng = config_GetIntVariable( "a52-dynrng" );
/* Init the BitStream */
InitBitstream( &p_a52_adec->bit_stream,
......
......@@ -2,7 +2,7 @@
* vout_beos.cpp: beos video output display method
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: vout_beos.cpp,v 1.57 2002/05/22 12:23:41 tcastley Exp $
* $Id: vout_beos.cpp,v 1.58 2002/05/30 08:17:04 gbazin Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -279,7 +279,7 @@ int VideoWindow::SelectDrawingMode(int width, int height)
{
int drawingMode = BITMAP;
int noOverlay = config_GetIntVariable( "nooverlay" );
int noOverlay = !config_GetIntVariable( "overlay" );
for (int i = 0; i < COLOR_COUNT; i++)
{
if (noOverlay) break;
......
......@@ -2,7 +2,7 @@
* directx.c : Windows DirectX plugin for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: directx.c,v 1.9 2002/05/22 19:31:33 gbazin Exp $
* $Id: directx.c,v 1.10 2002/05/30 08:17:04 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -43,11 +43,11 @@ void _M( vout_getfunctions )( function_list_t * p_function_list );
/*****************************************************************************
* Building configuration tree
*****************************************************************************/
#define HW_YUV_TEXT N_("Disable hardware YUV->RGB conversions")
#define HW_YUV_TEXT N_("use hardware YUV->RGB conversions")
#define HW_YUV_LONGTEXT N_( \
"Don't try to use hardware acceleration for YUV->RGB conversions. This " \
"option doesn't have any effect when using overlays." )
#define SYSMEM_TEXT N_("Use video buffers in system memory")
"Try to use hardware acceleration for YUV->RGB conversions. " \
"This option doesn't have any effect when using overlays." )
#define SYSMEM_TEXT N_("use video buffers in system memory")
#define SYSMEM_LONGTEXT N_( \
"Create video buffers in system memory instead of video memory. This " \
"isn't recommended as usually using video memory allows to benefit from " \
......@@ -56,9 +56,8 @@ void _M( vout_getfunctions )( function_list_t * p_function_list );
MODULE_CONFIG_START
ADD_CATEGORY_HINT( N_("Video"), NULL )
ADD_BOOL ( "no-directx-hw-yuv", NULL, HW_YUV_TEXT, HW_YUV_LONGTEXT )
ADD_BOOL ( "directx-use-sysmem", NULL, SYSMEM_TEXT, SYSMEM_LONGTEXT )
ADD_CATEGORY_HINT( N_("Audio"), NULL )
ADD_BOOL ( "directx-hw-yuv", 1, NULL, HW_YUV_TEXT, HW_YUV_LONGTEXT )
ADD_BOOL ( "directx-use-sysmem", 0, NULL, SYSMEM_TEXT, SYSMEM_LONGTEXT )
MODULE_CONFIG_STOP
MODULE_INIT_START
......
......@@ -2,7 +2,7 @@
* vout_directx.c: Windows DirectX video output display method
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: vout_directx.c,v 1.35 2002/05/18 22:41:43 gbazin Exp $
* $Id: vout_directx.c,v 1.36 2002/05/30 08:17:04 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -128,9 +128,9 @@ static int vout_Create( vout_thread_t *p_vout )
p_vout->p_sys->b_event_thread_die = 0;
p_vout->p_sys->b_caps_overlay_clipping = 0;
SetRectEmpty( &p_vout->p_sys->rect_display );
p_vout->p_sys->b_using_overlay = !config_GetIntVariable( "nooverlay" );
p_vout->p_sys->b_using_overlay = config_GetIntVariable( "overlay" );
p_vout->p_sys->b_use_sysmem = config_GetIntVariable( "directx-use-sysmem");
p_vout->p_sys->b_hw_yuv = !config_GetIntVariable( "no-directx-hw-yuv" );
p_vout->p_sys->b_hw_yuv = config_GetIntVariable( "directx-hw-yuv" );
p_vout->p_sys->b_cursor_hidden = 0;
p_vout->p_sys->i_lastmoved = mdate();
......
......@@ -2,7 +2,7 @@
* wall.c : Wall video plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: wall.c,v 1.19 2002/05/28 22:49:25 sam Exp $
* $Id: wall.c,v 1.20 2002/05/30 08:17:04 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -153,7 +153,6 @@ static int vout_Create( vout_thread_t *p_vout )
if( p_vout->p_sys->pp_vout == NULL )
{
intf_ErrMsg("error: %s", strerror(ENOMEM) );
free( psz_method_tmp );
free( p_vout->p_sys );
return( 1 );
}
......
......@@ -2,7 +2,7 @@
* gnome.c : Gnome plugin for vlc
*****************************************************************************
* Copyright (C) 2000 VideoLAN
* $Id: gnome.c,v 1.21 2002/05/22 14:20:41 gbazin Exp $
* $Id: gnome.c,v 1.22 2002/05/30 08:17:04 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -61,10 +61,11 @@ static gint GnomeManage ( gpointer p_data );
/*****************************************************************************
* Building configuration tree
*****************************************************************************/
#define TOOLTIPS_TEXT N_("hide tooltips")
#define TOOLTIPS_LONGTEXT N_("Do not show tooltips for configuration options.")
#define TOOLBAR_TEXT N_("hide text on toolbar buttons")
#define TOOLBAR_LONGTEXT N_("Do not show the text below icons on the toolbar.")
#define TOOLTIPS_TEXT N_("show tooltips")
#define TOOLTIPS_LONGTEXT N_("Show tooltips for configuration options.")
#define TOOLBAR_TEXT N_("show text on toolbar buttons")
#define TOOLBAR_LONGTEXT N_("Show the text below icons on the toolbar.")
#define PREFS_MAXH_TEXT N_("maximum height for the configuration windows")
#define PREFS_MAXH_LONGTEXT N_( \
......@@ -72,13 +73,13 @@ static gint GnomeManage ( gpointer p_data );
"preferences menu will occupy.")
MODULE_CONFIG_START
ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL )
ADD_BOOL ( "gnome-notooltips", GtkHideTooltips, TOOLTIPS_TEXT,
TOOLTIPS_LONGTEXT )
ADD_BOOL ( "gnome-notoolbartext", GtkHideToolbarText, TOOLBAR_TEXT,
TOOLBAR_LONGTEXT )
ADD_INTEGER ( "gnome-prefs-maxh", 480, NULL, PREFS_MAXH_TEXT,
PREFS_MAXH_LONGTEXT )
ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL )
ADD_BOOL ( "gnome-tooltips", 1, GtkHideTooltips, TOOLTIPS_TEXT,
TOOLTIPS_LONGTEXT )
ADD_BOOL ( "gnome-toolbartext", GtkHideToolbarText, TOOLBAR_TEXT,
TOOLBAR_LONGTEXT )
ADD_INTEGER( "gnome-prefs-maxh", 480, NULL, PREFS_MAXH_TEXT,
PREFS_MAXH_LONGTEXT )
MODULE_CONFIG_STOP
MODULE_INIT_START
......@@ -272,11 +273,11 @@ static void intf_Run( intf_thread_t *p_intf )
p_intf->p_sys->p_tooltips = gtk_tooltips_new();
/* Hide tooltips if the option is set */
if( config_GetIntVariable( "gnome-notooltips" ) )
if( !config_GetIntVariable( "gnome-tooltips" ) )
gtk_tooltips_disable( p_intf->p_sys->p_tooltips );
/* Hide toolbar text of the option is set */
if ( config_GetIntVariable( "gnome-notoolbartext" ) )
if( !config_GetIntVariable( "gnome-toolbartext" ) )
gtk_toolbar_set_style(
GTK_TOOLBAR(lookup_widget( p_intf->p_sys->p_window, "toolbar" )),
GTK_TOOLBAR_ICONS );
......
......@@ -2,7 +2,7 @@
* gtk.c : Gtk+ plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: gtk.c,v 1.22 2002/05/20 22:39:36 sam Exp $
* $Id: gtk.c,v 1.23 2002/05/30 08:17:04 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -62,8 +62,8 @@ static gint GtkManage ( gpointer p_data );
/*****************************************************************************
* Building configuration tree
*****************************************************************************/
#define TOOLTIPS_TEXT N_("hide tooltips")
#define TOOLTIPS_LONGTEXT N_("Do not show tooltips for configuration options.")
#define TOOLTIPS_TEXT N_("show tooltips")
#define TOOLTIPS_LONGTEXT N_("Show tooltips for configuration options.")
#define PREFS_MAXH_TEXT N_("maximum height for the configuration windows")
#define PREFS_MAXH_LONGTEXT N_( \
......@@ -71,11 +71,9 @@ static gint GtkManage ( gpointer p_data );
"preferences menu will occupy.")
MODULE_CONFIG_START
ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL )
ADD_BOOL ( "gtk-notooltips", GtkHideTooltips, TOOLTIPS_TEXT,
TOOLTIPS_LONGTEXT )
ADD_INTEGER ( "gtk-prefs-maxh", 480, NULL, PREFS_MAXH_TEXT,
PREFS_MAXH_LONGTEXT )
ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL )
ADD_BOOL( "gtk-tooltips", 1, GtkHideTooltips, TOOLTIPS_TEXT, TOOLTIPS_LONGTEXT)
ADD_INTEGER( "gtk-prefs-maxh", 480, NULL, PREFS_MAXH_TEXT, PREFS_MAXH_LONGTEXT)
MODULE_CONFIG_STOP
MODULE_INIT_START
......@@ -271,7 +269,7 @@ static void intf_Run( intf_thread_t *p_intf )
p_intf->p_sys->p_jump = NULL;
/* Hide tooltips if the option is set */
if( config_GetIntVariable( "gtk-notooltips" ) )
if( !config_GetIntVariable( "gtk-tooltips" ) )
gtk_tooltips_disable( p_intf->p_sys->p_tooltips );
/* Store p_intf to keep an eye on it */
......
......@@ -2,7 +2,7 @@
* gtk_display.c: Gtk+ tools for main interface
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: gtk_display.c,v 1.21 2002/05/04 02:05:03 lool Exp $
* $Id: gtk_display.c,v 1.22 2002/05/30 08:17:04 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Stphane Borel <stef@via.ecp.fr>
......@@ -244,13 +244,13 @@ gint GtkModeManage( intf_thread_t * p_intf )
/*****************************************************************************
* GtkHideTooltips: show or hide the tooltips depending on the configuration
* option gnome-notooltips
* option gnome-tooltips
*****************************************************************************
* FIXME: we should get the intf as parameter
*****************************************************************************/
void GtkHideTooltips( void )
{
if( config_GetIntVariable( "gnome-notooltips" ) )
if( !config_GetIntVariable( "gnome-tooltips" ) )
gtk_tooltips_disable( p_main->p_intf->p_sys->p_tooltips );
else gtk_tooltips_enable( p_main->p_intf->p_sys->p_tooltips );
}
......@@ -258,7 +258,7 @@ void GtkHideTooltips( void )
#ifdef MODULE_NAME_IS_gnome
/*****************************************************************************
* GtkHideToolbartext: show or hide the tooltips depending on the
* configuration option gnome-notoolbartext
* configuration option gnome-toolbartext
*****************************************************************************
* FIXME: we should get the intf as parameter
* FIXME: GNOME only because of missing icons in gtk interface
......@@ -268,9 +268,9 @@ void GtkHideToolbarText( void )
GtkToolbarStyle style;
GtkToolbar * p_toolbar;
style = config_GetIntVariable( "gnome-notoolbartext" )
? GTK_TOOLBAR_ICONS
: GTK_TOOLBAR_BOTH;
style = config_GetIntVariable( "gnome-toolbartext" )
? GTK_TOOLBAR_BOTH
: GTK_TOOLBAR_ICONS;
p_toolbar = GTK_TOOLBAR(lookup_widget( p_main->p_intf->p_sys->p_window,
"toolbar" ));
......
......@@ -2,7 +2,7 @@
* xmga.c : X11 MGA plugin for vlc
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: xmga.c,v 1.14 2002/05/18 17:47:47 sam Exp $
* $Id: xmga.c,v 1.15 2002/05/30 08:17:04 gbazin Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -110,7 +110,7 @@ static void ToggleCursor ( vout_thread_t * );
MODULE_CONFIG_START
ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL )
ADD_STRING ( "xmga_display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT )
ADD_BOOL ( "xmga_altfullscreen", NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT )
ADD_BOOL ( "xmga_altfullscreen", 0, NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT )
MODULE_CONFIG_STOP
MODULE_INIT_START
......
......@@ -172,8 +172,8 @@ static int vout_Create( vout_thread_t *p_vout )
p_vout->b_fullscreen =
config_GetIntVariable( "fullscreen" );
p_vout->p_sys->i_mode =
config_GetIntVariable( "nooverlay" ) ?
MODE_NORMAL_MEM : MODE_VIDEO_OVERLAY;
config_GetIntVariable( "overlay" ) ?
MODE_NORMAL_OVERLAY : MODE_VIDEO_MEM;
p_vout->p_sys->dim.w = p_vout->i_window_width;
p_vout->p_sys->dim.h = p_vout->i_window_height;
......
......@@ -68,7 +68,7 @@ MODULE_CONFIG_START
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, DISEQC_TEXT, DISEQC_LONGTEXT )
ADD_BOOL ( "diseqc", 0, NULL, DISEQC_TEXT, DISEQC_LONGTEXT )
ADD_INTEGER ( "lnb-lof1", 10000, NULL, LNB_LOF1_TEXT, LNB_LOF1_LONGTEXT )
ADD_INTEGER ( "lnb-lof2", 10000, NULL, LNB_LOF2_TEXT, LNB_LOF2_LONGTEXT )
ADD_INTEGER ( "lnb-slof", 11700, NULL, LNB_SLOF_TEXT, LNB_SLOF_LONGTEXT )
......
......@@ -2,7 +2,7 @@
* x11.c : X11 plugin for vlc
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: x11.c,v 1.16 2002/04/23 14:16:20 sam Exp $
* $Id: x11.c,v 1.17 2002/05/30 08:17:04 gbazin Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -54,7 +54,7 @@
MODULE_CONFIG_START
ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL )
ADD_STRING ( "x11-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT )
ADD_BOOL ( "x11-altfullscreen", NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT )
ADD_BOOL ( "x11-altfullscreen", 0, NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT )
MODULE_CONFIG_STOP
MODULE_INIT_START
......
......@@ -2,7 +2,7 @@
* xvideo.c : Xvideo plugin for vlc
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: xvideo.c,v 1.12 2002/05/13 17:58:08 sam Exp $
* $Id: xvideo.c,v 1.13 2002/05/30 08:17:04 gbazin Exp $
*
* Authors: Shane Harper <shanegh@optusnet.com.au>
* Vincent Seguin <seguin@via.ecp.fr>
......@@ -65,7 +65,7 @@ MODULE_CONFIG_START
ADD_CATEGORY_HINT( N_("Miscellaneous"), 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", NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT )
ADD_BOOL ( "xvideo-altfullscreen", 0, NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT )
ADD_STRING ( "xvideo-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT )
MODULE_CONFIG_STOP
......
......@@ -4,7 +4,7 @@
* and spawn threads.
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: main.c,v 1.194 2002/05/20 22:39:36 sam Exp $
* $Id: main.c,v 1.195 2002/05/30 08:17:04 gbazin Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -119,13 +119,13 @@
"vlc.\nNote that the default behavior is to automatically select the " \
"best method available.")
#define NOAUDIO_TEXT N_("disable audio")
#define NOAUDIO_LONGTEXT N_( \
"This will completely disable the audio output. The audio decoding " \
"stage shouldn't even be done, so it can allow you to save some " \
#define AUDIO_TEXT N_("enable audio")
#define AUDIO_LONGTEXT N_( \
"You can completely disable the audio output. In this case the audio " \
"decoding stage won't be done, and it will also save some " \
"processing power.")
#define MONO_TEXT N_("mono audio")
#define MONO_TEXT N_("force mono audio")
#define MONO_LONGTEXT N_("This will force a mono audio output")
#define VOLUME_TEXT N_("audio output volume")
......@@ -162,10 +162,10 @@
"Note that the default behavior is to automatically select the best " \
"method available.")
#define NOVIDEO_TEXT N_("disable video")
#define NOVIDEO_LONGTEXT N_( \
"This will completely disable the video output. The video decoding " \
"stage shouldn't even be done, so it can allow you to save some " \
#define VIDEO_TEXT N_("enable video")
#define VIDEO_LONGTEXT N_( \
"You can completely disable the video output. In this case the video " \
"decoding stage won't be done, and it will also save some " \
"processing power.")
#define DISPLAY_TEXT N_("display identifier")
......@@ -189,17 +189,17 @@
#define GRAYSCALE_TEXT N_("grayscale video output")
#define GRAYSCALE_LONGTEXT N_( \
"Using this option, vlc will not decode the color information from the " \
"video (this can also allow you to save some processing power).")
"When enabled, the color information from the video won't be decoded " \
"(this can also allow you to save some processing power).")
#define FULLSCREEN_TEXT N_("fullscreen video output")
#define FULLSCREEN_LONGTEXT N_( \
"If this option is enabled, vlc will always start a video in fullscreen " \
"mode.")
#define NOOVERLAY_TEXT N_("disable hardware acceleration for the video output")
#define NOOVERLAY_LONGTEXT N_( \
"By default vlc will try to take advantage of the overlay capabilities " \
#define OVERLAY_TEXT N_("overlay video output")
#define OVERLAY_LONGTEXT N_( \
"If enabled, vlc will try to take advantage of the overlay capabilities " \
"of you graphics card.")
#define SPUMARGIN_TEXT N_("force SPU position")
......@@ -249,7 +249,7 @@
#define INPUT_SUBT_TEXT N_("choose subtitles")
#define INPUT_SUBT_LONGTEXT N_( \
"Give the stream number of the subtitle channel you want to use in a DVD " \
"Give the stream number of the subtitle channel you want to use in a DVD "\
"(from 1 to n).")
#define DVD_DEV_TEXT N_("DVD device")
......@@ -280,42 +280,42 @@
"This allows you to select the AC3/A52 audio decoder you want to use. " \
"Common choices are builtin and a52.")
#define NOMMX_TEXT N_("disable CPU's MMX support")
#define NOMMX_LONGTEXT N_( \
"If your processor supports the MMX instructions set but you don't want " \
"vlc to use them, you can use this option.")
#define NO3DN_TEXT N_("disable CPU's 3D Now! support")
#define NO3DN_LONGTEXT N_( \
"If your processor supports the 3D Now! instructions set but you don't " \
"want vlc to use them, you can use this option.")
#define NOMMXEXT_TEXT N_("disable CPU's MMX EXT support")
#define NOMMXEXT_LONGTEXT N_( \
"If your processor supports the MMX EXT instructions set but you don't " \
"want vlc to use them, you can use this option.")
#define NOSSE_TEXT N_("disable CPU's SSE support")
#define NOSSE_LONGTEXT N_( \
"If your processor supports the SSE instructions set but you don't want " \
"vlc to use them, you can use this option.")
#define NOALTIVEC_TEXT N_("disable CPU's AltiVec support")
#define NOALTIVEC_LONGTEXT N_( \
"If your processor supports the AltiVec instructions set but you don't " \
"want vlc to use them, you can use this option.")
#define PLAYLIST_LAUNCH_TEXT N_("launch playlist on startup")
#define PLAYLIST_LAUNCH_LONGTEXT N_( \
#define MMX_TEXT N_("enable CPU MMX support")
#define MMX_LONGTEXT N_( \
"If your processor supports the MMX instructions set, vlc can take " \
"advantage of them.")
#define THREE_DN_TEXT N_("enable CPU 3D Now! support")
#define THREE_DN_LONGTEXT N_( \
"If your processor supports the 3D Now! instructions set, vlc can take "\
"advantage of them.")
#define MMXEXT_TEXT N_("enable CPU MMX EXT support")
#define MMXEXT_LONGTEXT N_( \
"If your processor supports the MMX EXT instructions set, vlc can take "\
"advantage of them.")
#define SSE_TEXT N_("enable CPU SSE support")
#define SSE_LONGTEXT N_( \
"If your processor supports the SSE instructions set, vlc can take " \
"can take advantage of them.")
#define ALTIVEC_TEXT N_("enable CPU AltiVec support")
#define ALTIVEC_LONGTEXT N_( \
"If your processor supports the AltiVec instructions set, vlc can take "\
"advantage of them.")
#define PL_LAUNCH_TEXT N_("launch playlist on startup")
#define PL_LAUNCH_LONGTEXT N_( \
"If you want vlc to start playing on startup, then enable this option.")
#define PLAYLIST_ENQUEUE_TEXT N_("enqueue playlist as default")
#define PLAYLIST_ENQUEUE_LONGTEXT N_( \
#define PL_ENQUEUE_TEXT N_("enqueue items in playlist")
#define PL_ENQUEUE_LONGTEXT N_( \
"If you want vlc to add items to the playlist as you open them, then " \
"enable this option.")
#define PLAYLIST_LOOP_TEXT N_("loop playlist on end")
#define PLAYLIST_LOOP_LONGTEXT N_( \
#define PL_LOOP_TEXT N_("loop playlist on end")
#define PL_LOOP_LONGTEXT N_( \
"If you want vlc to keep playing the playlist indefinitely then enable " \
"this option.")
......@@ -324,6 +324,14 @@
"You can select wich memory copy module you want to use. By default vlc " \
"will select the fastest one supported by your hardware.")
#define ACCESS_TEXT N_("access module")
#define ACCESS_LONGTEXT N_( \
"This is a legacy entry to let you configure access modules")
#define DEMUX_TEXT N_("demux module")
#define DEMUX_LONGTEXT N_( \
"This is a legacy entry to let you configure demux modules")
#define FAST_PTHREAD_TEXT N_("fast pthread on NT/2K/XP (developpers only)")
#define FAST_PTHREAD_LONGTEXT N_( \
"On Windows NT/2K/XP we use a slow but correct pthread implementation, " \
......@@ -342,7 +350,7 @@
* ADD_MODULE( option_name, psz_value, i_capability, p_callback,
* N_(text), N_(longtext) )
* ADD_INTEGER( option_name, i_value, p_callback, N_(text), N_(longtext) )
* ADD_BOOL( option_name, p_callback, N_(text), N_(longtext) )
* ADD_BOOL( option_name, b_value, p_callback, N_(text), N_(longtext) )
*/
MODULE_CONFIG_START
......@@ -351,37 +359,36 @@ MODULE_CONFIG_START
ADD_CATEGORY_HINT( N_("Interface"), NULL)
ADD_MODULE_WITH_SHORT ( "intf", 'I', MODULE_CAPABILITY_INTF, NULL, NULL, INTF_TEXT, INTF_LONGTEXT )
ADD_INTEGER ( "warning", 0, NULL, WARNING_TEXT, WARNING_LONGTEXT )
ADD_BOOL ( "stats", NULL, STATS_TEXT, STATS_LONGTEXT )
ADD_BOOL ( "stats", 0, NULL, STATS_TEXT, STATS_LONGTEXT )
ADD_STRING ( "search-path", NULL, NULL, INTF_PATH_TEXT, INTF_PATH_LONGTEXT )
/* Audio options */
ADD_CATEGORY_HINT( N_("Audio"), NULL)
ADD_MODULE_WITH_SHORT ( "aout", 'A', MODULE_CAPABILITY_AOUT, NULL, NULL, AOUT_TEXT, AOUT_LONGTEXT )
ADD_BOOL ( "noaudio", NULL, NOAUDIO_TEXT, NOAUDIO_LONGTEXT )
ADD_BOOL ( "mono", NULL, MONO_TEXT, MONO_LONGTEXT )
ADD_BOOL ( "audio", 1, NULL, AUDIO_TEXT, AUDIO_LONGTEXT )
ADD_BOOL ( "mono", 0, NULL, MONO_TEXT, MONO_LONGTEXT )
ADD_INTEGER ( "volume", VOLUME_DEFAULT, NULL, VOLUME_TEXT, VOLUME_LONGTEXT )
ADD_INTEGER ( "rate", 44100, NULL,