CONFIG_*.
* ./include/configuration.h, ./plugins/gtk/gtk_preferences.c,
./plugins/filter/transform.c, ./plugins/filter/distort.c,
./plugins/filter/deinterlace.c: added an ADD_STRING_FROM_LIST()
configuration macro.
* ./include/modules.h, ./include/video_output.h,
./src/video_output/video_output.c, ./plugins/filters/*: added a
VOUT_FILTER capability. Having a clear distinction between VOUTs and
VOUT_FILTERs allows us to get rid of ugly hacks. The filters are also
stackable now (use --filter=foo:bar:foo etc..).
* ./include/configuration.h, ./src/libvlc.h, ./src/libvlc.c: clean-up +
added an ADD_USAGE_HINT() configuration macro.
ac_help="$ac_help
--enable-directx Win32 DirectX support (default enabled on Win32)"
ac_help="$ac_help
- --with-directx=PATH Win32 DirectX headers and libraries"
+ --with-directx=PATH Win32 DirectX headers"
ac_help="$ac_help
--enable-fb Linux framebuffer support (default enabled on Linux)"
ac_help="$ac_help
if test -f ${with_directx}/ddraw.h
then
PLUGINS="${PLUGINS} directx"
- directx_LDFLAGS="${directx_LDFLAGS} -L${with_directx}/lib -lgdi32"
+ directx_LDFLAGS="${directx_LDFLAGS} -lgdi32"
directx_CFLAGS="${directx_CFLAGS} -I${with_directx}"
echo "$ac_t""yes" 1>&6
else
if test x$SYS = xmingw32
then
AC_ARG_WITH(directx,
- [ --with-directx=PATH Win32 DirectX headers and libraries])
+ [ --with-directx=PATH Win32 DirectX headers])
if test "x$with_directx" = "x"
then
AC_CHECK_HEADERS(ddraw.h,
if test -f ${with_directx}/ddraw.h
then
PLUGINS="${PLUGINS} directx"
- directx_LDFLAGS="${directx_LDFLAGS} -L${with_directx}/lib -lgdi32"
+ directx_LDFLAGS="${directx_LDFLAGS} -lgdi32"
directx_CFLAGS="${directx_CFLAGS} -I${with_directx}"
AC_MSG_RESULT(yes)
else
* It includes functions allowing to declare, get or set configuration options.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
- * $Id: configuration.h,v 1.13 2002/06/01 18:04:48 sam Exp $
+ * $Id: configuration.h,v 1.14 2002/06/11 09:44:21 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
*****************************************************************************/
/* Configuration hint types */
-#define MODULE_CONFIG_HINT_END 0x0001 /* End of config */
-#define MODULE_CONFIG_HINT_CATEGORY 0x0002 /* Start of new category */
-#define MODULE_CONFIG_HINT_SUBCATEGORY 0x0003 /* Start of sub-category */
-#define MODULE_CONFIG_HINT_SUBCATEGORY_END 0x0004 /* End of sub-category */
+#define CONFIG_HINT_END 0x0001 /* End of config */
+#define CONFIG_HINT_CATEGORY 0x0002 /* Start of new category */
+#define CONFIG_HINT_SUBCATEGORY 0x0003 /* Start of sub-category */
+#define CONFIG_HINT_SUBCATEGORY_END 0x0004 /* End of sub-category */
+#define CONFIG_HINT_USAGE 0x0005 /* Usage information */
-#define MODULE_CONFIG_HINT 0x000F
+#define CONFIG_HINT 0x000F
/* Configuration item types */
-#define MODULE_CONFIG_ITEM_STRING 0x0010 /* String option */
-#define MODULE_CONFIG_ITEM_FILE 0x0020 /* File option */
-#define MODULE_CONFIG_ITEM_MODULE 0x0030 /* Module option */
-#define MODULE_CONFIG_ITEM_INTEGER 0x0040 /* Integer option */
-#define MODULE_CONFIG_ITEM_BOOL 0x0050 /* Bool option */
-#define MODULE_CONFIG_ITEM_FLOAT 0x0060 /* Float option */
+#define CONFIG_ITEM_STRING 0x0010 /* String option */
+#define CONFIG_ITEM_FILE 0x0020 /* File option */
+#define CONFIG_ITEM_MODULE 0x0030 /* Module option */
+#define CONFIG_ITEM_INTEGER 0x0040 /* Integer option */
+#define CONFIG_ITEM_BOOL 0x0050 /* Bool option */
+#define CONFIG_ITEM_FLOAT 0x0060 /* Float option */
-#define MODULE_CONFIG_ITEM 0x00F0
+#define CONFIG_ITEM 0x00F0
struct module_config_s
{
/* Function to call when commiting a change */
void ( * pf_callback ) ( vlc_object_t * );
- vlc_mutex_t *p_lock; /* lock to use when modifying the config */
+ char **ppsz_list; /* List of possible values for the option */
+
+ vlc_mutex_t *p_lock; /* Lock to use when modifying the config */
vlc_bool_t b_dirty; /* Dirty flag to indicate a config change */
};
/*****************************************************************************
* Macros used to build the configuration structure.
*
- * Note that internally we support only 2 types of config data: int and string.
- * The other types declared here just map to one of these 2 basic types but
+ * Note that internally we support only 3 types of config data: int , float
+ * and string.
+ * The other types declared here just map to one of these 3 basic types but
* have the advantage of also providing very good hints to a configuration
* interface so as to make it more user friendly.
* The configuration structure also includes category hints. These hints can
- * provide a configuration inteface with some very useful data and also allow
- * for a more user friendly interface.
+ * provide a configuration interface with some very useful data and again
+ * allow for a more user friendly interface.
*****************************************************************************/
#define MODULE_CONFIG_START \
static module_config_t p_config[] = {
-
#define MODULE_CONFIG_STOP \
- { MODULE_CONFIG_HINT_END, NULL, '\0', NULL, NULL, NULL, 0, 0, NULL, 0 } };
+ { CONFIG_HINT_END, NULL, '\0' } };
#define ADD_CATEGORY_HINT( text, longtext ) \
- { MODULE_CONFIG_HINT_CATEGORY, NULL, '\0', text, longtext, NULL, 0, 0, \
- NULL, NULL, 0 },
+ { CONFIG_HINT_CATEGORY, NULL, '\0', text, longtext },
#define ADD_SUBCATEGORY_HINT( text, longtext ) \
- { MODULE_CONFIG_HINT_SUBCATEGORY, NULL, '\0', text, longtext, NULL, 0, 0, \
- NULL, NULL, 0 },
+ { CONFIG_HINT_SUBCATEGORY, NULL, '\0', text, longtext },
#define END_SUBCATEGORY_HINT \
- { MODULE_CONFIG_HINT_SUBCATEGORY_END, NULL, '\0', NULL, NULL, NULL, 0, 0, \
- NULL, NULL, 0 },
-#define ADD_STRING( name, value, p_callback, text, longtext ) \
- { MODULE_CONFIG_ITEM_STRING, name, '\0', text, longtext, value, 0, 0, \
- p_callback, NULL, 0 },
+ { CONFIG_HINT_SUBCATEGORY_END, NULL, '\0' },
+#define ADD_USAGE_HINT( text ) \
+ { CONFIG_HINT_USAGE, NULL, '\0', text },
+
+#define ADD_STRING( name, psz_value, p_callback, text, longtext ) \
+ { CONFIG_ITEM_STRING, name, '\0', text, longtext, psz_value, 0, 0, \
+ p_callback },
+#define ADD_STRING_FROM_LIST( name, psz_value, ppsz_list, p_callback, text, \
+ longtext ) \
+ { CONFIG_ITEM_STRING, name, '\0', text, longtext, psz_value, 0, 0, \
+ p_callback, ppsz_list },
#define ADD_FILE( name, psz_value, p_callback, text, longtext ) \
- { MODULE_CONFIG_ITEM_FILE, name, '\0', text, longtext, psz_value, 0, 0, \
- p_callback, NULL, 0 },
-#define ADD_MODULE( name, i_capability, psz_value, p_callback, text, longtext)\
- { MODULE_CONFIG_ITEM_MODULE, name, '\0', text, longtext, psz_value, \
- i_capability, 0, p_callback, NULL, 0 },
+ { CONFIG_ITEM_FILE, name, '\0', text, longtext, psz_value, 0, 0, \
+ p_callback },
+#define ADD_MODULE( name, i_caps, psz_value, p_callback, text, longtext ) \
+ { CONFIG_ITEM_MODULE, name, '\0', text, longtext, psz_value, i_caps, 0, \
+ p_callback },
#define ADD_INTEGER( name, i_value, p_callback, text, longtext ) \
- { MODULE_CONFIG_ITEM_INTEGER, name, '\0', text, longtext, NULL, i_value, \
- 0, p_callback, NULL, 0 },
+ { CONFIG_ITEM_INTEGER, name, '\0', text, longtext, NULL, i_value, 0, \
+ p_callback },
#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 },
+ { CONFIG_ITEM_FLOAT, name, '\0', text, longtext, NULL, 0, f_value, \
+ p_callback },
#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 },
+ { CONFIG_ITEM_BOOL, name, '\0', text, longtext, NULL, b_value, 0, \
+ p_callback },
+
+/* 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 ) \
- { MODULE_CONFIG_ITEM_STRING, name, ch, text, ltext, psz_value, 0, 0, \
- p_callback, NULL, 0 },
+ { CONFIG_ITEM_STRING, name, ch, text, ltext, psz_value, 0, 0, \
+ p_callback },
#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 },
+ { CONFIG_ITEM_FILE, name, ch, text, ltext, psz_value, 0, 0, \
+ p_callback },
#define ADD_MODULE_WITH_SHORT( name, ch, i_capability, psz_value, p_callback, \
text, ltext) \
- { MODULE_CONFIG_ITEM_MODULE, name, ch, text, ltext, psz_value, \
- i_capability, 0, p_callback, NULL, 0 },
+ { CONFIG_ITEM_MODULE, name, ch, text, ltext, psz_value, i_capability, 0, \
+ p_callback },
#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 },
+ { CONFIG_ITEM_INTEGER, name, ch, text, ltext, NULL, i_value, 0, \
+ p_callback },
#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 },
+ { CONFIG_ITEM_FLOAT, name, ch, text, ltext, NULL, 0, f_value, \
+ p_callback },
#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 },
+ { CONFIG_ITEM_BOOL, name, ch, text, ltext, NULL, b_value, 0, \
+ p_callback },
* modules.h : Module management functions.
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: modules.h,v 1.54 2002/06/04 00:11:12 sam Exp $
+ * $Id: modules.h,v 1.55 2002/06/11 09:44:21 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
/*****************************************************************************
* Module capabilities.
*****************************************************************************/
-#define MODULE_CAPABILITY_MAIN 0 /* Main */
-#define MODULE_CAPABILITY_INTF 1 /* Interface */
-#define MODULE_CAPABILITY_ACCESS 2 /* Input */
-#define MODULE_CAPABILITY_DEMUX 3 /* Input */
-#define MODULE_CAPABILITY_NETWORK 4 /* Network */
-#define MODULE_CAPABILITY_DECODER 5 /* Audio or video decoder */
-#define MODULE_CAPABILITY_MOTION 6 /* Motion compensation */
-#define MODULE_CAPABILITY_IDCT 7 /* IDCT transformation */
-#define MODULE_CAPABILITY_AOUT 8 /* Audio output */
-#define MODULE_CAPABILITY_VOUT 9 /* Video output */
-#define MODULE_CAPABILITY_CHROMA 10 /* colorspace conversion */
-#define MODULE_CAPABILITY_IMDCT 11 /* IMDCT transformation */
-#define MODULE_CAPABILITY_DOWNMIX 12 /* AC3 downmix */
-#define MODULE_CAPABILITY_MEMCPY 13 /* memcpy */
-#define MODULE_CAPABILITY_MAX 14 /* Total number of capabilities */
+#define MODULE_CAPABILITY_MAIN 0 /* Main */
+#define MODULE_CAPABILITY_INTF 1 /* Interface */
+#define MODULE_CAPABILITY_ACCESS 2 /* Input */
+#define MODULE_CAPABILITY_DEMUX 3 /* Input */
+#define MODULE_CAPABILITY_NETWORK 4 /* Network */
+#define MODULE_CAPABILITY_DECODER 5 /* Audio or video decoder */
+#define MODULE_CAPABILITY_MOTION 6 /* Motion compensation */
+#define MODULE_CAPABILITY_IDCT 7 /* IDCT transformation */
+#define MODULE_CAPABILITY_AOUT 8 /* Audio output */
+#define MODULE_CAPABILITY_AOUT_FILTER 9 /* Audio output filter */
+#define MODULE_CAPABILITY_VOUT 10 /* Video output */
+#define MODULE_CAPABILITY_VOUT_FILTER 11 /* Video output filter */
+#define MODULE_CAPABILITY_CHROMA 12 /* colorspace conversion */
+#define MODULE_CAPABILITY_IMDCT 13 /* IMDCT transformation */
+#define MODULE_CAPABILITY_DOWNMIX 14 /* AC3 downmix */
+#define MODULE_CAPABILITY_MEMCPY 15 /* memcpy */
+#define MODULE_CAPABILITY_MAX 16 /* Total number of capabilities */
#define DECLARE_MODULE_CAPABILITY_TABLE \
static const char *ppsz_capabilities[] = \
"motion", \
"iDCT", \
"audio output", \
+ "audio output filter", \
"video output", \
+ "video output filter", \
"chroma transformation", \
"iMDCT", \
"downmix", \
* thread, and destroy a previously opened video output thread.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
- * $Id: video_output.h,v 1.78 2002/06/05 18:07:03 stef Exp $
+ * $Id: video_output.h,v 1.79 2002/06/11 09:44:21 gbazin Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
count_t c_jitter_samples; /* number of samples used for the *
* calculation of the jitter */
- int i_mouse_x, i_mouse_y, i_mouse_button;
+ /* Mouse */
+ int i_mouse_x, i_mouse_y, i_mouse_button;
+ /* Filter chain */
+ char *psz_filter_chain;
};
#define I_OUTPUTPICTURES p_vout->output.i_pictures
subpicture_t * vout_SortSubPictures ( vout_thread_t *, mtime_t );
void vout_RenderSubPictures ( vout_thread_t *, picture_t *,
subpicture_t * );
-
* dummy.c : dummy plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: dummy.c,v 1.21 2002/06/01 12:31:58 sam Exp $
+ * $Id: dummy.c,v 1.22 2002/06/11 09:44:21 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
"efficient one.")
MODULE_CONFIG_START
-ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL )
-ADD_STRING ( "dummy-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT )
+ADD_CATEGORY_HINT( N_("Video"), NULL )
+ADD_STRING ( "dummy-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT )
MODULE_CONFIG_STOP
* clone.c : Clone video plugin for vlc
*****************************************************************************
* Copyright (C) 2002 VideoLAN
- * $Id: clone.c,v 1.6 2002/06/01 18:04:48 sam Exp $
+ * $Id: clone.c,v 1.7 2002/06/11 09:44:21 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
/*****************************************************************************
* Build configuration tree.
*****************************************************************************/
+#define COUNT_TEXT N_("Number of clones")
+#define COUNT_LONGTEXT N_("Select the number of video windows in which to "\
+ "clone the video")
+
MODULE_CONFIG_START
ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL )
-ADD_INTEGER ( "clone-count", 2, NULL, N_("Number of clones"),
- N_("Select the number of videowindows in which to clone the video") )
+ADD_INTEGER ( "clone-count", 2, NULL, COUNT_TEXT, COUNT_LONGTEXT )
MODULE_CONFIG_STOP
MODULE_INIT_START
SET_DESCRIPTION( _("image clone video module") )
/* Capability score set to 0 because we don't want to be spawned
* as a video output unless explicitly requested to */
- ADD_CAPABILITY( VOUT, 0 )
+ ADD_CAPABILITY( VOUT_FILTER, 0 )
ADD_SHORTCUT( "clone" )
MODULE_INIT_STOP
static int vout_Init( vout_thread_t *p_vout )
{
int i_index, i_vout;
- char *psz_filter;
picture_t *p_pic;
I_OUTPUTPICTURES = 0;
p_vout->output.i_aspect = p_vout->render.i_aspect;
/* Try to open the real video output */
- psz_filter = config_GetPsz( p_vout, "filter" );
- config_PutPsz( p_vout, "filter", NULL );
-
msg_Dbg( p_vout, "spawning the real video outputs" );
for( i_vout = 0; i_vout < p_vout->p_sys->i_clones; i_vout++ )
p_vout->p_sys->i_clones );
p_vout->p_sys->i_clones = i_vout;
RemoveAllVout( p_vout );
- config_PutPsz( p_vout, "filter", psz_filter );
- if( psz_filter ) free( psz_filter );
return 0;
}
}
- config_PutPsz( p_vout, "filter", psz_filter );
- if( psz_filter ) free( psz_filter );
-
ALLOCATE_DIRECTBUFFERS( VOUT_MAX_PICTURES );
return( 0 );
* crop.c : Crop video plugin for vlc
*****************************************************************************
* Copyright (C) 2002 VideoLAN
- * $Id: crop.c,v 1.2 2002/06/02 09:03:54 sam Exp $
+ * $Id: crop.c,v 1.3 2002/06/11 09:44:21 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
/*****************************************************************************
* Build configuration tree.
*****************************************************************************/
+#define GEOMETRY_TEXT N_("Crop geometry")
+#define GEOMETRY_LONGTEXT N_("Set the geometry of the zone to crop")
+
+#define AUTOCROP_TEXT N_("Automatic cropping")
+#define AUTOCROP_LONGTEXT N_("Activate automatic black border cropping")
+
MODULE_CONFIG_START
ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL )
-ADD_STRING ( "crop-geometry", NULL, NULL, N_("Crop geometry"), N_("Set the geometry of the zone to crop") )
-ADD_BOOL ( "autocrop", 0, NULL, N_("Automatic cropping"), N_("Activate automatic black border cropping") )
+ADD_STRING ( "crop-geometry", NULL, NULL, GEOMETRY_TEXT, GEOMETRY_LONGTEXT )
+ADD_BOOL ( "autocrop", 0, NULL, AUTOCROP_TEXT, AUTOCROP_LONGTEXT )
MODULE_CONFIG_STOP
MODULE_INIT_START
SET_DESCRIPTION( _("image crop video module") )
/* Capability score set to 0 because we don't want to be spawned
* as a video output unless explicitly requested to */
- ADD_CAPABILITY( VOUT, 0 )
+ ADD_CAPABILITY( VOUT_FILTER, 0 )
ADD_SHORTCUT( "crop" )
MODULE_INIT_STOP
* p_vout->p_sys->i_width / p_vout->output.i_width;
/* Try to open the real video output */
- psz_var = config_GetPsz( p_vout, "filter" );
- config_PutPsz( p_vout, "filter", NULL );
-
p_vout->p_sys->p_vout =
vout_CreateThread( p_vout,
p_vout->p_sys->i_width, p_vout->p_sys->i_height,
if( p_vout->p_sys->p_vout == NULL )
{
msg_Err( p_vout, "failed to create vout" );
- config_PutPsz( p_vout, "filter", psz_var );
- if( psz_var ) free( psz_var );
return 0;
}
- config_PutPsz( p_vout, "filter", psz_var );
- if( psz_var ) free( psz_var );
-
ALLOCATE_DIRECTBUFFERS( VOUT_MAX_PICTURES );
return 0;
p_vout->p_sys->b_changed = 1;
}
-
* deinterlace.c : deinterlacer plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: deinterlace.c,v 1.16 2002/06/10 00:41:08 sam Exp $
+ * $Id: deinterlace.c,v 1.17 2002/06/11 09:44:21 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
/*****************************************************************************
* Build configuration tree.
*****************************************************************************/
+#define MODE_TEXT N_("Deinterlace mode")
+#define MODE_LONGTEXT N_("one of \"discard\", \"blend\", \"mean\", \"bob\" or \"linear\"")
+
+static char *mode_list[] = { "discard", "blend", "mean", "bob", "linear", NULL };
+
MODULE_CONFIG_START
ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL )
-ADD_STRING ( "deinterlace-mode", "discard", NULL, N_("Deinterlace mode"),
- N_("one of \"discard\", \"blend\", \"mean\", \"bob\" or \"linear\"") )
+ADD_STRING_FROM_LIST ( "deinterlace-mode", "discard", mode_list, NULL, \
+ MODE_TEXT, MODE_LONGTEXT )
MODULE_CONFIG_STOP
MODULE_INIT_START
SET_DESCRIPTION( _("deinterlacing module") )
/* Capability score set to 0 because we don't want to be spawned
* as a video output unless explicitly requested to */
- ADD_CAPABILITY( VOUT, 0 )
+ ADD_CAPABILITY( VOUT_FILTER, 0 )
ADD_SHORTCUT( "deinterlace" )
MODULE_INIT_STOP
static int vout_Init( vout_thread_t *p_vout )
{
int i_index;
- char *psz_filter;
picture_t *p_pic;
I_OUTPUTPICTURES = 0;
}
/* Try to open the real video output, with half the height our images */
- psz_filter = config_GetPsz( p_vout, "filter" );
- config_PutPsz( p_vout, "filter", NULL );
-
msg_Dbg( p_vout, "spawning the real video output" );
switch( p_vout->render.i_chroma )
break;
}
- config_PutPsz( p_vout, "filter", psz_filter );
- if( psz_filter ) free( psz_filter );
-
/* Everything failed */
if( p_vout->p_sys->p_vout == NULL )
{
*(u8*)p_dest++ = ( (u16)(*(u8*)p_s1++) + (u16)(*(u8*)p_s2++) ) >> 1;
}
}
-
* distort.c : Misc video effects plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: distort.c,v 1.15 2002/06/01 18:04:48 sam Exp $
+ * $Id: distort.c,v 1.16 2002/06/11 09:44:21 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
/*****************************************************************************
* Build configuration tree.
*****************************************************************************/
+#define MODE_TEXT N_("Distort mode")
+#define MODE_LONGTEXT N_("one of \"wave\" and \"ripple\"")
+
+static char *mode_list[] = { "wave", "ripple", NULL };
+
MODULE_CONFIG_START
ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL )
-ADD_STRING ( "distort-mode", "wave", NULL, N_("distort mode"),
- N_("one of \"wave\" and \"ripple\"") )
+ADD_STRING_FROM_LIST( "distort-mode", "wave", mode_list, NULL, MODE_TEXT, MODE_LONGTEXT )
MODULE_CONFIG_STOP
MODULE_INIT_START
SET_DESCRIPTION( _("miscellaneous video effects module") )
/* Capability score set to 0 because we don't want to be spawned
* as a video output unless explicitly requested to */
- ADD_CAPABILITY( VOUT, 0 )
+ ADD_CAPABILITY( VOUT_FILTER, 0 )
ADD_SHORTCUT( "distort" )
MODULE_INIT_STOP
static int vout_Init( vout_thread_t *p_vout )
{
int i_index;
- char *psz_filter;
picture_t *p_pic;
I_OUTPUTPICTURES = 0;
p_vout->output.i_aspect = p_vout->render.i_aspect;
/* Try to open the real video output */
- psz_filter = config_GetPsz( p_vout, "filter" );
- config_PutPsz( p_vout, "filter", NULL );
-
msg_Dbg( p_vout, "spawning the real video output" );
p_vout->p_sys->p_vout =
p_vout->render.i_width, p_vout->render.i_height,
p_vout->render.i_chroma, p_vout->render.i_aspect );
- config_PutPsz( p_vout, "filter", psz_filter );
- if( psz_filter ) free( psz_filter );
-
/* Everything failed */
if( p_vout->p_sys->p_vout == NULL )
{
}
}
}
-
* invert.c : Invert video plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: invert.c,v 1.13 2002/06/01 18:04:48 sam Exp $
+ * $Id: invert.c,v 1.14 2002/06/11 09:44:21 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
SET_DESCRIPTION( _("invert video module") )
/* Capability score set to 0 because we don't want to be spawned
* as a video output unless explicitly requested to */
- ADD_CAPABILITY( VOUT, 0 )
+ ADD_CAPABILITY( VOUT_FILTER, 0 )
ADD_SHORTCUT( "invert" )
MODULE_INIT_STOP
static int vout_Init( vout_thread_t *p_vout )
{
int i_index;
- char *psz_filter;
picture_t *p_pic;
I_OUTPUTPICTURES = 0;
p_vout->output.i_aspect = p_vout->render.i_aspect;
/* Try to open the real video output */
- psz_filter = config_GetPsz( p_vout, "filter" );
- config_PutPsz( p_vout, "filter", NULL );
-
msg_Dbg( p_vout, "spawning the real video output" );
p_vout->p_sys->p_vout =
p_vout->render.i_width, p_vout->render.i_height,
p_vout->render.i_chroma, p_vout->render.i_aspect );
- config_PutPsz( p_vout, "filter", psz_filter );
- if( psz_filter ) free( psz_filter );
-
/* Everything failed */
if( p_vout->p_sys->p_vout == NULL )
{
* transform.c : transform image plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: transform.c,v 1.14 2002/06/01 18:04:48 sam Exp $
+ * $Id: transform.c,v 1.15 2002/06/11 09:44:21 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
/*****************************************************************************
* Build configuration tree.
*****************************************************************************/
+#define TYPE_TEXT N_("Transform type")
+#define TYPE_LONGTEXT N_("One of '90', '180', '270', 'hflip' and 'vflip'")
+
+static char *type_list[] = { "90", "180", "270", "hflip", "vflip", NULL };
+
MODULE_CONFIG_START
ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL )
-ADD_STRING("transform-type", "90", NULL, N_("Transform type"),
- N_("One of '90', '180', '270', 'hflip' and 'vflip'"))
+ADD_STRING_FROM_LIST("transform-type", "90", type_list, NULL, TYPE_TEXT, TYPE_LONGTEXT)
MODULE_CONFIG_STOP
MODULE_INIT_START
SET_DESCRIPTION( _("image transformation module") )
/* Capability score set to 0 because we don't want to be spawned
* as a video output unless explicitly requested to */
- ADD_CAPABILITY( VOUT, 0 )
+ ADD_CAPABILITY( VOUT_FILTER, 0 )
ADD_SHORTCUT( "transform" )
MODULE_INIT_STOP
static int vout_Init( vout_thread_t *p_vout )
{
int i_index;
- char *psz_filter;
picture_t *p_pic;
I_OUTPUTPICTURES = 0;
p_vout->output.i_aspect = p_vout->render.i_aspect;
/* Try to open the real video output */
- psz_filter = config_GetPsz( p_vout, "filter" );
- config_PutPsz( p_vout, "filter", NULL );
-
msg_Dbg( p_vout, "spawning the real video output" );
if( p_vout->p_sys->b_rotation )
p_vout->render.i_chroma, p_vout->render.i_aspect );
}
- config_PutPsz( p_vout, "filter", psz_filter );
- if( psz_filter ) free( psz_filter );
-
/* Everything failed */
if( p_vout->p_sys->p_vout == NULL )
{
{
;
}
-
* wall.c : Wall video plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: wall.c,v 1.22 2002/06/01 18:04:48 sam Exp $
+ * $Id: wall.c,v 1.23 2002/06/11 09:44:21 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
/*****************************************************************************
* Build configuration tree.
*****************************************************************************/
+#define COLS_TEXT N_("Number of columns")
+#define COLS_LONGTEXT N_("Select the number of horizontal videowindows in " \
+ "which to split the video")
+
+#define ROWS_TEXT N_("Number of rows")
+#define ROWS_LONGTEXT N_("Select the number of vertical videowindows in " \
+ "which to split the video")
+
+#define ACTIVE_TEXT N_("Active windows")
+#define ACTIVE_LONGTEXT N_("comma separated list of active windows, " \
+ "defaults to all")
+
MODULE_CONFIG_START
ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL )
-ADD_INTEGER ( "wall-cols", 3, NULL, N_("Number of columns"),
- N_("Select the number of horizontal videowindows in which "
- "to split the video") )
-ADD_INTEGER ( "wall-rows", 3, NULL, N_("Number of rows"),
- N_("Select the number of vertical videowindows in which "
- "to split the video") )
-ADD_STRING ( "wall-active", NULL, NULL, N_("Active windows"),
- N_("comma separated list of active windows, defaults to all") )
+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 )
MODULE_CONFIG_STOP
MODULE_INIT_START
SET_DESCRIPTION( _("image wall video module") )
/* Capability score set to 0 because we don't want to be spawned
* as a video output unless explicitly requested to */
- ADD_CAPABILITY( VOUT, 0 )
+ ADD_CAPABILITY( VOUT_FILTER, 0 )
ADD_SHORTCUT( "wall" )
MODULE_INIT_STOP
static int vout_Init( vout_thread_t *p_vout )
{
int i_index, i_row, i_col, i_width, i_height;
- char *psz_filter;
picture_t *p_pic;
I_OUTPUTPICTURES = 0;
p_vout->output.i_aspect = p_vout->render.i_aspect;
/* Try to open the real video output */
- psz_filter = config_GetPsz( p_vout, "filter" );
- config_PutPsz( p_vout, "filter", NULL );
-
msg_Dbg( p_vout, "spawning the real video outputs" );
p_vout->p_sys->i_vout = 0;
msg_Err( p_vout, "failed to get %ix%i vout threads",
p_vout->p_sys->i_col, p_vout->p_sys->i_row );
RemoveAllVout( p_vout );
- config_PutPsz( p_vout, "filter", psz_filter );
- if( psz_filter ) free( psz_filter );
return 0;
}
}
}
- config_PutPsz( p_vout, "filter", psz_filter );
- if( psz_filter ) free( psz_filter );
-
ALLOCATE_DIRECTBUFFERS( VOUT_MAX_PICTURES );
return( 0 );
}
}
}
-
* gtk_preferences.c: functions to handle the preferences dialog box.
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: gtk_preferences.c,v 1.32 2002/06/07 14:30:41 sam Exp $
+ * $Id: gtk_preferences.c,v 1.33 2002/06/11 09:44:21 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
* Loïc Minier <lool@via.ecp.fr>
static void GtkFloatChanged ( GtkEditable *, gpointer );
static void GtkBoolChanged ( GtkToggleButton *, gpointer );
-static void GtkFreeHashTable ( gpointer );
+static void GtkFreeHashTable ( GtkObject *object );
static void GtkFreeHashValue ( gpointer, gpointer, gpointer );
static gboolean GtkSaveHashValue ( gpointer, gpointer, gpointer );
GtkWidget *item_hbox;
GtkWidget *item_label;
GtkWidget *item_vbox;
+ GtkWidget *item_combo;
GtkWidget *string_entry;
GtkWidget *integer_spinbutton;
GtkWidget *float_spinbutton;
gint category_max_height;
- /* Check if the dialog box is already opened, if so this will save us
- * quite a bit of work. (the interface will be destroyed when you actually
- * close the dialog window, but remember that it is only hidden if you
- * clicked on the action buttons). This trick also allows us not to
+ /* Check if the dialog box is already opened because we don't want to
* duplicate identical dialog windows. */
-
config_dialog = (GtkWidget *)gtk_object_get_data(
GTK_OBJECT(p_intf->p_sys->p_window), psz_module_name );
if( config_dialog )
{
/* Yeah it was open */
- gtk_widget_show( config_dialog );
gtk_widget_grab_focus( config_dialog );
return;
}
/* Create our config hash table and associate it with the dialog box */
config_hash_table = g_hash_table_new( NULL, NULL );
- gtk_object_set_data_full( GTK_OBJECT(config_dialog),
- "config_hash_table", config_hash_table,
- (GtkDestroyNotify)GtkFreeHashTable );
+ gtk_object_set_data( GTK_OBJECT(config_dialog),
+ "config_hash_table", config_hash_table );
/* Create notebook */
config_notebook = gtk_notebook_new();
switch( p_item->i_type )
{
- case MODULE_CONFIG_HINT_CATEGORY:
- case MODULE_CONFIG_HINT_END:
+ case CONFIG_HINT_CATEGORY:
+ case CONFIG_HINT_END:
/*
* Before we start building the interface for the new category, we
* Now we can start taking care of the new category
*/
- if( p_item->i_type == MODULE_CONFIG_HINT_CATEGORY )
+ if( p_item->i_type == CONFIG_HINT_CATEGORY )
{
/* create a new table for right-left alignment of children */
category_table = gtk_table_new( 0, 0, FALSE );
break;
- case MODULE_CONFIG_ITEM_MODULE:
+ case CONFIG_ITEM_MODULE:
item_frame = gtk_frame_new( p_item->psz_text );
(gpointer)config_dialog );
break;
- case MODULE_CONFIG_ITEM_STRING:
- case MODULE_CONFIG_ITEM_FILE:
+ case CONFIG_ITEM_STRING:
+ case CONFIG_ITEM_FILE:
+
+ if( !p_item->ppsz_list )
+ {
+ /* add input box with default value */
+ item_combo = string_entry = gtk_entry_new();
+ }
+ else
+ {
+ /* add combo box with default value */
+ GList *items = NULL;
+ int i;
+
+ for( i=0; p_item->ppsz_list[i]; i++ )
+ items = g_list_append( items, p_item->ppsz_list[i] );
+
+ item_combo = gtk_combo_new();
+ string_entry = GTK_COMBO(item_combo)->entry;
+ gtk_combo_set_popdown_strings( GTK_COMBO(item_combo),
+ items );
+
+ }
- /* add input box with default value */
- string_entry = gtk_entry_new();
vlc_mutex_lock( p_item->p_lock );
gtk_entry_set_text( GTK_ENTRY(string_entry),
p_item->psz_value ? p_item->psz_value : "" );
(gpointer)config_dialog );
LABEL_AND_WIDGET( p_item->psz_text,
- string_entry, p_item->psz_longtext );
+ item_combo, p_item->psz_longtext );
break;
- case MODULE_CONFIG_ITEM_INTEGER:
+ case CONFIG_ITEM_INTEGER:
/* add input box with default value */
item_adj = gtk_adjustment_new( p_item->i_value,
integer_spinbutton, p_item->psz_longtext );
break;
- case MODULE_CONFIG_ITEM_FLOAT:
+ case CONFIG_ITEM_FLOAT:
/* add input box with default value */
item_adj = gtk_adjustment_new( p_item->f_value,
float_spinbutton, p_item->psz_longtext );
break;
- case MODULE_CONFIG_ITEM_BOOL:
+ case CONFIG_ITEM_BOOL:
/* add check button */
bool_checkbutton = gtk_check_button_new();
}
}
- while( p_item->i_type != MODULE_CONFIG_HINT_END && p_item++ );
+ while( p_item->i_type != CONFIG_HINT_END && p_item++ );
#ifndef MODULE_NAME_IS_gnome
/* Now let's add the action buttons at the bottom of the page */
void GtkConfigOk( GtkButton * button, gpointer user_data )
{
GtkConfigApply( button, user_data );
- gtk_widget_hide( gtk_widget_get_toplevel( GTK_WIDGET (button) ) );
+ gtk_widget_destroy( gtk_widget_get_toplevel( GTK_WIDGET (button) ) );
}
void GtkConfigCancel( GtkButton * button, gpointer user_data )
{
- gtk_widget_hide( gtk_widget_get_toplevel( GTK_WIDGET (button) ) );
+ gtk_widget_destroy( gtk_widget_get_toplevel( GTK_WIDGET (button) ) );
}
void GtkConfigSave( GtkButton * button, gpointer user_data )
if( p_config ) GtkFreeHashValue( NULL, (gpointer)p_config, (void *)p_intf );
p_config = malloc( sizeof(module_config_t) );
- p_config->i_type = MODULE_CONFIG_ITEM_STRING;
+ p_config->i_type = CONFIG_ITEM_STRING;
p_config->psz_value = gtk_editable_get_chars( editable, 0, -1 );
p_config->psz_name = (char *)gtk_object_get_data( GTK_OBJECT(editable),
"config_option" );
if( p_config ) GtkFreeHashValue( NULL, (gpointer)p_config, (void *)p_intf );
p_config = malloc( sizeof(module_config_t) );
- p_config->i_type = MODULE_CONFIG_ITEM_INTEGER;
+ p_config->i_type = CONFIG_ITEM_INTEGER;
p_config->i_value = gtk_spin_button_get_value_as_int(
GTK_SPIN_BUTTON(editable) );
p_config->psz_name = (char *)gtk_object_get_data( GTK_OBJECT(editable),
if( p_config ) GtkFreeHashValue( NULL, (gpointer)p_config, (void *)p_intf );
p_config = malloc( sizeof(module_config_t) );
- p_config->i_type = MODULE_CONFIG_ITEM_FLOAT;
+ p_config->i_type = CONFIG_ITEM_FLOAT;
p_config->f_value = gtk_spin_button_get_value_as_float(
GTK_SPIN_BUTTON(editable) );
p_config->psz_name = (char *)gtk_object_get_data( GTK_OBJECT(editable),
if( p_config ) GtkFreeHashValue( NULL, (gpointer)p_config, (void *)p_intf );
p_config = malloc( sizeof(module_config_t) );
- p_config->i_type = MODULE_CONFIG_ITEM_BOOL;
+ p_config->i_type = CONFIG_ITEM_BOOL;
p_config->i_value = gtk_toggle_button_get_active( button );
p_config->psz_name = (char *)gtk_object_get_data( GTK_OBJECT(button),
"config_option" );
/****************************************************************************
* GtkFreeHashTable: signal called when the config hash table is destroyed.
****************************************************************************/
-static void GtkFreeHashTable( gpointer user_data )
+static void GtkFreeHashTable( GtkObject *object )
{
- GHashTable *hash_table = (GHashTable *)user_data;
- intf_thread_t *p_intf =
- (intf_thread_t *)gtk_object_get_data( GTK_OBJECT(hash_table), "p_intf" );
+ GHashTable *hash_table = (GHashTable *)gtk_object_get_data( object,
+ "config_hash_table" );
+ intf_thread_t *p_intf = (intf_thread_t *)gtk_object_get_data( object,
+ "p_intf" );
g_hash_table_foreach( hash_table, GtkFreeHashValue, (void *)p_intf );
g_hash_table_destroy( hash_table );
{
module_config_t * p_config = (module_config_t *)value;
- if( p_config->i_type == MODULE_CONFIG_ITEM_STRING )
+ if( p_config->i_type == CONFIG_ITEM_STRING )
if( p_config->psz_value ) g_free( p_config->psz_value );
free( p_config );
}
switch( p_config->i_type )
{
- case MODULE_CONFIG_ITEM_STRING:
- case MODULE_CONFIG_ITEM_FILE:
- case MODULE_CONFIG_ITEM_MODULE:
+ case CONFIG_ITEM_STRING:
+ case CONFIG_ITEM_FILE:
+ case CONFIG_ITEM_MODULE:
config_PutPsz( p_intf, p_config->psz_name,
*p_config->psz_value ? p_config->psz_value : NULL );
break;
- case MODULE_CONFIG_ITEM_INTEGER:
- case MODULE_CONFIG_ITEM_BOOL:
+ case CONFIG_ITEM_INTEGER:
+ case CONFIG_ITEM_BOOL:
config_PutInt( p_intf, p_config->psz_name, p_config->i_value );
break;
- case MODULE_CONFIG_ITEM_FLOAT:
+ case CONFIG_ITEM_FLOAT:
config_PutFloat( p_intf, p_config->psz_name, p_config->f_value );
break;
}
/* free the hash value we allocated */
- if( p_config->i_type == MODULE_CONFIG_ITEM_STRING )
+ if( p_config->i_type == CONFIG_ITEM_STRING )
g_free( p_config->psz_value );
free( p_config );
gtk_object_set_data( GTK_OBJECT(p_intf->p_sys->p_window),
psz_module_name, NULL );
+ GtkFreeHashTable( object );
}
switch( p_item->i_type )
{
- case MODULE_CONFIG_HINT_CATEGORY:
- case MODULE_CONFIG_HINT_END:
+ case CONFIG_HINT_CATEGORY:
+ case CONFIG_HINT_END:
/*
* Now we can start taking care of the new category
*/
- if( p_item->i_type == MODULE_CONFIG_HINT_CATEGORY )
+ if( p_item->i_type == CONFIG_HINT_CATEGORY )
{
category_label = new QString( p_item->psz_text );
QFrame *page = addPage( *category_label );
break;
- case MODULE_CONFIG_ITEM_MODULE:
+ case CONFIG_ITEM_MODULE:
{
}
break;
- case MODULE_CONFIG_ITEM_STRING:
- case MODULE_CONFIG_ITEM_FILE:
+ case CONFIG_ITEM_STRING:
+ case CONFIG_ITEM_FILE:
{
QHBox *hb = new QHBox(category_table);
}
break;
- case MODULE_CONFIG_ITEM_INTEGER:
+ case CONFIG_ITEM_INTEGER:
/* add input box with default value */
{
QHBox *hb = new QHBox(category_table);
}
break;
- case MODULE_CONFIG_ITEM_FLOAT:
+ case CONFIG_ITEM_FLOAT:
{
QHBox *hb = new QHBox(category_table);
hb->setSpacing(spacingHint());
break;
- case MODULE_CONFIG_ITEM_BOOL:
+ case CONFIG_ITEM_BOOL:
/* add check button */
{
p_item++;
}
- while( p_item->i_type != MODULE_CONFIG_HINT_END );
+ while( p_item->i_type != CONFIG_HINT_END );
exec();
}
switch( p_config->getType() ) {
- case MODULE_CONFIG_ITEM_STRING:
- case MODULE_CONFIG_ITEM_FILE:
- case MODULE_CONFIG_ITEM_MODULE:
+ case CONFIG_ITEM_STRING:
+ case CONFIG_ITEM_FILE:
+ case CONFIG_ITEM_MODULE:
if (p_config->sValue()) {
config_PutPsz( p_intf, p_config->name(),
strdup(p_config->sValue().latin1()));
config_PutPsz( p_intf, p_config->name(), NULL );
}
break;
- case MODULE_CONFIG_ITEM_INTEGER:
- case MODULE_CONFIG_ITEM_BOOL:
+ case CONFIG_ITEM_INTEGER:
+ case CONFIG_ITEM_BOOL:
config_PutInt( p_intf, p_config->name(), p_config->iValue() );
break;
- case MODULE_CONFIG_ITEM_FLOAT:
+ case CONFIG_ITEM_FLOAT:
config_PutFloat( p_intf, p_config->name(), p_config->fValue() );
break;
}
{\r
switch( p_item->i_type )\r
{\r
- case MODULE_CONFIG_HINT_CATEGORY:\r
+ case CONFIG_HINT_CATEGORY:\r
\r
/* create a new tabsheet. */\r
TabSheet = new TTabSheet( this );\r
\r
break;\r
\r
- case MODULE_CONFIG_ITEM_MODULE:\r
+ case CONFIG_ITEM_MODULE:\r
\r
/* add new groupbox for the config option */\r
GroupBoxPlugin = new TGroupBoxPlugin( this, p_item );\r
\r
break;\r
\r
- case MODULE_CONFIG_ITEM_FILE:\r
+ case CONFIG_ITEM_FILE:\r
\r
- case MODULE_CONFIG_ITEM_STRING:\r
+ case CONFIG_ITEM_STRING:\r
\r
/* add new groupbox for the config option */\r
GroupBoxString = new TGroupBoxString( this, p_item );\r
\r
break;\r
\r
- case MODULE_CONFIG_ITEM_INTEGER:\r
+ case CONFIG_ITEM_INTEGER:\r
\r
/* add new groupbox for the config option */\r
GroupBoxInteger = new TGroupBoxInteger( this, p_item );\r
\r
break;\r
\r
- case MODULE_CONFIG_ITEM_BOOL:\r
+ case CONFIG_ITEM_BOOL:\r
\r
/* add new groupbox for the config option */\r
GroupBoxBool = new TGroupBoxBool( this, p_item );\r
\r
p_item++;\r
}\r
- while( p_item->i_type != MODULE_CONFIG_HINT_END );\r
+ while( p_item->i_type != CONFIG_HINT_END );\r
\r
/* Reorder groupboxes inside the tabsheets */\r
for( i_pages = 0; i_pages < PageControlPref->PageCount; i_pages++ )\r
{\r
switch( p_config->i_type )\r
{\r
- case MODULE_CONFIG_ITEM_STRING:\r
- case MODULE_CONFIG_ITEM_FILE:\r
- case MODULE_CONFIG_ITEM_MODULE:\r
+ case CONFIG_ITEM_STRING:\r
+ case CONFIG_ITEM_FILE:\r
+ case CONFIG_ITEM_MODULE:\r
config_PutPsz( p_intfGlobal, p_config->psz_name,\r
*p_config->psz_value ? p_config->psz_value : NULL );\r
break;\r
- case MODULE_CONFIG_ITEM_INTEGER:\r
- case MODULE_CONFIG_ITEM_BOOL:\r
+ case CONFIG_ITEM_INTEGER:\r
+ case CONFIG_ITEM_BOOL:\r
config_PutInt( p_intfGlobal, p_config->psz_name,\r
p_config->i_value );\r
break;\r
msgid ""
msgstr ""
"Project-Id-Version: vlc 0.73.3\n"
-"POT-Creation-Date: 2002-06-08 00:25+0200\n"
+"POT-Creation-Date: 2002-06-11 11:25+0200\n"
"PO-Revision-Date: 2002-04-18 23:38+0100\n"
"Last-Translator: Thomas Graf <tgr@reeler.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
msgstr "%s Modul Optionen:\n"
#. We could also have "=<" here
-#: src/libvlc.c:918 src/misc/configuration.c:798
+#: src/libvlc.c:919 src/misc/configuration.c:813
msgid "string"
msgstr "text"
-#: src/libvlc.c:921 src/misc/configuration.c:783
+#: src/libvlc.c:922 src/misc/configuration.c:798
msgid "integer"
msgstr "zahl"
-#: src/libvlc.c:924 src/misc/configuration.c:790
+#: src/libvlc.c:925 src/misc/configuration.c:805
msgid "float"
msgstr "gleitpunktzahl"
-#: src/libvlc.c:930
+#: src/libvlc.c:931
msgid " (default enabled)"
msgstr ""
-#: src/libvlc.c:931
+#: src/libvlc.c:932
msgid " (default disabled)"
msgstr ""
-#: src/libvlc.c:1013
-#, fuzzy
-msgid ""
-"\n"
-"Playlist items:\n"
-" *.mpg, *.vob plain MPEG-1/2 files\n"
-" [dvd:][device][@raw_device][@[title][,[chapter][,angle]]]\n"
-" DVD device\n"
-" [vcd:][device][@[title][,[chapter]]\n"
-" VCD device\n"
-" udpstream:[@[<bind address>][:<bind port>]]\n"
-" UDP stream sent by VLS\n"
-" vlc:loop loop execution of the playlist\n"
-" vlc:pause pause execution of playlist items\n"
-" vlc:quit quit VLC\n"
-msgstr ""
-"\n"
-"Abspielliste Elemente:\n"
-" *.mpg, *.vob MPEG-1/2 Dateien\n"
-" [dvd:][Gerät][@Raw_Gerät][@[title][,[Kapitel][,Winkel]]]\n"
-" DVD Gerät\n"
-" [vcd:][Gerät][@[Titel][,[Kapitel]]\n"
-" VCD Gerät\n"
-" udpstream:[@[<bind Adresse>][:<bind port>]]\n"
-" UDP stream gesendet von VLS\n"
-" vlc:loop Abspielen der Abspielliste endlos "
-"wiederholen\n"
-" vlc:pause Abspielen von Abspiellistenelemten "
-"pausieren\n"
-" vlc:quit \tVLC beenden"
-
-#: src/libvlc.c:1034 src/libvlc.c:1083 src/libvlc.c:1107 src/libvlc.c:1126
+#: src/libvlc.c:1014 src/libvlc.c:1063 src/libvlc.c:1087 src/libvlc.c:1106
#, fuzzy
msgid ""
"\n"
"Drück die Eingabetaste um weiterzufahren..."
#. Usage
-#: src/libvlc.c:1057
+#: src/libvlc.c:1037
#, fuzzy, c-format
msgid ""
"Usage: %s [options] [parameters] [file]...\n"
"\n"
msgstr "Usage: %s [Optionen] [Parameter] [Date]...\n"
-#: src/libvlc.c:1060
+#: src/libvlc.c:1040
#, fuzzy
msgid "[module] [description]\n"
msgstr "[Modul] [Beschreibung]"
-#: src/libvlc.c:1101
+#: src/libvlc.c:1081
msgid ""
"This program comes with NO WARRANTY, to the extent permitted by law.\n"
"You may redistribute it under the terms of the GNU General Public License;\n"
"with it."
msgstr ""
+#: src/libvlc.h:281
+#, fuzzy
+msgid ""
+"\n"
+"Playlist items:\n"
+" *.mpg, *.vob plain MPEG-1/2 files\n"
+" [dvd:][device][@raw_device][@[title][,[chapter][,angle]]]\n"
+" DVD device\n"
+" [vcd:][device][@[title][,[chapter]]\n"
+" VCD device\n"
+" udpstream:[@[<bind address>][:<bind port>]]\n"
+" UDP stream sent by VLS\n"
+" vlc:loop loop execution of the playlist\n"
+" vlc:pause pause execution of playlist items\n"
+" vlc:quit quit VLC\n"
+msgstr ""
+"\n"
+"Abspielliste Elemente:\n"
+" *.mpg, *.vob MPEG-1/2 Dateien\n"
+" [dvd:][Gerät][@Raw_Gerät][@[title][,[Kapitel][,Winkel]]]\n"
+" DVD Gerät\n"
+" [vcd:][Gerät][@[Titel][,[Kapitel]]\n"
+" VCD Gerät\n"
+" udpstream:[@[<bind Adresse>][:<bind port>]]\n"
+" UDP stream gesendet von VLS\n"
+" vlc:loop Abspielen der Abspielliste endlos "
+"wiederholen\n"
+" vlc:pause Abspielen von Abspiellistenelemten "
+"pausieren\n"
+" vlc:quit \tVLC beenden"
+
#. Interface options
-#: src/libvlc.h:299
+#: src/libvlc.h:315
msgid "Interface"
msgstr "Oberfläche"
#. Audio options
-#: src/libvlc.h:307
+#: src/libvlc.h:323
msgid "Audio"
msgstr ""
#. Video options
-#: plugins/directx/directx.c:53 src/libvlc.h:317
+#: plugins/directx/directx.c:53 plugins/dummy/dummy.c:51 src/libvlc.h:333
msgid "Video"
msgstr ""
#. Input options
-#: plugins/satellite/satellite.c:66 src/libvlc.h:330
+#: plugins/satellite/satellite.c:66 src/libvlc.h:346
msgid "Input"
msgstr "Eingabe"
#. Decoder options
-#: src/libvlc.h:349
+#: src/libvlc.h:365
msgid "Decoders"
msgstr "Dekoder"
#. CPU options
-#: src/libvlc.h:354
+#: src/libvlc.h:370
msgid "CPU"
msgstr "Prozessor"
#. Playlist options
#: plugins/gtk/gnome_interface.c:506 plugins/gtk/gnome_interface.c:1824
#: plugins/gtk/gnome_interface.c:1848 plugins/gtk/gtk_interface.c:611
-#: plugins/gtk/gtk_interface.c:2105 src/libvlc.h:362
+#: plugins/gtk/gtk_interface.c:2105 src/libvlc.h:378
msgid "Playlist"
msgstr "Abspielliste"
#. Misc options
#: plugins/a52/a52.c:85 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
-#: plugins/dummy/dummy.c:51 plugins/fb/fb.c:70 plugins/filter/deinterlace.c:50
-#: plugins/filter/distort.c:50 plugins/filter/transform.c:51
-#: plugins/filter/wall.c:45 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:73
+#: plugins/fb/fb.c:70 plugins/filter/deinterlace.c:63
+#: plugins/filter/distort.c:55 plugins/filter/transform.c:56
+#: plugins/filter/wall.c:57 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:73
#: plugins/gtk/gtk.c:71 plugins/mad/mad_adec.c:66 plugins/mga/xmga.c:106
#: plugins/mpeg_vdec/video_parser.c:96 plugins/text/logger.c:86
#: plugins/win32/win32.cpp:48 plugins/x11/x11.c:55 plugins/x11/xvideo.c:65
-#: src/libvlc.h:368
+#: src/libvlc.h:384
msgid "Miscellaneous"
msgstr "Sonstiges"
-#: src/libvlc.h:380
+#: src/libvlc.h:399
msgid "main program"
msgstr "Hauptprogramm"
-#: src/libvlc.h:392
+#: src/libvlc.h:411
msgid "print help"
msgstr "Hilfetext anzeigen"
-#: src/libvlc.h:394
+#: src/libvlc.h:412
msgid "print detailed help"
msgstr "Detailierter Hilfetext anzeigen"
-#: src/libvlc.h:396
+#: src/libvlc.h:413
msgid "print a list of available modules"
msgstr "Liste allen verfügbaren Plugins ausgeben"
-#: src/libvlc.h:398
+#: src/libvlc.h:414
#, fuzzy
msgid "print help on module"
msgstr "Hilfe über Modul <text> ausgeben"
-#: src/libvlc.h:401
+#: src/libvlc.h:415
msgid "print version information"
msgstr "Versionsinformationen ausgeben."
-#: src/libvlc.h:403
+#: src/libvlc.h:416
#, fuzzy
msgid "print build information"
msgstr "Versionsinformationen ausgeben."
-#: src/misc/configuration.c:783
+#: src/misc/configuration.c:798
msgid "boolean"
msgstr "boolesch"
msgid "Linux console framebuffer module"
msgstr "Linux Konsolen Framebuffer Modul"
-#: plugins/filter/deinterlace.c:51
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/filter/deinterlace.c:57
#, fuzzy
msgid "Deinterlace mode"
msgstr "Oberfläche Modul"
-#: plugins/filter/deinterlace.c:52
-msgid "one of 'bob' and 'blend'"
+#: plugins/filter/deinterlace.c:58
+msgid "one of \"discard\", \"blend\", \"mean\", \"bob\" or \"linear\""
msgstr ""
-#: plugins/filter/deinterlace.c:56
+#: plugins/filter/deinterlace.c:69
msgid "deinterlacing module"
msgstr "Deinterlacing Modul"
-#: plugins/filter/distort.c:51
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/filter/distort.c:49
#, fuzzy
-msgid "distort mode"
+msgid "Distort mode"
msgstr "Netzwerk"
-#: plugins/filter/distort.c:52
+#: plugins/filter/distort.c:50
msgid "one of \"wave\" and \"ripple\""
msgstr ""
-#: plugins/filter/distort.c:56
+#: plugins/filter/distort.c:60
msgid "miscellaneous video effects module"
msgstr "Verschiedene Videoeffekt Module"
msgid "invert video module"
msgstr "Umkehren Video Modul"
-#: plugins/filter/transform.c:52
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/filter/transform.c:50
msgid "Transform type"
msgstr ""
-#: plugins/filter/transform.c:53
+#: plugins/filter/transform.c:51
msgid "One of '90', '180', '270', 'hflip' and 'vflip'"
msgstr ""
-#: plugins/filter/transform.c:57
+#: plugins/filter/transform.c:61
msgid "image transformation module"
msgstr "Bildtransformations Modul"
-#: plugins/filter/wall.c:46
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/filter/wall.c:44
msgid "Number of columns"
msgstr ""
-#: plugins/filter/wall.c:47
+#: plugins/filter/wall.c:45
msgid ""
"Select the number of horizontal videowindows in which to split the video"
msgstr ""
-#: plugins/filter/wall.c:49
+#: plugins/filter/wall.c:48
msgid "Number of rows"
msgstr ""
-#: plugins/filter/wall.c:50
+#: plugins/filter/wall.c:49
msgid "Select the number of vertical videowindows in which to split the video"
msgstr ""
msgid "comma separated list of active windows, defaults to all"
msgstr ""
-#: plugins/filter/wall.c:57
+#: plugins/filter/wall.c:64
msgid "image wall video module"
msgstr "Bildwand Video Modul"
#: plugins/gtk/gtk_interface.c:1386 plugins/gtk/gtk_interface.c:1609
#: plugins/gtk/gtk_interface.c:1915 plugins/gtk/gtk_interface.c:2046
#: plugins/gtk/gtk_interface.c:2277 plugins/gtk/gtk_interface.c:2383
-#: plugins/gtk/gtk_interface.c:2589 plugins/gtk/gtk_preferences.c:526
+#: plugins/gtk/gtk_interface.c:2589 plugins/gtk/gtk_preferences.c:540
msgid "OK"
msgstr "OK"
#: plugins/gtk/gtk_interface.c:1616 plugins/gtk/gtk_interface.c:1922
#: plugins/gtk/gtk_interface.c:2053 plugins/gtk/gtk_interface.c:2284
-#: plugins/gtk/gtk_interface.c:2596 plugins/gtk/gtk_preferences.c:538
+#: plugins/gtk/gtk_interface.c:2596 plugins/gtk/gtk_preferences.c:552
msgid "Cancel"
msgstr "Abbrechen"
msgid "Invert"
msgstr "Umkehren"
-#: plugins/gtk/gnome_interface.c:1773 plugins/gtk/gtk_preferences.c:364
+#: plugins/gtk/gnome_interface.c:1773 plugins/gtk/gtk_preferences.c:359
msgid "Select"
msgstr "Auswählen"
msgid "Channel server"
msgstr "Kanal Server"
-#: plugins/gtk/gtk_preferences.c:310
+#: plugins/gtk/gtk_preferences.c:305
msgid "Name"
msgstr "Name"
-#: plugins/gtk/gtk_preferences.c:310
+#: plugins/gtk/gtk_preferences.c:305
msgid "Description"
msgstr "Beschreibung"
-#: plugins/gtk/gtk_preferences.c:353
+#: plugins/gtk/gtk_preferences.c:348
msgid "Configure"
msgstr "Konfigurieren"
#. add new label
-#: plugins/gtk/gtk_preferences.c:376
+#: plugins/gtk/gtk_preferences.c:371
msgid "Selected:"
msgstr "Selektiert:"
-#: plugins/gtk/gtk_preferences.c:517 plugins/gtk/gtk_preferences.c:534
+#: plugins/gtk/gtk_preferences.c:531 plugins/gtk/gtk_preferences.c:548
msgid "Save"
msgstr "Speichern"
-#: plugins/gtk/gtk_preferences.c:530
+#: plugins/gtk/gtk_preferences.c:544
msgid "Apply"
msgstr "Übernehmen"
msgid "IPv4 network abstraction layer"
msgstr "IPv4 Netzwerk Abstraktionsschicht"
-#: plugins/network/ipv6.c:78
+#: plugins/network/ipv6.c:79
msgid "IPv6 network abstraction layer"
msgstr "IPv6 Netzwerk Abstraktionsschict"
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-06-08 00:25+0200\n"
+"POT-Creation-Date: 2002-06-11 11:25+0200\n"
"PO-Revision-Date: 2002-04-22 09:56+0200\n"
"Last-Translator: Samuel Hocevar <sam@zoy.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
msgstr ""
#. We could also have "=<" here
-#: src/libvlc.c:918 src/misc/configuration.c:798
+#: src/libvlc.c:919 src/misc/configuration.c:813
msgid "string"
msgstr ""
-#: src/libvlc.c:921 src/misc/configuration.c:783
+#: src/libvlc.c:922 src/misc/configuration.c:798
msgid "integer"
msgstr ""
-#: src/libvlc.c:924 src/misc/configuration.c:790
+#: src/libvlc.c:925 src/misc/configuration.c:805
msgid "float"
msgstr ""
-#: src/libvlc.c:930
+#: src/libvlc.c:931
msgid " (default enabled)"
msgstr ""
-#: src/libvlc.c:931
+#: src/libvlc.c:932
msgid " (default disabled)"
msgstr ""
-#: src/libvlc.c:1013
-msgid ""
-"\n"
-"Playlist items:\n"
-" *.mpg, *.vob plain MPEG-1/2 files\n"
-" [dvd:][device][@raw_device][@[title][,[chapter][,angle]]]\n"
-" DVD device\n"
-" [vcd:][device][@[title][,[chapter]]\n"
-" VCD device\n"
-" udpstream:[@[<bind address>][:<bind port>]]\n"
-" UDP stream sent by VLS\n"
-" vlc:loop loop execution of the playlist\n"
-" vlc:pause pause execution of playlist items\n"
-" vlc:quit quit VLC\n"
-msgstr ""
-
-#: src/libvlc.c:1034 src/libvlc.c:1083 src/libvlc.c:1107 src/libvlc.c:1126
+#: src/libvlc.c:1014 src/libvlc.c:1063 src/libvlc.c:1087 src/libvlc.c:1106
msgid ""
"\n"
"Press the RETURN key to continue...\n"
msgstr ""
#. Usage
-#: src/libvlc.c:1057
+#: src/libvlc.c:1037
#, c-format
msgid ""
"Usage: %s [options] [parameters] [file]...\n"
"\n"
msgstr ""
-#: src/libvlc.c:1060
+#: src/libvlc.c:1040
msgid "[module] [description]\n"
msgstr ""
-#: src/libvlc.c:1101
+#: src/libvlc.c:1081
msgid ""
"This program comes with NO WARRANTY, to the extent permitted by law.\n"
"You may redistribute it under the terms of the GNU General Public License;\n"
"with it."
msgstr ""
+#: src/libvlc.h:281
+msgid ""
+"\n"
+"Playlist items:\n"
+" *.mpg, *.vob plain MPEG-1/2 files\n"
+" [dvd:][device][@raw_device][@[title][,[chapter][,angle]]]\n"
+" DVD device\n"
+" [vcd:][device][@[title][,[chapter]]\n"
+" VCD device\n"
+" udpstream:[@[<bind address>][:<bind port>]]\n"
+" UDP stream sent by VLS\n"
+" vlc:loop loop execution of the playlist\n"
+" vlc:pause pause execution of playlist items\n"
+" vlc:quit quit VLC\n"
+msgstr ""
+
#. Interface options
-#: src/libvlc.h:299
+#: src/libvlc.h:315
msgid "Interface"
msgstr ""
#. Audio options
-#: src/libvlc.h:307
+#: src/libvlc.h:323
msgid "Audio"
msgstr ""
#. Video options
-#: plugins/directx/directx.c:53 src/libvlc.h:317
+#: plugins/directx/directx.c:53 plugins/dummy/dummy.c:51 src/libvlc.h:333
msgid "Video"
msgstr ""
#. Input options
-#: plugins/satellite/satellite.c:66 src/libvlc.h:330
+#: plugins/satellite/satellite.c:66 src/libvlc.h:346
msgid "Input"
msgstr ""
#. Decoder options
-#: src/libvlc.h:349
+#: src/libvlc.h:365
msgid "Decoders"
msgstr ""
#. CPU options
-#: src/libvlc.h:354
+#: src/libvlc.h:370
msgid "CPU"
msgstr ""
#. Playlist options
#: plugins/gtk/gnome_interface.c:506 plugins/gtk/gnome_interface.c:1824
#: plugins/gtk/gnome_interface.c:1848 plugins/gtk/gtk_interface.c:611
-#: plugins/gtk/gtk_interface.c:2105 src/libvlc.h:362
+#: plugins/gtk/gtk_interface.c:2105 src/libvlc.h:378
msgid "Playlist"
msgstr ""
#. Misc options
#: plugins/a52/a52.c:85 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
-#: plugins/dummy/dummy.c:51 plugins/fb/fb.c:70 plugins/filter/deinterlace.c:50
-#: plugins/filter/distort.c:50 plugins/filter/transform.c:51
-#: plugins/filter/wall.c:45 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:73
+#: plugins/fb/fb.c:70 plugins/filter/deinterlace.c:63
+#: plugins/filter/distort.c:55 plugins/filter/transform.c:56
+#: plugins/filter/wall.c:57 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:73
#: plugins/gtk/gtk.c:71 plugins/mad/mad_adec.c:66 plugins/mga/xmga.c:106
#: plugins/mpeg_vdec/video_parser.c:96 plugins/text/logger.c:86
#: plugins/win32/win32.cpp:48 plugins/x11/x11.c:55 plugins/x11/xvideo.c:65
-#: src/libvlc.h:368
+#: src/libvlc.h:384
msgid "Miscellaneous"
msgstr ""
-#: src/libvlc.h:380
+#: src/libvlc.h:399
msgid "main program"
msgstr "main programme"
-#: src/libvlc.h:392
+#: src/libvlc.h:411
msgid "print help"
msgstr ""
-#: src/libvlc.h:394
+#: src/libvlc.h:412
msgid "print detailed help"
msgstr ""
-#: src/libvlc.h:396
+#: src/libvlc.h:413
msgid "print a list of available modules"
msgstr ""
-#: src/libvlc.h:398
+#: src/libvlc.h:414
msgid "print help on module"
msgstr ""
-#: src/libvlc.h:401
+#: src/libvlc.h:415
msgid "print version information"
msgstr ""
-#: src/libvlc.h:403
+#: src/libvlc.h:416
msgid "print build information"
msgstr ""
-#: src/misc/configuration.c:783
+#: src/misc/configuration.c:798
msgid "boolean"
msgstr ""
msgid "Linux console framebuffer module"
msgstr ""
-#: plugins/filter/deinterlace.c:51
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/filter/deinterlace.c:57
msgid "Deinterlace mode"
msgstr ""
-#: plugins/filter/deinterlace.c:52
-msgid "one of 'bob' and 'blend'"
+#: plugins/filter/deinterlace.c:58
+msgid "one of \"discard\", \"blend\", \"mean\", \"bob\" or \"linear\""
msgstr ""
-#: plugins/filter/deinterlace.c:56
+#: plugins/filter/deinterlace.c:69
msgid "deinterlacing module"
msgstr ""
-#: plugins/filter/distort.c:51
-msgid "distort mode"
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/filter/distort.c:49
+msgid "Distort mode"
msgstr ""
-#: plugins/filter/distort.c:52
+#: plugins/filter/distort.c:50
msgid "one of \"wave\" and \"ripple\""
msgstr ""
-#: plugins/filter/distort.c:56
+#: plugins/filter/distort.c:60
msgid "miscellaneous video effects module"
msgstr ""
msgid "invert video module"
msgstr ""
-#: plugins/filter/transform.c:52
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/filter/transform.c:50
msgid "Transform type"
msgstr ""
-#: plugins/filter/transform.c:53
+#: plugins/filter/transform.c:51
msgid "One of '90', '180', '270', 'hflip' and 'vflip'"
msgstr ""
-#: plugins/filter/transform.c:57
+#: plugins/filter/transform.c:61
msgid "image transformation module"
msgstr ""
-#: plugins/filter/wall.c:46
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/filter/wall.c:44
msgid "Number of columns"
msgstr ""
-#: plugins/filter/wall.c:47
+#: plugins/filter/wall.c:45
msgid ""
"Select the number of horizontal videowindows in which to split the video"
msgstr ""
-#: plugins/filter/wall.c:49
+#: plugins/filter/wall.c:48
msgid "Number of rows"
msgstr ""
-#: plugins/filter/wall.c:50
+#: plugins/filter/wall.c:49
msgid "Select the number of vertical videowindows in which to split the video"
msgstr ""
msgid "comma separated list of active windows, defaults to all"
msgstr ""
-#: plugins/filter/wall.c:57
+#: plugins/filter/wall.c:64
msgid "image wall video module"
msgstr ""
#: plugins/gtk/gtk_interface.c:1386 plugins/gtk/gtk_interface.c:1609
#: plugins/gtk/gtk_interface.c:1915 plugins/gtk/gtk_interface.c:2046
#: plugins/gtk/gtk_interface.c:2277 plugins/gtk/gtk_interface.c:2383
-#: plugins/gtk/gtk_interface.c:2589 plugins/gtk/gtk_preferences.c:526
+#: plugins/gtk/gtk_interface.c:2589 plugins/gtk/gtk_preferences.c:540
msgid "OK"
msgstr ""
#: plugins/gtk/gtk_interface.c:1616 plugins/gtk/gtk_interface.c:1922
#: plugins/gtk/gtk_interface.c:2053 plugins/gtk/gtk_interface.c:2284
-#: plugins/gtk/gtk_interface.c:2596 plugins/gtk/gtk_preferences.c:538
+#: plugins/gtk/gtk_interface.c:2596 plugins/gtk/gtk_preferences.c:552
msgid "Cancel"
msgstr ""
msgid "Invert"
msgstr ""
-#: plugins/gtk/gnome_interface.c:1773 plugins/gtk/gtk_preferences.c:364
+#: plugins/gtk/gnome_interface.c:1773 plugins/gtk/gtk_preferences.c:359
msgid "Select"
msgstr ""
msgid "Channel server"
msgstr ""
-#: plugins/gtk/gtk_preferences.c:310
+#: plugins/gtk/gtk_preferences.c:305
msgid "Name"
msgstr ""
-#: plugins/gtk/gtk_preferences.c:310
+#: plugins/gtk/gtk_preferences.c:305
msgid "Description"
msgstr ""
-#: plugins/gtk/gtk_preferences.c:353
+#: plugins/gtk/gtk_preferences.c:348
msgid "Configure"
msgstr ""
#. add new label
-#: plugins/gtk/gtk_preferences.c:376
+#: plugins/gtk/gtk_preferences.c:371
msgid "Selected:"
msgstr ""
-#: plugins/gtk/gtk_preferences.c:517 plugins/gtk/gtk_preferences.c:534
+#: plugins/gtk/gtk_preferences.c:531 plugins/gtk/gtk_preferences.c:548
msgid "Save"
msgstr ""
-#: plugins/gtk/gtk_preferences.c:530
+#: plugins/gtk/gtk_preferences.c:544
msgid "Apply"
msgstr ""
msgid "IPv4 network abstraction layer"
msgstr ""
-#: plugins/network/ipv6.c:78
+#: plugins/network/ipv6.c:79
msgid "IPv6 network abstraction layer"
msgstr ""
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-06-08 00:25+0200\n"
+"POT-Creation-Date: 2002-06-11 11:25+0200\n"
"PO-Revision-Date: 2001-12-10 13:32+0100\n"
"Last-Translator: Samuel Hocevar <sam@zoy.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"\n"
#. We could also have "=<" here
-#: src/libvlc.c:918 src/misc/configuration.c:798
+#: src/libvlc.c:919 src/misc/configuration.c:813
msgid "string"
msgstr "chaîne"
-#: src/libvlc.c:921 src/misc/configuration.c:783
+#: src/libvlc.c:922 src/misc/configuration.c:798
msgid "integer"
msgstr "entier"
-#: src/libvlc.c:924 src/misc/configuration.c:790
+#: src/libvlc.c:925 src/misc/configuration.c:805
msgid "float"
msgstr "flottant"
-#: src/libvlc.c:930
+#: src/libvlc.c:931
msgid " (default enabled)"
msgstr " (activé par défaut)"
-#: src/libvlc.c:931
+#: src/libvlc.c:932
msgid " (default disabled)"
msgstr " (désactivé par défaut)"
-#: src/libvlc.c:1013
-msgid ""
-"\n"
-"Playlist items:\n"
-" *.mpg, *.vob plain MPEG-1/2 files\n"
-" [dvd:][device][@raw_device][@[title][,[chapter][,angle]]]\n"
-" DVD device\n"
-" [vcd:][device][@[title][,[chapter]]\n"
-" VCD device\n"
-" udpstream:[@[<bind address>][:<bind port>]]\n"
-" UDP stream sent by VLS\n"
-" vlc:loop loop execution of the playlist\n"
-" vlc:pause pause execution of playlist items\n"
-" vlc:quit quit VLC\n"
-msgstr ""
-"\n"
-"Éléments d'une playlist :\n"
-" *.mpg, *.vob fichiers MPEG-1/2 standards\n"
-" [dvd:][device][@raw_device][@[titre][,[chapitre][,angle]]]\n"
-" périphérique DVD\n"
-" [vcd:][device][@[titre][,[chapitre]]\n"
-" périphérique VCD\n"
-" udpstream:[@[<adresse>][:<port>]]\n"
-" flux UDP envoyé par VLS\n"
-" vlc:loop fait boucler la playlist\n"
-" vlc:pause fait une pause dans la playlist\n"
-" vlc:quit quitter VLC\n"
-
-#: src/libvlc.c:1034 src/libvlc.c:1083 src/libvlc.c:1107 src/libvlc.c:1126
+#: src/libvlc.c:1014 src/libvlc.c:1063 src/libvlc.c:1087 src/libvlc.c:1106
msgid ""
"\n"
"Press the RETURN key to continue...\n"
"Appuyez sur ENTRÉE pour continuer...\n"
#. Usage
-#: src/libvlc.c:1057
+#: src/libvlc.c:1037
#, c-format
msgid ""
"Usage: %s [options] [parameters] [file]...\n"
"Utilisation: %s [options] [paramètres] [fichier]...\n"
"\n"
-#: src/libvlc.c:1060
+#: src/libvlc.c:1040
msgid "[module] [description]\n"
msgstr "[module] [description]\n"
-#: src/libvlc.c:1101
+#: src/libvlc.c:1081
msgid ""
"This program comes with NO WARRANTY, to the extent permitted by law.\n"
"You may redistribute it under the terms of the GNU General Public License;\n"
"pthread. Vous pouvez utiliser cette implémentation qui est plus rapide mais "
"avec laquelle vous pouvez rencontrer des problèmes."
+#: src/libvlc.h:281
+msgid ""
+"\n"
+"Playlist items:\n"
+" *.mpg, *.vob plain MPEG-1/2 files\n"
+" [dvd:][device][@raw_device][@[title][,[chapter][,angle]]]\n"
+" DVD device\n"
+" [vcd:][device][@[title][,[chapter]]\n"
+" VCD device\n"
+" udpstream:[@[<bind address>][:<bind port>]]\n"
+" UDP stream sent by VLS\n"
+" vlc:loop loop execution of the playlist\n"
+" vlc:pause pause execution of playlist items\n"
+" vlc:quit quit VLC\n"
+msgstr ""
+"\n"
+"Éléments d'une playlist :\n"
+" *.mpg, *.vob fichiers MPEG-1/2 standards\n"
+" [dvd:][device][@raw_device][@[titre][,[chapitre][,angle]]]\n"
+" périphérique DVD\n"
+" [vcd:][device][@[titre][,[chapitre]]\n"
+" périphérique VCD\n"
+" udpstream:[@[<adresse>][:<port>]]\n"
+" flux UDP envoyé par VLS\n"
+" vlc:loop fait boucler la playlist\n"
+" vlc:pause fait une pause dans la playlist\n"
+" vlc:quit quitter VLC\n"
+
#. Interface options
-#: src/libvlc.h:299
+#: src/libvlc.h:315
msgid "Interface"
msgstr "Interface"
#. Audio options
-#: src/libvlc.h:307
+#: src/libvlc.h:323
msgid "Audio"
msgstr "Audio"
#. Video options
-#: plugins/directx/directx.c:53 src/libvlc.h:317
+#: plugins/directx/directx.c:53 plugins/dummy/dummy.c:51 src/libvlc.h:333
msgid "Video"
msgstr "Vidéo"
#. Input options
-#: plugins/satellite/satellite.c:66 src/libvlc.h:330
+#: plugins/satellite/satellite.c:66 src/libvlc.h:346
msgid "Input"
msgstr "Entrée"
#. Decoder options
-#: src/libvlc.h:349
+#: src/libvlc.h:365
msgid "Decoders"
msgstr "Décodeurs"
#. CPU options
-#: src/libvlc.h:354
+#: src/libvlc.h:370
msgid "CPU"
msgstr "Processeur"
#. Playlist options
#: plugins/gtk/gnome_interface.c:506 plugins/gtk/gnome_interface.c:1824
#: plugins/gtk/gnome_interface.c:1848 plugins/gtk/gtk_interface.c:611
-#: plugins/gtk/gtk_interface.c:2105 src/libvlc.h:362
+#: plugins/gtk/gtk_interface.c:2105 src/libvlc.h:378
msgid "Playlist"
msgstr "Playlist"
#. Misc options
#: plugins/a52/a52.c:85 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
-#: plugins/dummy/dummy.c:51 plugins/fb/fb.c:70 plugins/filter/deinterlace.c:50
-#: plugins/filter/distort.c:50 plugins/filter/transform.c:51
-#: plugins/filter/wall.c:45 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:73
+#: plugins/fb/fb.c:70 plugins/filter/deinterlace.c:63
+#: plugins/filter/distort.c:55 plugins/filter/transform.c:56
+#: plugins/filter/wall.c:57 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:73
#: plugins/gtk/gtk.c:71 plugins/mad/mad_adec.c:66 plugins/mga/xmga.c:106
#: plugins/mpeg_vdec/video_parser.c:96 plugins/text/logger.c:86
#: plugins/win32/win32.cpp:48 plugins/x11/x11.c:55 plugins/x11/xvideo.c:65
-#: src/libvlc.h:368
+#: src/libvlc.h:384
msgid "Miscellaneous"
msgstr "Divers"
-#: src/libvlc.h:380
+#: src/libvlc.h:399
msgid "main program"
msgstr "programme principal"
-#: src/libvlc.h:392
+#: src/libvlc.h:411
msgid "print help"
msgstr "afficher l'aide"
-#: src/libvlc.h:394
+#: src/libvlc.h:412
msgid "print detailed help"
msgstr "afficher l'aide détaillée"
-#: src/libvlc.h:396
+#: src/libvlc.h:413
msgid "print a list of available modules"
msgstr "afficher la liste des modules disponibles"
-#: src/libvlc.h:398
+#: src/libvlc.h:414
msgid "print help on module"
msgstr "afficher l'aide du module"
-#: src/libvlc.h:401
+#: src/libvlc.h:415
msgid "print version information"
msgstr "afficher le nom et la version du logiciel"
-#: src/libvlc.h:403
+#: src/libvlc.h:416
msgid "print build information"
msgstr "afficher les informations de compilation du logiciel"
-#: src/misc/configuration.c:783
+#: src/misc/configuration.c:798
msgid "boolean"
msgstr "booléen"
msgid "Linux console framebuffer module"
msgstr "module vidéo pour le framebuffer de Linux"
-#: plugins/filter/deinterlace.c:51
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/filter/deinterlace.c:57
msgid "Deinterlace mode"
msgstr "Mode de désentrelacement"
-#: plugins/filter/deinterlace.c:52
-msgid "one of 'bob' and 'blend'"
-msgstr "au choix, 'bob' ou 'blend'"
+#: plugins/filter/deinterlace.c:58
+msgid "one of \"discard\", \"blend\", \"mean\", \"bob\" or \"linear\""
+msgstr ""
-#: plugins/filter/deinterlace.c:56
+#: plugins/filter/deinterlace.c:69
msgid "deinterlacing module"
msgstr "module de désentrelacement"
-#: plugins/filter/distort.c:51
-msgid "distort mode"
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/filter/distort.c:49
+#, fuzzy
+msgid "Distort mode"
msgstr "mode de distortion"
-#: plugins/filter/distort.c:52
+#: plugins/filter/distort.c:50
msgid "one of \"wave\" and \"ripple\""
msgstr "au choix, \"wave\" ou \"ripple\""
-#: plugins/filter/distort.c:56
+#: plugins/filter/distort.c:60
msgid "miscellaneous video effects module"
msgstr "module d'effets vidéo variés"
msgid "invert video module"
msgstr "module d'inversion vidéo"
-#: plugins/filter/transform.c:52
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/filter/transform.c:50
msgid "Transform type"
msgstr ""
-#: plugins/filter/transform.c:53
+#: plugins/filter/transform.c:51
msgid "One of '90', '180', '270', 'hflip' and 'vflip'"
msgstr ""
-#: plugins/filter/transform.c:57
+#: plugins/filter/transform.c:61
msgid "image transformation module"
msgstr "module vidéo de transformation d'image"
-#: plugins/filter/wall.c:46
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/filter/wall.c:44
msgid "Number of columns"
msgstr ""
-#: plugins/filter/wall.c:47
+#: plugins/filter/wall.c:45
msgid ""
"Select the number of horizontal videowindows in which to split the video"
msgstr ""
-#: plugins/filter/wall.c:49
+#: plugins/filter/wall.c:48
msgid "Number of rows"
msgstr ""
-#: plugins/filter/wall.c:50
+#: plugins/filter/wall.c:49
msgid "Select the number of vertical videowindows in which to split the video"
msgstr ""
msgid "comma separated list of active windows, defaults to all"
msgstr ""
-#: plugins/filter/wall.c:57
+#: plugins/filter/wall.c:64
msgid "image wall video module"
msgstr "module vidéo de murs d'images"
#: plugins/gtk/gtk_interface.c:1386 plugins/gtk/gtk_interface.c:1609
#: plugins/gtk/gtk_interface.c:1915 plugins/gtk/gtk_interface.c:2046
#: plugins/gtk/gtk_interface.c:2277 plugins/gtk/gtk_interface.c:2383
-#: plugins/gtk/gtk_interface.c:2589 plugins/gtk/gtk_preferences.c:526
+#: plugins/gtk/gtk_interface.c:2589 plugins/gtk/gtk_preferences.c:540
msgid "OK"
msgstr "Valider"
#: plugins/gtk/gtk_interface.c:1616 plugins/gtk/gtk_interface.c:1922
#: plugins/gtk/gtk_interface.c:2053 plugins/gtk/gtk_interface.c:2284
-#: plugins/gtk/gtk_interface.c:2596 plugins/gtk/gtk_preferences.c:538
+#: plugins/gtk/gtk_interface.c:2596 plugins/gtk/gtk_preferences.c:552
msgid "Cancel"
msgstr "Annuler"
msgid "Invert"
msgstr "Inverser"
-#: plugins/gtk/gnome_interface.c:1773 plugins/gtk/gtk_preferences.c:364
+#: plugins/gtk/gnome_interface.c:1773 plugins/gtk/gtk_preferences.c:359
msgid "Select"
msgstr "Sélectionner"
msgid "Channel server"
msgstr "Serveur de canaux"
-#: plugins/gtk/gtk_preferences.c:310
+#: plugins/gtk/gtk_preferences.c:305
msgid "Name"
msgstr "Nom"
-#: plugins/gtk/gtk_preferences.c:310
+#: plugins/gtk/gtk_preferences.c:305
msgid "Description"
msgstr "Description"
-#: plugins/gtk/gtk_preferences.c:353
+#: plugins/gtk/gtk_preferences.c:348
msgid "Configure"
msgstr "Configurer"
#. add new label
-#: plugins/gtk/gtk_preferences.c:376
+#: plugins/gtk/gtk_preferences.c:371
msgid "Selected:"
msgstr "Sélectionné :"
-#: plugins/gtk/gtk_preferences.c:517 plugins/gtk/gtk_preferences.c:534
+#: plugins/gtk/gtk_preferences.c:531 plugins/gtk/gtk_preferences.c:548
msgid "Save"
msgstr "Enregistrer"
-#: plugins/gtk/gtk_preferences.c:530
+#: plugins/gtk/gtk_preferences.c:544
msgid "Apply"
msgstr "Appliquer"
msgid "IPv4 network abstraction layer"
msgstr "couche d'abstraction de réseau IPv4"
-#: plugins/network/ipv6.c:78
+#: plugins/network/ipv6.c:79
msgid "IPv6 network abstraction layer"
msgstr "couche d'abstraction de réseau IPv6"
msgid "XVideo extension module"
msgstr "module d'extension XVideo"
+#~ msgid "one of 'bob' and 'blend'"
+#~ msgstr "au choix, 'bob' ou 'blend'"
+
#~ msgid "disable hardware acceleration for the video output"
#~ msgstr "désactiver l'accélération matérielle de l'affichage"
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-06-08 00:25+0200\n"
+"POT-Creation-Date: 2002-06-11 11:25+0200\n"
"PO-Revision-Date: 2002-04-02 03:22+0900\n"
"Last-Translator: Fumio Nakayama <endymion@ca2.so-net.ne.jp>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
msgstr ""
#. We could also have "=<" here
-#: src/libvlc.c:918 src/misc/configuration.c:798
+#: src/libvlc.c:919 src/misc/configuration.c:813
msgid "string"
msgstr ""
-#: src/libvlc.c:921 src/misc/configuration.c:783
+#: src/libvlc.c:922 src/misc/configuration.c:798
msgid "integer"
msgstr ""
-#: src/libvlc.c:924 src/misc/configuration.c:790
+#: src/libvlc.c:925 src/misc/configuration.c:805
msgid "float"
msgstr ""
-#: src/libvlc.c:930
+#: src/libvlc.c:931
msgid " (default enabled)"
msgstr ""
-#: src/libvlc.c:931
+#: src/libvlc.c:932
msgid " (default disabled)"
msgstr ""
-#: src/libvlc.c:1013
-msgid ""
-"\n"
-"Playlist items:\n"
-" *.mpg, *.vob plain MPEG-1/2 files\n"
-" [dvd:][device][@raw_device][@[title][,[chapter][,angle]]]\n"
-" DVD device\n"
-" [vcd:][device][@[title][,[chapter]]\n"
-" VCD device\n"
-" udpstream:[@[<bind address>][:<bind port>]]\n"
-" UDP stream sent by VLS\n"
-" vlc:loop loop execution of the playlist\n"
-" vlc:pause pause execution of playlist items\n"
-" vlc:quit quit VLC\n"
-msgstr ""
-
-#: src/libvlc.c:1034 src/libvlc.c:1083 src/libvlc.c:1107 src/libvlc.c:1126
+#: src/libvlc.c:1014 src/libvlc.c:1063 src/libvlc.c:1087 src/libvlc.c:1106
msgid ""
"\n"
"Press the RETURN key to continue...\n"
msgstr ""
#. Usage
-#: src/libvlc.c:1057
+#: src/libvlc.c:1037
#, c-format
msgid ""
"Usage: %s [options] [parameters] [file]...\n"
"\n"
msgstr ""
-#: src/libvlc.c:1060
+#: src/libvlc.c:1040
msgid "[module] [description]\n"
msgstr ""
-#: src/libvlc.c:1101
+#: src/libvlc.c:1081
msgid ""
"This program comes with NO WARRANTY, to the extent permitted by law.\n"
"You may redistribute it under the terms of the GNU General Public License;\n"
"with it."
msgstr ""
+#: src/libvlc.h:281
+msgid ""
+"\n"
+"Playlist items:\n"
+" *.mpg, *.vob plain MPEG-1/2 files\n"
+" [dvd:][device][@raw_device][@[title][,[chapter][,angle]]]\n"
+" DVD device\n"
+" [vcd:][device][@[title][,[chapter]]\n"
+" VCD device\n"
+" udpstream:[@[<bind address>][:<bind port>]]\n"
+" UDP stream sent by VLS\n"
+" vlc:loop loop execution of the playlist\n"
+" vlc:pause pause execution of playlist items\n"
+" vlc:quit quit VLC\n"
+msgstr ""
+
#. Interface options
-#: src/libvlc.h:299
+#: src/libvlc.h:315
#, fuzzy
msgid "Interface"
msgstr "¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Îɽ¼¨ÀÚÂؤ¨(_I)"
#. Audio options
-#: src/libvlc.h:307
+#: src/libvlc.h:323
#, fuzzy
msgid "Audio"
msgstr "½ÐÎϲ»À¼(_A)"
#. Video options
-#: plugins/directx/directx.c:53 src/libvlc.h:317
+#: plugins/directx/directx.c:53 plugins/dummy/dummy.c:51 src/libvlc.h:333
#, fuzzy
msgid "Video"
msgstr "ɽ¼¨(_V)"
#. Input options
-#: plugins/satellite/satellite.c:66 src/libvlc.h:330
+#: plugins/satellite/satellite.c:66 src/libvlc.h:346
msgid "Input"
msgstr ""
#. Decoder options
-#: src/libvlc.h:349
+#: src/libvlc.h:365
msgid "Decoders"
msgstr ""
#. CPU options
-#: src/libvlc.h:354
+#: src/libvlc.h:370
msgid "CPU"
msgstr ""
#. Playlist options
#: plugins/gtk/gnome_interface.c:506 plugins/gtk/gnome_interface.c:1824
#: plugins/gtk/gnome_interface.c:1848 plugins/gtk/gtk_interface.c:611
-#: plugins/gtk/gtk_interface.c:2105 src/libvlc.h:362
+#: plugins/gtk/gtk_interface.c:2105 src/libvlc.h:378
msgid "Playlist"
msgstr "¥ê¥¹¥È"
#. Misc options
#: plugins/a52/a52.c:85 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
-#: plugins/dummy/dummy.c:51 plugins/fb/fb.c:70 plugins/filter/deinterlace.c:50
-#: plugins/filter/distort.c:50 plugins/filter/transform.c:51
-#: plugins/filter/wall.c:45 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:73
+#: plugins/fb/fb.c:70 plugins/filter/deinterlace.c:63
+#: plugins/filter/distort.c:55 plugins/filter/transform.c:56
+#: plugins/filter/wall.c:57 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:73
#: plugins/gtk/gtk.c:71 plugins/mad/mad_adec.c:66 plugins/mga/xmga.c:106
#: plugins/mpeg_vdec/video_parser.c:96 plugins/text/logger.c:86
#: plugins/win32/win32.cpp:48 plugins/x11/x11.c:55 plugins/x11/xvideo.c:65
-#: src/libvlc.h:368
+#: src/libvlc.h:384
msgid "Miscellaneous"
msgstr ""
-#: src/libvlc.h:380
+#: src/libvlc.h:399
#, fuzzy
msgid "main program"
msgstr "¥×¥í¥°¥é¥à¤ÎÀÚÂؤ¨"
-#: src/libvlc.h:392
+#: src/libvlc.h:411
msgid "print help"
msgstr ""
-#: src/libvlc.h:394
+#: src/libvlc.h:412
msgid "print detailed help"
msgstr ""
-#: src/libvlc.h:396
+#: src/libvlc.h:413
msgid "print a list of available modules"
msgstr ""
-#: src/libvlc.h:398
+#: src/libvlc.h:414
#, fuzzy
msgid "print help on module"
msgstr "Á´²èÌÌɽ¼¨¤ÎÀÚÂؤ¨"
-#: src/libvlc.h:401
+#: src/libvlc.h:415
msgid "print version information"
msgstr ""
-#: src/libvlc.h:403
+#: src/libvlc.h:416
msgid "print build information"
msgstr ""
-#: src/misc/configuration.c:783
+#: src/misc/configuration.c:798
msgid "boolean"
msgstr ""
msgid "Linux console framebuffer module"
msgstr ""
-#: plugins/filter/deinterlace.c:51
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/filter/deinterlace.c:57
#, fuzzy
msgid "Deinterlace mode"
msgstr "Á´²èÌÌɽ¼¨¤ÎÀÚÂؤ¨"
-#: plugins/filter/deinterlace.c:52
-msgid "one of 'bob' and 'blend'"
+#: plugins/filter/deinterlace.c:58
+msgid "one of \"discard\", \"blend\", \"mean\", \"bob\" or \"linear\""
msgstr ""
-#: plugins/filter/deinterlace.c:56
+#: plugins/filter/deinterlace.c:69
msgid "deinterlacing module"
msgstr ""
-#: plugins/filter/distort.c:51
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/filter/distort.c:49
#, fuzzy
-msgid "distort mode"
+msgid "Distort mode"
msgstr "¥Í¥Ã¥È¥ï¡¼¥¯"
-#: plugins/filter/distort.c:52
+#: plugins/filter/distort.c:50
msgid "one of \"wave\" and \"ripple\""
msgstr ""
-#: plugins/filter/distort.c:56
+#: plugins/filter/distort.c:60
msgid "miscellaneous video effects module"
msgstr ""
msgid "invert video module"
msgstr ""
-#: plugins/filter/transform.c:52
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/filter/transform.c:50
msgid "Transform type"
msgstr ""
-#: plugins/filter/transform.c:53
+#: plugins/filter/transform.c:51
msgid "One of '90', '180', '270', 'hflip' and 'vflip'"
msgstr ""
-#: plugins/filter/transform.c:57
+#: plugins/filter/transform.c:61
msgid "image transformation module"
msgstr ""
-#: plugins/filter/wall.c:46
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/filter/wall.c:44
msgid "Number of columns"
msgstr ""
-#: plugins/filter/wall.c:47
+#: plugins/filter/wall.c:45
msgid ""
"Select the number of horizontal videowindows in which to split the video"
msgstr ""
-#: plugins/filter/wall.c:49
+#: plugins/filter/wall.c:48
msgid "Number of rows"
msgstr ""
-#: plugins/filter/wall.c:50
+#: plugins/filter/wall.c:49
msgid "Select the number of vertical videowindows in which to split the video"
msgstr ""
msgid "comma separated list of active windows, defaults to all"
msgstr ""
-#: plugins/filter/wall.c:57
+#: plugins/filter/wall.c:64
msgid "image wall video module"
msgstr ""
#: plugins/gtk/gtk_interface.c:1386 plugins/gtk/gtk_interface.c:1609
#: plugins/gtk/gtk_interface.c:1915 plugins/gtk/gtk_interface.c:2046
#: plugins/gtk/gtk_interface.c:2277 plugins/gtk/gtk_interface.c:2383
-#: plugins/gtk/gtk_interface.c:2589 plugins/gtk/gtk_preferences.c:526
+#: plugins/gtk/gtk_interface.c:2589 plugins/gtk/gtk_preferences.c:540
msgid "OK"
msgstr ""
#: plugins/gtk/gtk_interface.c:1616 plugins/gtk/gtk_interface.c:1922
#: plugins/gtk/gtk_interface.c:2053 plugins/gtk/gtk_interface.c:2284
-#: plugins/gtk/gtk_interface.c:2596 plugins/gtk/gtk_preferences.c:538
+#: plugins/gtk/gtk_interface.c:2596 plugins/gtk/gtk_preferences.c:552
msgid "Cancel"
msgstr "¥¥ã¥ó¥»¥ë"
msgid "Invert"
msgstr ""
-#: plugins/gtk/gnome_interface.c:1773 plugins/gtk/gtk_preferences.c:364
+#: plugins/gtk/gnome_interface.c:1773 plugins/gtk/gtk_preferences.c:359
msgid "Select"
msgstr "ÁªÂò"
msgid "Channel server"
msgstr "¥Á¥ã¥ó¥Í¥ë¥µ¡¼¥Ð¡¼:"
-#: plugins/gtk/gtk_preferences.c:310
+#: plugins/gtk/gtk_preferences.c:305
msgid "Name"
msgstr ""
-#: plugins/gtk/gtk_preferences.c:310
+#: plugins/gtk/gtk_preferences.c:305
#, fuzzy
msgid "Description"
msgstr "¶ËÀ"
-#: plugins/gtk/gtk_preferences.c:353
+#: plugins/gtk/gtk_preferences.c:348
msgid "Configure"
msgstr ""
#. add new label
-#: plugins/gtk/gtk_preferences.c:376
+#: plugins/gtk/gtk_preferences.c:371
#, fuzzy
msgid "Selected:"
msgstr "ÁªÂòºÑ¤ß"
-#: plugins/gtk/gtk_preferences.c:517 plugins/gtk/gtk_preferences.c:534
+#: plugins/gtk/gtk_preferences.c:531 plugins/gtk/gtk_preferences.c:548
#, fuzzy
msgid "Save"
msgstr "¥µ¡¼¥Ð¡¼"
-#: plugins/gtk/gtk_preferences.c:530
+#: plugins/gtk/gtk_preferences.c:544
msgid "Apply"
msgstr ""
msgid "IPv4 network abstraction layer"
msgstr ""
-#: plugins/network/ipv6.c:78
+#: plugins/network/ipv6.c:79
msgid "IPv6 network abstraction layer"
msgstr ""
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-06-08 00:25+0200\n"
+"POT-Creation-Date: 2002-06-11 11:25+0200\n"
"PO-Revision-Date: 2002-04-20 16:58GMT\n"
"Last-Translator: Jean-Paul Saman <jpsaman@wxs.nl>\n"
"Language-Team: Nederlands <nl@li.org>\n"
msgstr "%s module opties:\n"
#. We could also have "=<" here
-#: src/libvlc.c:918 src/misc/configuration.c:798
+#: src/libvlc.c:919 src/misc/configuration.c:813
msgid "string"
msgstr ""
-#: src/libvlc.c:921 src/misc/configuration.c:783
+#: src/libvlc.c:922 src/misc/configuration.c:798
msgid "integer"
msgstr ""
-#: src/libvlc.c:924 src/misc/configuration.c:790
+#: src/libvlc.c:925 src/misc/configuration.c:805
msgid "float"
msgstr ""
-#: src/libvlc.c:930
+#: src/libvlc.c:931
msgid " (default enabled)"
msgstr ""
-#: src/libvlc.c:931
+#: src/libvlc.c:932
msgid " (default disabled)"
msgstr ""
-#: src/libvlc.c:1013
-#, fuzzy
-msgid ""
-"\n"
-"Playlist items:\n"
-" *.mpg, *.vob plain MPEG-1/2 files\n"
-" [dvd:][device][@raw_device][@[title][,[chapter][,angle]]]\n"
-" DVD device\n"
-" [vcd:][device][@[title][,[chapter]]\n"
-" VCD device\n"
-" udpstream:[@[<bind address>][:<bind port>]]\n"
-" UDP stream sent by VLS\n"
-" vlc:loop loop execution of the playlist\n"
-" vlc:pause pause execution of playlist items\n"
-" vlc:quit quit VLC\n"
-msgstr ""
-"\n"
-"Speellijst items:\n"
-" *.mpg, *.vob \tgewone MPEG-1/2 bestanden\n"
-" [dvd:][apparaat[@raw_device][@[titel][,[hoofdstuk][,hoek]]]\n"
-" \tDVD apparaat\n"
-" [vcd:][apparaat][@[titel][,[hoofdstuk]]\n"
-" \tVCD apparaat\n"
-" udpstream:[@[<bind adres>][:<bind poort>]]\n"
-" \tUDP stream verzonde daar VLS\n"
-" vlc:loop \tspeel de speellijst in een loop\n"
-" vlc:pause \tpauzeer speellijst items\n"
-" vlc:quit \tstop VLC"
-
-#: src/libvlc.c:1034 src/libvlc.c:1083 src/libvlc.c:1107 src/libvlc.c:1126
+#: src/libvlc.c:1014 src/libvlc.c:1063 src/libvlc.c:1087 src/libvlc.c:1106
#, fuzzy
msgid ""
"\n"
"Druk op RETURN om verder te gaan..."
#. Usage
-#: src/libvlc.c:1057
+#: src/libvlc.c:1037
#, fuzzy, c-format
msgid ""
"Usage: %s [options] [parameters] [file]...\n"
"\n"
msgstr "Gebruik: %s [opties] [parameters] [file] ...\n"
-#: src/libvlc.c:1060
+#: src/libvlc.c:1040
#, fuzzy
msgid "[module] [description]\n"
msgstr "[module] [beschrijving]"
-#: src/libvlc.c:1101
+#: src/libvlc.c:1081
#, fuzzy
msgid ""
"This program comes with NO WARRANTY, to the extent permitted by law.\n"
"echter deze is nog experimenteel.Het is dus mogelijk dat er problemen "
"optreden met deze snellere implementatie."
+#: src/libvlc.h:281
+#, fuzzy
+msgid ""
+"\n"
+"Playlist items:\n"
+" *.mpg, *.vob plain MPEG-1/2 files\n"
+" [dvd:][device][@raw_device][@[title][,[chapter][,angle]]]\n"
+" DVD device\n"
+" [vcd:][device][@[title][,[chapter]]\n"
+" VCD device\n"
+" udpstream:[@[<bind address>][:<bind port>]]\n"
+" UDP stream sent by VLS\n"
+" vlc:loop loop execution of the playlist\n"
+" vlc:pause pause execution of playlist items\n"
+" vlc:quit quit VLC\n"
+msgstr ""
+"\n"
+"Speellijst items:\n"
+" *.mpg, *.vob \tgewone MPEG-1/2 bestanden\n"
+" [dvd:][apparaat[@raw_device][@[titel][,[hoofdstuk][,hoek]]]\n"
+" \tDVD apparaat\n"
+" [vcd:][apparaat][@[titel][,[hoofdstuk]]\n"
+" \tVCD apparaat\n"
+" udpstream:[@[<bind adres>][:<bind poort>]]\n"
+" \tUDP stream verzonde daar VLS\n"
+" vlc:loop \tspeel de speellijst in een loop\n"
+" vlc:pause \tpauzeer speellijst items\n"
+" vlc:quit \tstop VLC"
+
#. Interface options
-#: src/libvlc.h:299
+#: src/libvlc.h:315
msgid "Interface"
msgstr ""
#. Audio options
-#: src/libvlc.h:307
+#: src/libvlc.h:323
msgid "Audio"
msgstr ""
#. Video options
-#: plugins/directx/directx.c:53 src/libvlc.h:317
+#: plugins/directx/directx.c:53 plugins/dummy/dummy.c:51 src/libvlc.h:333
msgid "Video"
msgstr ""
#. Input options
-#: plugins/satellite/satellite.c:66 src/libvlc.h:330
+#: plugins/satellite/satellite.c:66 src/libvlc.h:346
msgid "Input"
msgstr ""
#. Decoder options
-#: src/libvlc.h:349
+#: src/libvlc.h:365
msgid "Decoders"
msgstr ""
#. CPU options
-#: src/libvlc.h:354
+#: src/libvlc.h:370
msgid "CPU"
msgstr ""
#. Playlist options
#: plugins/gtk/gnome_interface.c:506 plugins/gtk/gnome_interface.c:1824
#: plugins/gtk/gnome_interface.c:1848 plugins/gtk/gtk_interface.c:611
-#: plugins/gtk/gtk_interface.c:2105 src/libvlc.h:362
+#: plugins/gtk/gtk_interface.c:2105 src/libvlc.h:378
msgid "Playlist"
msgstr "Speellijst"
#. Misc options
#: plugins/a52/a52.c:85 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
-#: plugins/dummy/dummy.c:51 plugins/fb/fb.c:70 plugins/filter/deinterlace.c:50
-#: plugins/filter/distort.c:50 plugins/filter/transform.c:51
-#: plugins/filter/wall.c:45 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:73
+#: plugins/fb/fb.c:70 plugins/filter/deinterlace.c:63
+#: plugins/filter/distort.c:55 plugins/filter/transform.c:56
+#: plugins/filter/wall.c:57 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:73
#: plugins/gtk/gtk.c:71 plugins/mad/mad_adec.c:66 plugins/mga/xmga.c:106
#: plugins/mpeg_vdec/video_parser.c:96 plugins/text/logger.c:86
#: plugins/win32/win32.cpp:48 plugins/x11/x11.c:55 plugins/x11/xvideo.c:65
-#: src/libvlc.h:368
+#: src/libvlc.h:384
msgid "Miscellaneous"
msgstr "Overige"
-#: src/libvlc.h:380
+#: src/libvlc.h:399
msgid "main program"
msgstr "hoofd programma"
-#: src/libvlc.h:392
+#: src/libvlc.h:411
msgid "print help"
msgstr "print help"
-#: src/libvlc.h:394
+#: src/libvlc.h:412
msgid "print detailed help"
msgstr "print gedetailleerde help"
-#: src/libvlc.h:396
+#: src/libvlc.h:413
msgid "print a list of available modules"
msgstr "print een lijst van beschikbare modules"
-#: src/libvlc.h:398
+#: src/libvlc.h:414
#, fuzzy
msgid "print help on module"
msgstr "print help over module <string>"
-#: src/libvlc.h:401
+#: src/libvlc.h:415
msgid "print version information"
msgstr "print versie informatie"
-#: src/libvlc.h:403
+#: src/libvlc.h:416
#, fuzzy
msgid "print build information"
msgstr "print versie informatie"
-#: src/misc/configuration.c:783
+#: src/misc/configuration.c:798
msgid "boolean"
msgstr ""
msgid "Linux console framebuffer module"
msgstr ""
-#: plugins/filter/deinterlace.c:51
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/filter/deinterlace.c:57
#, fuzzy
msgid "Deinterlace mode"
msgstr "interface module"
-#: plugins/filter/deinterlace.c:52
-msgid "one of 'bob' and 'blend'"
+#: plugins/filter/deinterlace.c:58
+msgid "one of \"discard\", \"blend\", \"mean\", \"bob\" or \"linear\""
msgstr ""
-#: plugins/filter/deinterlace.c:56
+#: plugins/filter/deinterlace.c:69
msgid "deinterlacing module"
msgstr ""
-#: plugins/filter/distort.c:51
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/filter/distort.c:49
#, fuzzy
-msgid "distort mode"
+msgid "Distort mode"
msgstr "Netwerk"
-#: plugins/filter/distort.c:52
+#: plugins/filter/distort.c:50
msgid "one of \"wave\" and \"ripple\""
msgstr ""
-#: plugins/filter/distort.c:56
+#: plugins/filter/distort.c:60
msgid "miscellaneous video effects module"
msgstr "overige video effecten module"
msgid "invert video module"
msgstr "inverteer video module"
-#: plugins/filter/transform.c:52
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/filter/transform.c:50
msgid "Transform type"
msgstr ""
-#: plugins/filter/transform.c:53
+#: plugins/filter/transform.c:51
msgid "One of '90', '180', '270', 'hflip' and 'vflip'"
msgstr ""
-#: plugins/filter/transform.c:57
+#: plugins/filter/transform.c:61
msgid "image transformation module"
msgstr "image transformatie module"
-#: plugins/filter/wall.c:46
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/filter/wall.c:44
msgid "Number of columns"
msgstr ""
-#: plugins/filter/wall.c:47
+#: plugins/filter/wall.c:45
msgid ""
"Select the number of horizontal videowindows in which to split the video"
msgstr ""
-#: plugins/filter/wall.c:49
+#: plugins/filter/wall.c:48
msgid "Number of rows"
msgstr ""
-#: plugins/filter/wall.c:50
+#: plugins/filter/wall.c:49
msgid "Select the number of vertical videowindows in which to split the video"
msgstr ""
msgid "comma separated list of active windows, defaults to all"
msgstr ""
-#: plugins/filter/wall.c:57
+#: plugins/filter/wall.c:64
msgid "image wall video module"
msgstr "image muur video module"
#: plugins/gtk/gtk_interface.c:1386 plugins/gtk/gtk_interface.c:1609
#: plugins/gtk/gtk_interface.c:1915 plugins/gtk/gtk_interface.c:2046
#: plugins/gtk/gtk_interface.c:2277 plugins/gtk/gtk_interface.c:2383
-#: plugins/gtk/gtk_interface.c:2589 plugins/gtk/gtk_preferences.c:526
+#: plugins/gtk/gtk_interface.c:2589 plugins/gtk/gtk_preferences.c:540
msgid "OK"
msgstr ""
#: plugins/gtk/gtk_interface.c:1616 plugins/gtk/gtk_interface.c:1922
#: plugins/gtk/gtk_interface.c:2053 plugins/gtk/gtk_interface.c:2284
-#: plugins/gtk/gtk_interface.c:2596 plugins/gtk/gtk_preferences.c:538
+#: plugins/gtk/gtk_interface.c:2596 plugins/gtk/gtk_preferences.c:552
msgid "Cancel"
msgstr "Annuleer"
msgid "Invert"
msgstr "Inverteer"
-#: plugins/gtk/gnome_interface.c:1773 plugins/gtk/gtk_preferences.c:364
+#: plugins/gtk/gnome_interface.c:1773 plugins/gtk/gtk_preferences.c:359
msgid "Select"
msgstr "Selecteer"
msgid "Channel server"
msgstr "Kanaal server"
-#: plugins/gtk/gtk_preferences.c:310
+#: plugins/gtk/gtk_preferences.c:305
msgid "Name"
msgstr "Naam"
-#: plugins/gtk/gtk_preferences.c:310
+#: plugins/gtk/gtk_preferences.c:305
msgid "Description"
msgstr "Beschrijving"
-#: plugins/gtk/gtk_preferences.c:353
+#: plugins/gtk/gtk_preferences.c:348
msgid "Configure"
msgstr "Configureer"
#. add new label
-#: plugins/gtk/gtk_preferences.c:376
+#: plugins/gtk/gtk_preferences.c:371
msgid "Selected:"
msgstr "Geselecteerd:"
-#: plugins/gtk/gtk_preferences.c:517 plugins/gtk/gtk_preferences.c:534
+#: plugins/gtk/gtk_preferences.c:531 plugins/gtk/gtk_preferences.c:548
msgid "Save"
msgstr "Bewaar"
-#: plugins/gtk/gtk_preferences.c:530
+#: plugins/gtk/gtk_preferences.c:544
msgid "Apply"
msgstr "Voer uit"
msgid "IPv4 network abstraction layer"
msgstr "IPv4 network abstractie laag"
-#: plugins/network/ipv6.c:78
+#: plugins/network/ipv6.c:79
msgid "IPv6 network abstraction layer"
msgstr "IPv6 network abstractie laag"
msgid ""
msgstr ""
"Project-Id-Version: vlc-cvs\n"
-"POT-Creation-Date: 2002-06-08 00:25+0200\n"
+"POT-Creation-Date: 2002-06-11 11:25+0200\n"
"PO-Revision-Date: 2002-28-02 23.35+0100\n"
"Last-Translator: Sigmund Augdal <sigmunau@idi.ntnu.no>.\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
msgstr ""
#. We could also have "=<" here
-#: src/libvlc.c:918 src/misc/configuration.c:798
+#: src/libvlc.c:919 src/misc/configuration.c:813
msgid "string"
msgstr ""
-#: src/libvlc.c:921 src/misc/configuration.c:783
+#: src/libvlc.c:922 src/misc/configuration.c:798
msgid "integer"
msgstr ""
-#: src/libvlc.c:924 src/misc/configuration.c:790
+#: src/libvlc.c:925 src/misc/configuration.c:805
msgid "float"
msgstr ""
-#: src/libvlc.c:930
+#: src/libvlc.c:931
msgid " (default enabled)"
msgstr ""
-#: src/libvlc.c:931
+#: src/libvlc.c:932
msgid " (default disabled)"
msgstr ""
-#: src/libvlc.c:1013
-msgid ""
-"\n"
-"Playlist items:\n"
-" *.mpg, *.vob plain MPEG-1/2 files\n"
-" [dvd:][device][@raw_device][@[title][,[chapter][,angle]]]\n"
-" DVD device\n"
-" [vcd:][device][@[title][,[chapter]]\n"
-" VCD device\n"
-" udpstream:[@[<bind address>][:<bind port>]]\n"
-" UDP stream sent by VLS\n"
-" vlc:loop loop execution of the playlist\n"
-" vlc:pause pause execution of playlist items\n"
-" vlc:quit quit VLC\n"
-msgstr ""
-
-#: src/libvlc.c:1034 src/libvlc.c:1083 src/libvlc.c:1107 src/libvlc.c:1126
+#: src/libvlc.c:1014 src/libvlc.c:1063 src/libvlc.c:1087 src/libvlc.c:1106
msgid ""
"\n"
"Press the RETURN key to continue...\n"
msgstr ""
#. Usage
-#: src/libvlc.c:1057
+#: src/libvlc.c:1037
#, c-format
msgid ""
"Usage: %s [options] [parameters] [file]...\n"
"\n"
msgstr ""
-#: src/libvlc.c:1060
+#: src/libvlc.c:1040
msgid "[module] [description]\n"
msgstr ""
-#: src/libvlc.c:1101
+#: src/libvlc.c:1081
msgid ""
"This program comes with NO WARRANTY, to the extent permitted by law.\n"
"You may redistribute it under the terms of the GNU General Public License;\n"
"with it."
msgstr ""
+#: src/libvlc.h:281
+msgid ""
+"\n"
+"Playlist items:\n"
+" *.mpg, *.vob plain MPEG-1/2 files\n"
+" [dvd:][device][@raw_device][@[title][,[chapter][,angle]]]\n"
+" DVD device\n"
+" [vcd:][device][@[title][,[chapter]]\n"
+" VCD device\n"
+" udpstream:[@[<bind address>][:<bind port>]]\n"
+" UDP stream sent by VLS\n"
+" vlc:loop loop execution of the playlist\n"
+" vlc:pause pause execution of playlist items\n"
+" vlc:quit quit VLC\n"
+msgstr ""
+
#. Interface options
-#: src/libvlc.h:299
+#: src/libvlc.h:315
msgid "Interface"
msgstr "Grensesnitt"
#. Audio options
-#: src/libvlc.h:307
+#: src/libvlc.h:323
msgid "Audio"
msgstr "Lyd"
#. Video options
-#: plugins/directx/directx.c:53 src/libvlc.h:317
+#: plugins/directx/directx.c:53 plugins/dummy/dummy.c:51 src/libvlc.h:333
msgid "Video"
msgstr "Video"
#. Input options
-#: plugins/satellite/satellite.c:66 src/libvlc.h:330
+#: plugins/satellite/satellite.c:66 src/libvlc.h:346
msgid "Input"
msgstr ""
#. Decoder options
-#: src/libvlc.h:349
+#: src/libvlc.h:365
msgid "Decoders"
msgstr ""
#. CPU options
-#: src/libvlc.h:354
+#: src/libvlc.h:370
msgid "CPU"
msgstr ""
#. Playlist options
#: plugins/gtk/gnome_interface.c:506 plugins/gtk/gnome_interface.c:1824
#: plugins/gtk/gnome_interface.c:1848 plugins/gtk/gtk_interface.c:611
-#: plugins/gtk/gtk_interface.c:2105 src/libvlc.h:362
+#: plugins/gtk/gtk_interface.c:2105 src/libvlc.h:378
msgid "Playlist"
msgstr "Spilleliste"
#. Misc options
#: plugins/a52/a52.c:85 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
-#: plugins/dummy/dummy.c:51 plugins/fb/fb.c:70 plugins/filter/deinterlace.c:50
-#: plugins/filter/distort.c:50 plugins/filter/transform.c:51
-#: plugins/filter/wall.c:45 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:73
+#: plugins/fb/fb.c:70 plugins/filter/deinterlace.c:63
+#: plugins/filter/distort.c:55 plugins/filter/transform.c:56
+#: plugins/filter/wall.c:57 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:73
#: plugins/gtk/gtk.c:71 plugins/mad/mad_adec.c:66 plugins/mga/xmga.c:106
#: plugins/mpeg_vdec/video_parser.c:96 plugins/text/logger.c:86
#: plugins/win32/win32.cpp:48 plugins/x11/x11.c:55 plugins/x11/xvideo.c:65
-#: src/libvlc.h:368
+#: src/libvlc.h:384
msgid "Miscellaneous"
msgstr ""
-#: src/libvlc.h:380
+#: src/libvlc.h:399
#, fuzzy
msgid "main program"
msgstr "Avslutt programmet"
-#: src/libvlc.h:392
+#: src/libvlc.h:411
msgid "print help"
msgstr ""
-#: src/libvlc.h:394
+#: src/libvlc.h:412
msgid "print detailed help"
msgstr ""
-#: src/libvlc.h:396
+#: src/libvlc.h:413
msgid "print a list of available modules"
msgstr ""
-#: src/libvlc.h:398
+#: src/libvlc.h:414
#, fuzzy
msgid "print help on module"
msgstr "Standard grensesnitt: "
-#: src/libvlc.h:401
+#: src/libvlc.h:415
msgid "print version information"
msgstr ""
-#: src/libvlc.h:403
+#: src/libvlc.h:416
msgid "print build information"
msgstr ""
-#: src/misc/configuration.c:783
+#: src/misc/configuration.c:798
msgid "boolean"
msgstr ""
msgid "Linux console framebuffer module"
msgstr ""
-#: plugins/filter/deinterlace.c:51
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/filter/deinterlace.c:57
#, fuzzy
msgid "Deinterlace mode"
msgstr "Standard grensesnitt: "
-#: plugins/filter/deinterlace.c:52
-msgid "one of 'bob' and 'blend'"
+#: plugins/filter/deinterlace.c:58
+msgid "one of \"discard\", \"blend\", \"mean\", \"bob\" or \"linear\""
msgstr ""
-#: plugins/filter/deinterlace.c:56
+#: plugins/filter/deinterlace.c:69
#, fuzzy
msgid "deinterlacing module"
msgstr "Standard grensesnitt: "
-#: plugins/filter/distort.c:51
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/filter/distort.c:49
#, fuzzy
-msgid "distort mode"
+msgid "Distort mode"
msgstr "Nettverk"
-#: plugins/filter/distort.c:52
+#: plugins/filter/distort.c:50
msgid "one of \"wave\" and \"ripple\""
msgstr ""
-#: plugins/filter/distort.c:56
+#: plugins/filter/distort.c:60
msgid "miscellaneous video effects module"
msgstr ""
msgid "invert video module"
msgstr "Standard grensesnitt: "
-#: plugins/filter/transform.c:52
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/filter/transform.c:50
msgid "Transform type"
msgstr ""
-#: plugins/filter/transform.c:53
+#: plugins/filter/transform.c:51
msgid "One of '90', '180', '270', 'hflip' and 'vflip'"
msgstr ""
-#: plugins/filter/transform.c:57
+#: plugins/filter/transform.c:61
msgid "image transformation module"
msgstr ""
-#: plugins/filter/wall.c:46
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/filter/wall.c:44
msgid "Number of columns"
msgstr ""
-#: plugins/filter/wall.c:47
+#: plugins/filter/wall.c:45
msgid ""
"Select the number of horizontal videowindows in which to split the video"
msgstr ""
-#: plugins/filter/wall.c:49
+#: plugins/filter/wall.c:48
msgid "Number of rows"
msgstr ""
-#: plugins/filter/wall.c:50
+#: plugins/filter/wall.c:49
msgid "Select the number of vertical videowindows in which to split the video"
msgstr ""
msgid "comma separated list of active windows, defaults to all"
msgstr ""
-#: plugins/filter/wall.c:57
+#: plugins/filter/wall.c:64
msgid "image wall video module"
msgstr ""
#: plugins/gtk/gtk_interface.c:1386 plugins/gtk/gtk_interface.c:1609
#: plugins/gtk/gtk_interface.c:1915 plugins/gtk/gtk_interface.c:2046
#: plugins/gtk/gtk_interface.c:2277 plugins/gtk/gtk_interface.c:2383
-#: plugins/gtk/gtk_interface.c:2589 plugins/gtk/gtk_preferences.c:526
+#: plugins/gtk/gtk_interface.c:2589 plugins/gtk/gtk_preferences.c:540
msgid "OK"
msgstr "OK"
#: plugins/gtk/gtk_interface.c:1616 plugins/gtk/gtk_interface.c:1922
#: plugins/gtk/gtk_interface.c:2053 plugins/gtk/gtk_interface.c:2284
-#: plugins/gtk/gtk_interface.c:2596 plugins/gtk/gtk_preferences.c:538
+#: plugins/gtk/gtk_interface.c:2596 plugins/gtk/gtk_preferences.c:552
msgid "Cancel"
msgstr "Avbryt"
msgid "Invert"
msgstr "Inverter"
-#: plugins/gtk/gnome_interface.c:1773 plugins/gtk/gtk_preferences.c:364
+#: plugins/gtk/gnome_interface.c:1773 plugins/gtk/gtk_preferences.c:359
msgid "Select"
msgstr "Velg"
msgid "Channel server"
msgstr "Kanaltjener:"
-#: plugins/gtk/gtk_preferences.c:310
+#: plugins/gtk/gtk_preferences.c:305
msgid "Name"
msgstr ""
-#: plugins/gtk/gtk_preferences.c:310
+#: plugins/gtk/gtk_preferences.c:305
#, fuzzy
msgid "Description"
msgstr "Varighet"
-#: plugins/gtk/gtk_preferences.c:353
+#: plugins/gtk/gtk_preferences.c:348
msgid "Configure"
msgstr ""
#. add new label
-#: plugins/gtk/gtk_preferences.c:376
+#: plugins/gtk/gtk_preferences.c:371
#, fuzzy
msgid "Selected:"
msgstr "Valgte"
-#: plugins/gtk/gtk_preferences.c:517 plugins/gtk/gtk_preferences.c:534
+#: plugins/gtk/gtk_preferences.c:531 plugins/gtk/gtk_preferences.c:548
#, fuzzy
msgid "Save"
msgstr "Tjener"
-#: plugins/gtk/gtk_preferences.c:530
+#: plugins/gtk/gtk_preferences.c:544
msgid "Apply"
msgstr "Bruk"
msgid "IPv4 network abstraction layer"
msgstr ""
-#: plugins/network/ipv6.c:78
+#: plugins/network/ipv6.c:79
msgid "IPv6 network abstraction layer"
msgstr ""
msgid ""
msgstr ""
"Project-Id-Version: vlc\n"
-"POT-Creation-Date: 2002-06-08 00:25+0200\n"
+"POT-Creation-Date: 2002-06-11 11:25+0200\n"
"PO-Revision-Date: 2002-05-26 18:31+0200\n"
"Last-Translator: Arkadiusz Lipiec <alipiec@elka.pw.edu.pl>\n"
"Language-Team: polish <pl@li.org>\n"
"\n"
#. We could also have "=<" here
-#: src/libvlc.c:918 src/misc/configuration.c:798
+#: src/libvlc.c:919 src/misc/configuration.c:813
msgid "string"
msgstr "napis"
-#: src/libvlc.c:921 src/misc/configuration.c:783
+#: src/libvlc.c:922 src/misc/configuration.c:798
msgid "integer"
msgstr "liczba ca³kowita"
-#: src/libvlc.c:924 src/misc/configuration.c:790
+#: src/libvlc.c:925 src/misc/configuration.c:805
msgid "float"
msgstr "liczba zmiennoprz."
-#: src/libvlc.c:930
+#: src/libvlc.c:931
msgid " (default enabled)"
msgstr " (domy¶lnie w³±czone)"
-#: src/libvlc.c:931
+#: src/libvlc.c:932
msgid " (default disabled)"
msgstr " (domy¶lnie wy³±czone)"
-#: src/libvlc.c:1013
-msgid ""
-"\n"
-"Playlist items:\n"
-" *.mpg, *.vob plain MPEG-1/2 files\n"
-" [dvd:][device][@raw_device][@[title][,[chapter][,angle]]]\n"
-" DVD device\n"
-" [vcd:][device][@[title][,[chapter]]\n"
-" VCD device\n"
-" udpstream:[@[<bind address>][:<bind port>]]\n"
-" UDP stream sent by VLS\n"
-" vlc:loop loop execution of the playlist\n"
-" vlc:pause pause execution of playlist items\n"
-" vlc:quit quit VLC\n"
-msgstr ""
-"\n"
-"Obiekty listy odtwarzania:\n"
-" *.mpg, *.vob zwyk³e pliki MPEG-1/2\n"
-" [dvd:][urz±dzenie][@urzadzenie_surowe][@[tytu³][,[rozdzia³][,k±t]]]\n"
-" urzadzenie DVD\n"
-" [vcd:][urz±dzenie][@[tytu³][,[rozdzia³]]\n"
-" urz±dzenie VCD\n"
-" udpstream:[@[<przypisany adres>][:<przypisany port>]]\n"
-" strumieñ UDP wysy³any przez VLS\n"
-" vlc:loop wykonywanie pêtli listy odtwarzania\n"
-" vlc:pause zatrzymanie odtwarzania obiektów listy\n"
-" vlc:quit wyj¶cie z VLC\n"
-
-#: src/libvlc.c:1034 src/libvlc.c:1083 src/libvlc.c:1107 src/libvlc.c:1126
+#: src/libvlc.c:1014 src/libvlc.c:1063 src/libvlc.c:1087 src/libvlc.c:1106
msgid ""
"\n"
"Press the RETURN key to continue...\n"
"Naci¶nij klawisz ENTER aby kontynuowaæ...\n"
#. Usage
-#: src/libvlc.c:1057
+#: src/libvlc.c:1037
#, c-format
msgid ""
"Usage: %s [options] [parameters] [file]...\n"
"U¿ycie: %s [opcje] [parametry] [plik]...\n"
"\n"
-#: src/libvlc.c:1060
+#: src/libvlc.c:1040
msgid "[module] [description]\n"
msgstr "[modu³] [opis]\n"
-#: src/libvlc.c:1101
+#: src/libvlc.c:1081
msgid ""
"This program comes with NO WARRANTY, to the extent permitted by law.\n"
"You may redistribute it under the terms of the GNU General Public License;\n"
"w±tków pthread, mo¿na tak¿e wybraæ szybsz± implementacjê lecz wówczas mo¿na "
"napotkaæ problemy."
+#: src/libvlc.h:281
+msgid ""
+"\n"
+"Playlist items:\n"
+" *.mpg, *.vob plain MPEG-1/2 files\n"
+" [dvd:][device][@raw_device][@[title][,[chapter][,angle]]]\n"
+" DVD device\n"
+" [vcd:][device][@[title][,[chapter]]\n"
+" VCD device\n"
+" udpstream:[@[<bind address>][:<bind port>]]\n"
+" UDP stream sent by VLS\n"
+" vlc:loop loop execution of the playlist\n"
+" vlc:pause pause execution of playlist items\n"
+" vlc:quit quit VLC\n"
+msgstr ""
+"\n"
+"Obiekty listy odtwarzania:\n"
+" *.mpg, *.vob zwyk³e pliki MPEG-1/2\n"
+" [dvd:][urz±dzenie][@urzadzenie_surowe][@[tytu³][,[rozdzia³][,k±t]]]\n"
+" urzadzenie DVD\n"
+" [vcd:][urz±dzenie][@[tytu³][,[rozdzia³]]\n"
+" urz±dzenie VCD\n"
+" udpstream:[@[<przypisany adres>][:<przypisany port>]]\n"
+" strumieñ UDP wysy³any przez VLS\n"
+" vlc:loop wykonywanie pêtli listy odtwarzania\n"
+" vlc:pause zatrzymanie odtwarzania obiektów listy\n"
+" vlc:quit wyj¶cie z VLC\n"
+
#. Interface options
-#: src/libvlc.h:299
+#: src/libvlc.h:315
msgid "Interface"
msgstr "Interfejs"
#. Audio options
-#: src/libvlc.h:307
+#: src/libvlc.h:323
msgid "Audio"
msgstr "D¼wiêk"
#. Video options
-#: plugins/directx/directx.c:53 src/libvlc.h:317
+#: plugins/directx/directx.c:53 plugins/dummy/dummy.c:51 src/libvlc.h:333
msgid "Video"
msgstr "Obraz"
#. Input options
-#: plugins/satellite/satellite.c:66 src/libvlc.h:330
+#: plugins/satellite/satellite.c:66 src/libvlc.h:346
msgid "Input"
msgstr "Wej¶cie"
#. Decoder options
-#: src/libvlc.h:349
+#: src/libvlc.h:365
msgid "Decoders"
msgstr "Dekodery"
#. CPU options
-#: src/libvlc.h:354
+#: src/libvlc.h:370
msgid "CPU"
msgstr "CPU"
#. Playlist options
#: plugins/gtk/gnome_interface.c:506 plugins/gtk/gnome_interface.c:1824
#: plugins/gtk/gnome_interface.c:1848 plugins/gtk/gtk_interface.c:611
-#: plugins/gtk/gtk_interface.c:2105 src/libvlc.h:362
+#: plugins/gtk/gtk_interface.c:2105 src/libvlc.h:378
msgid "Playlist"
msgstr "Lista odtwarzania"
#. Misc options
#: plugins/a52/a52.c:85 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
-#: plugins/dummy/dummy.c:51 plugins/fb/fb.c:70 plugins/filter/deinterlace.c:50
-#: plugins/filter/distort.c:50 plugins/filter/transform.c:51
-#: plugins/filter/wall.c:45 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:73
+#: plugins/fb/fb.c:70 plugins/filter/deinterlace.c:63
+#: plugins/filter/distort.c:55 plugins/filter/transform.c:56
+#: plugins/filter/wall.c:57 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:73
#: plugins/gtk/gtk.c:71 plugins/mad/mad_adec.c:66 plugins/mga/xmga.c:106
#: plugins/mpeg_vdec/video_parser.c:96 plugins/text/logger.c:86
#: plugins/win32/win32.cpp:48 plugins/x11/x11.c:55 plugins/x11/xvideo.c:65
-#: src/libvlc.h:368
+#: src/libvlc.h:384
msgid "Miscellaneous"
msgstr "Ró¿ne"
-#: src/libvlc.h:380
+#: src/libvlc.h:399
msgid "main program"
msgstr "g³ówny program"
-#: src/libvlc.h:392
+#: src/libvlc.h:411
msgid "print help"
msgstr "wy¶wietl pomoc"
-#: src/libvlc.h:394
+#: src/libvlc.h:412
msgid "print detailed help"
msgstr "wy¶wietl pomoc szczegó³ow±"
-#: src/libvlc.h:396
+#: src/libvlc.h:413
msgid "print a list of available modules"
msgstr "wy¶wietl listê dostêpnych modu³ów"
-#: src/libvlc.h:398
+#: src/libvlc.h:414
msgid "print help on module"
msgstr "wy¶wietl pomoc na temat modu³u"
-#: src/libvlc.h:401
+#: src/libvlc.h:415
msgid "print version information"
msgstr "Wy¶wietl informacje o wersji"
-#: src/libvlc.h:403
+#: src/libvlc.h:416
msgid "print build information"
msgstr "Wy¶wietl informacje o budowaniu"
-#: src/misc/configuration.c:783
+#: src/misc/configuration.c:798
msgid "boolean"
msgstr "zm. logiczna"
msgid "Linux console framebuffer module"
msgstr "modu³ bufora ramek konsoli linuksowej"
-#: plugins/filter/deinterlace.c:51
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/filter/deinterlace.c:57
msgid "Deinterlace mode"
msgstr "Tryb antyprzeplotowy"
-#: plugins/filter/deinterlace.c:52
-msgid "one of 'bob' and 'blend'"
-msgstr "jedna z opcji \"bob\" i \"blend\""
+#: plugins/filter/deinterlace.c:58
+msgid "one of \"discard\", \"blend\", \"mean\", \"bob\" or \"linear\""
+msgstr ""
-#: plugins/filter/deinterlace.c:56
+#: plugins/filter/deinterlace.c:69
msgid "deinterlacing module"
msgstr "modu³ przeplotu"
-#: plugins/filter/distort.c:51
-msgid "distort mode"
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/filter/distort.c:49
+#, fuzzy
+msgid "Distort mode"
msgstr "Tryb zniekszta³ceñ"
-#: plugins/filter/distort.c:52
+#: plugins/filter/distort.c:50
msgid "one of \"wave\" and \"ripple\""
msgstr "jedna z opcji \"wave\" i \"ripple\""
-#: plugins/filter/distort.c:56
+#: plugins/filter/distort.c:60
msgid "miscellaneous video effects module"
msgstr "ró¿ne modu³y efektów obrazu"
msgid "invert video module"
msgstr "modu³ odwracania obrazu"
-#: plugins/filter/transform.c:52
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/filter/transform.c:50
msgid "Transform type"
msgstr "Typ przekszta³cenia"
-#: plugins/filter/transform.c:53
+#: plugins/filter/transform.c:51
msgid "One of '90', '180', '270', 'hflip' and 'vflip'"
msgstr "Jeden z \"90\", \"180\", \"270\", \"hflip\" i \"vflip\""
-#: plugins/filter/transform.c:57
+#: plugins/filter/transform.c:61
msgid "image transformation module"
msgstr "modu³ transformacji obrazu"
-#: plugins/filter/wall.c:46
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/filter/wall.c:44
msgid "Number of columns"
msgstr "Liczba kolumn"
-#: plugins/filter/wall.c:47
+#: plugins/filter/wall.c:45
msgid ""
"Select the number of horizontal videowindows in which to split the video"
msgstr "Wybierz liczbê poziomych okien, na które bêdzie on rozdzielony obraz"
-#: plugins/filter/wall.c:49
+#: plugins/filter/wall.c:48
msgid "Number of rows"
msgstr "Liczba wierszy"
-#: plugins/filter/wall.c:50
+#: plugins/filter/wall.c:49
msgid "Select the number of vertical videowindows in which to split the video"
msgstr "Wybierz liczbê pionowych okien, na które bêdzie on rozdzielony obraz"
msgid "comma separated list of active windows, defaults to all"
msgstr "rozdzielana przecinkami lista aktywnych okien, domy¶lnie na wszystkie"
-#: plugins/filter/wall.c:57
+#: plugins/filter/wall.c:64
msgid "image wall video module"
msgstr "modu³ ¶ciany obrazu (image wall)"
#: plugins/gtk/gtk_interface.c:1386 plugins/gtk/gtk_interface.c:1609
#: plugins/gtk/gtk_interface.c:1915 plugins/gtk/gtk_interface.c:2046
#: plugins/gtk/gtk_interface.c:2277 plugins/gtk/gtk_interface.c:2383
-#: plugins/gtk/gtk_interface.c:2589 plugins/gtk/gtk_preferences.c:526
+#: plugins/gtk/gtk_interface.c:2589 plugins/gtk/gtk_preferences.c:540
msgid "OK"
msgstr "OK"
#: plugins/gtk/gtk_interface.c:1616 plugins/gtk/gtk_interface.c:1922
#: plugins/gtk/gtk_interface.c:2053 plugins/gtk/gtk_interface.c:2284
-#: plugins/gtk/gtk_interface.c:2596 plugins/gtk/gtk_preferences.c:538
+#: plugins/gtk/gtk_interface.c:2596 plugins/gtk/gtk_preferences.c:552
msgid "Cancel"
msgstr "Anuluj"
msgid "Invert"
msgstr "Odwróæ"
-#: plugins/gtk/gnome_interface.c:1773 plugins/gtk/gtk_preferences.c:364
+#: plugins/gtk/gnome_interface.c:1773 plugins/gtk/gtk_preferences.c:359
msgid "Select"
msgstr "Wybierz"
msgid "Channel server"
msgstr "Serwer kana³ów"
-#: plugins/gtk/gtk_preferences.c:310
+#: plugins/gtk/gtk_preferences.c:305
msgid "Name"
msgstr "Nazwa"
-#: plugins/gtk/gtk_preferences.c:310
+#: plugins/gtk/gtk_preferences.c:305
msgid "Description"
msgstr "Opis"
-#: plugins/gtk/gtk_preferences.c:353
+#: plugins/gtk/gtk_preferences.c:348
msgid "Configure"
msgstr "Skonfiguruj"
#. add new label
-#: plugins/gtk/gtk_preferences.c:376
+#: plugins/gtk/gtk_preferences.c:371
msgid "Selected:"
msgstr "Wybrano:"
-#: plugins/gtk/gtk_preferences.c:517 plugins/gtk/gtk_preferences.c:534
+#: plugins/gtk/gtk_preferences.c:531 plugins/gtk/gtk_preferences.c:548
msgid "Save"
msgstr "Zapisz"
-#: plugins/gtk/gtk_preferences.c:530
+#: plugins/gtk/gtk_preferences.c:544
msgid "Apply"
msgstr "Zastosuj"
msgid "IPv4 network abstraction layer"
msgstr "sieciowa warstwa abstrakcji IPv4"
-#: plugins/network/ipv6.c:78
+#: plugins/network/ipv6.c:79
msgid "IPv6 network abstraction layer"
msgstr "sieciowa warstwa abstrakcji IPv6"
#: plugins/x11/xvideo.c:73
msgid "XVideo extension module"
msgstr "modu³ rozszerzenia XVideo"
+
+#~ msgid "one of 'bob' and 'blend'"
+#~ msgstr "jedna z opcji \"bob\" i \"blend\""
msgid ""
msgstr ""
"Project-Id-Version: gnome-vlc\n"
-"POT-Creation-Date: 2002-06-08 00:25+0200\n"
+"POT-Creation-Date: 2002-06-11 11:25+0200\n"
"PO-Revision-Date: 2001-02-19 19:58+03:00\n"
"Last-Translator: Valek Filippov <frob@df.ru>\n"
"Language-Team: Russian <ru@li.org>\n"
msgstr ""
#. We could also have "=<" here
-#: src/libvlc.c:918 src/misc/configuration.c:798
+#: src/libvlc.c:919 src/misc/configuration.c:813
msgid "string"
msgstr ""
-#: src/libvlc.c:921 src/misc/configuration.c:783
+#: src/libvlc.c:922 src/misc/configuration.c:798
msgid "integer"
msgstr ""
-#: src/libvlc.c:924 src/misc/configuration.c:790
+#: src/libvlc.c:925 src/misc/configuration.c:805
msgid "float"
msgstr ""
-#: src/libvlc.c:930
+#: src/libvlc.c:931
msgid " (default enabled)"
msgstr ""
-#: src/libvlc.c:931
+#: src/libvlc.c:932
msgid " (default disabled)"
msgstr ""
-#: src/libvlc.c:1013
-msgid ""
-"\n"
-"Playlist items:\n"
-" *.mpg, *.vob plain MPEG-1/2 files\n"
-" [dvd:][device][@raw_device][@[title][,[chapter][,angle]]]\n"
-" DVD device\n"
-" [vcd:][device][@[title][,[chapter]]\n"
-" VCD device\n"
-" udpstream:[@[<bind address>][:<bind port>]]\n"
-" UDP stream sent by VLS\n"
-" vlc:loop loop execution of the playlist\n"
-" vlc:pause pause execution of playlist items\n"
-" vlc:quit quit VLC\n"
-msgstr ""
-
-#: src/libvlc.c:1034 src/libvlc.c:1083 src/libvlc.c:1107 src/libvlc.c:1126
+#: src/libvlc.c:1014 src/libvlc.c:1063 src/libvlc.c:1087 src/libvlc.c:1106
msgid ""
"\n"
"Press the RETURN key to continue...\n"
msgstr ""
#. Usage
-#: src/libvlc.c:1057
+#: src/libvlc.c:1037
#, c-format
msgid ""
"Usage: %s [options] [parameters] [file]...\n"
"\n"
msgstr ""
-#: src/libvlc.c:1060
+#: src/libvlc.c:1040
msgid "[module] [description]\n"
msgstr ""
-#: src/libvlc.c:1101
+#: src/libvlc.c:1081
msgid ""
"This program comes with NO WARRANTY, to the extent permitted by law.\n"
"You may redistribute it under the terms of the GNU General Public License;\n"
"with it."
msgstr ""
+#: src/libvlc.h:281
+msgid ""
+"\n"
+"Playlist items:\n"
+" *.mpg, *.vob plain MPEG-1/2 files\n"
+" [dvd:][device][@raw_device][@[title][,[chapter][,angle]]]\n"
+" DVD device\n"
+" [vcd:][device][@[title][,[chapter]]\n"
+" VCD device\n"
+" udpstream:[@[<bind address>][:<bind port>]]\n"
+" UDP stream sent by VLS\n"
+" vlc:loop loop execution of the playlist\n"
+" vlc:pause pause execution of playlist items\n"
+" vlc:quit quit VLC\n"
+msgstr ""
+
#. Interface options
-#: src/libvlc.h:299
+#: src/libvlc.h:315
msgid "Interface"
msgstr ""
#. Audio options
-#: src/libvlc.h:307
+#: src/libvlc.h:323
msgid "Audio"
msgstr ""
#. Video options
-#: plugins/directx/directx.c:53 src/libvlc.h:317
+#: plugins/directx/directx.c:53 plugins/dummy/dummy.c:51 src/libvlc.h:333
msgid "Video"
msgstr ""
#. Input options
-#: plugins/satellite/satellite.c:66 src/libvlc.h:330
+#: plugins/satellite/satellite.c:66 src/libvlc.h:346
msgid "Input"
msgstr ""
#. Decoder options
-#: src/libvlc.h:349
+#: src/libvlc.h:365
msgid "Decoders"
msgstr ""
#. CPU options
-#: src/libvlc.h:354
+#: src/libvlc.h:370
msgid "CPU"
msgstr ""
#. Playlist options
#: plugins/gtk/gnome_interface.c:506 plugins/gtk/gnome_interface.c:1824
#: plugins/gtk/gnome_interface.c:1848 plugins/gtk/gtk_interface.c:611
-#: plugins/gtk/gtk_interface.c:2105 src/libvlc.h:362
+#: plugins/gtk/gtk_interface.c:2105 src/libvlc.h:378
msgid "Playlist"
msgstr "óÐÉÓÏË ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ"
#. Misc options
#: plugins/a52/a52.c:85 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
-#: plugins/dummy/dummy.c:51 plugins/fb/fb.c:70 plugins/filter/deinterlace.c:50
-#: plugins/filter/distort.c:50 plugins/filter/transform.c:51
-#: plugins/filter/wall.c:45 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:73
+#: plugins/fb/fb.c:70 plugins/filter/deinterlace.c:63
+#: plugins/filter/distort.c:55 plugins/filter/transform.c:56
+#: plugins/filter/wall.c:57 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:73
#: plugins/gtk/gtk.c:71 plugins/mad/mad_adec.c:66 plugins/mga/xmga.c:106
#: plugins/mpeg_vdec/video_parser.c:96 plugins/text/logger.c:86
#: plugins/win32/win32.cpp:48 plugins/x11/x11.c:55 plugins/x11/xvideo.c:65
-#: src/libvlc.h:368
+#: src/libvlc.h:384
msgid "Miscellaneous"
msgstr ""
-#: src/libvlc.h:380
+#: src/libvlc.h:399
msgid "main program"
msgstr ""
-#: src/libvlc.h:392
+#: src/libvlc.h:411
msgid "print help"
msgstr ""
-#: src/libvlc.h:394
+#: src/libvlc.h:412
msgid "print detailed help"
msgstr ""
-#: src/libvlc.h:396
+#: src/libvlc.h:413
msgid "print a list of available modules"
msgstr ""
-#: src/libvlc.h:398
+#: src/libvlc.h:414
msgid "print help on module"
msgstr ""
-#: src/libvlc.h:401
+#: src/libvlc.h:415
msgid "print version information"
msgstr ""
-#: src/libvlc.h:403
+#: src/libvlc.h:416
msgid "print build information"
msgstr ""
-#: src/misc/configuration.c:783
+#: src/misc/configuration.c:798
msgid "boolean"
msgstr ""
msgid "Linux console framebuffer module"
msgstr ""
-#: plugins/filter/deinterlace.c:51
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/filter/deinterlace.c:57
msgid "Deinterlace mode"
msgstr ""
-#: plugins/filter/deinterlace.c:52
-msgid "one of 'bob' and 'blend'"
+#: plugins/filter/deinterlace.c:58
+msgid "one of \"discard\", \"blend\", \"mean\", \"bob\" or \"linear\""
msgstr ""
-#: plugins/filter/deinterlace.c:56
+#: plugins/filter/deinterlace.c:69
msgid "deinterlacing module"
msgstr ""
-#: plugins/filter/distort.c:51
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/filter/distort.c:49
#, fuzzy
-msgid "distort mode"
+msgid "Distort mode"
msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
-#: plugins/filter/distort.c:52
+#: plugins/filter/distort.c:50
msgid "one of \"wave\" and \"ripple\""
msgstr ""
-#: plugins/filter/distort.c:56
+#: plugins/filter/distort.c:60
msgid "miscellaneous video effects module"
msgstr ""
msgid "invert video module"
msgstr ""
-#: plugins/filter/transform.c:52
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/filter/transform.c:50
msgid "Transform type"
msgstr ""
-#: plugins/filter/transform.c:53
+#: plugins/filter/transform.c:51
msgid "One of '90', '180', '270', 'hflip' and 'vflip'"
msgstr ""
-#: plugins/filter/transform.c:57
+#: plugins/filter/transform.c:61
msgid "image transformation module"
msgstr ""
-#: plugins/filter/wall.c:46
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/filter/wall.c:44
msgid "Number of columns"
msgstr ""
-#: plugins/filter/wall.c:47
+#: plugins/filter/wall.c:45
msgid ""
"Select the number of horizontal videowindows in which to split the video"
msgstr ""
-#: plugins/filter/wall.c:49
+#: plugins/filter/wall.c:48
msgid "Number of rows"
msgstr ""
-#: plugins/filter/wall.c:50
+#: plugins/filter/wall.c:49
msgid "Select the number of vertical videowindows in which to split the video"
msgstr ""
msgid "comma separated list of active windows, defaults to all"
msgstr ""
-#: plugins/filter/wall.c:57
+#: plugins/filter/wall.c:64
msgid "image wall video module"
msgstr ""
#: plugins/gtk/gtk_interface.c:1386 plugins/gtk/gtk_interface.c:1609
#: plugins/gtk/gtk_interface.c:1915 plugins/gtk/gtk_interface.c:2046
#: plugins/gtk/gtk_interface.c:2277 plugins/gtk/gtk_interface.c:2383
-#: plugins/gtk/gtk_interface.c:2589 plugins/gtk/gtk_preferences.c:526
+#: plugins/gtk/gtk_interface.c:2589 plugins/gtk/gtk_preferences.c:540
msgid "OK"
msgstr ""
#: plugins/gtk/gtk_interface.c:1616 plugins/gtk/gtk_interface.c:1922
#: plugins/gtk/gtk_interface.c:2053 plugins/gtk/gtk_interface.c:2284
-#: plugins/gtk/gtk_interface.c:2596 plugins/gtk/gtk_preferences.c:538
+#: plugins/gtk/gtk_interface.c:2596 plugins/gtk/gtk_preferences.c:552
msgid "Cancel"
msgstr ""
msgid "Invert"
msgstr ""
-#: plugins/gtk/gnome_interface.c:1773 plugins/gtk/gtk_preferences.c:364
+#: plugins/gtk/gnome_interface.c:1773 plugins/gtk/gtk_preferences.c:359
msgid "Select"
msgstr ""
msgid "Channel server"
msgstr ""
-#: plugins/gtk/gtk_preferences.c:310
+#: plugins/gtk/gtk_preferences.c:305
msgid "Name"
msgstr ""
-#: plugins/gtk/gtk_preferences.c:310
+#: plugins/gtk/gtk_preferences.c:305
msgid "Description"
msgstr ""
-#: plugins/gtk/gtk_preferences.c:353
+#: plugins/gtk/gtk_preferences.c:348
msgid "Configure"
msgstr ""
#. add new label
-#: plugins/gtk/gtk_preferences.c:376
+#: plugins/gtk/gtk_preferences.c:371
msgid "Selected:"
msgstr ""
-#: plugins/gtk/gtk_preferences.c:517 plugins/gtk/gtk_preferences.c:534
+#: plugins/gtk/gtk_preferences.c:531 plugins/gtk/gtk_preferences.c:548
msgid "Save"
msgstr ""
-#: plugins/gtk/gtk_preferences.c:530
+#: plugins/gtk/gtk_preferences.c:544
msgid "Apply"
msgstr ""
msgid "IPv4 network abstraction layer"
msgstr ""
-#: plugins/network/ipv6.c:78
+#: plugins/network/ipv6.c:79
msgid "IPv6 network abstraction layer"
msgstr ""
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-06-08 00:25+0200\n"
+"POT-Creation-Date: 2002-06-11 11:25+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
msgstr ""
#. We could also have "=<" here
-#: src/libvlc.c:918 src/misc/configuration.c:798
+#: src/libvlc.c:919 src/misc/configuration.c:813
msgid "string"
msgstr ""
-#: src/libvlc.c:921 src/misc/configuration.c:783
+#: src/libvlc.c:922 src/misc/configuration.c:798
msgid "integer"
msgstr ""
-#: src/libvlc.c:924 src/misc/configuration.c:790
+#: src/libvlc.c:925 src/misc/configuration.c:805
msgid "float"
msgstr ""
-#: src/libvlc.c:930
+#: src/libvlc.c:931
msgid " (default enabled)"
msgstr ""
-#: src/libvlc.c:931
+#: src/libvlc.c:932
msgid " (default disabled)"
msgstr ""
-#: src/libvlc.c:1013
-msgid ""
-"\n"
-"Playlist items:\n"
-" *.mpg, *.vob plain MPEG-1/2 files\n"
-" [dvd:][device][@raw_device][@[title][,[chapter][,angle]]]\n"
-" DVD device\n"
-" [vcd:][device][@[title][,[chapter]]\n"
-" VCD device\n"
-" udpstream:[@[<bind address>][:<bind port>]]\n"
-" UDP stream sent by VLS\n"
-" vlc:loop loop execution of the playlist\n"
-" vlc:pause pause execution of playlist items\n"
-" vlc:quit quit VLC\n"
-msgstr ""
-
-#: src/libvlc.c:1034 src/libvlc.c:1083 src/libvlc.c:1107 src/libvlc.c:1126
+#: src/libvlc.c:1014 src/libvlc.c:1063 src/libvlc.c:1087 src/libvlc.c:1106
msgid ""
"\n"
"Press the RETURN key to continue...\n"
msgstr ""
#. Usage
-#: src/libvlc.c:1057
+#: src/libvlc.c:1037
#, c-format
msgid ""
"Usage: %s [options] [parameters] [file]...\n"
"\n"
msgstr ""
-#: src/libvlc.c:1060
+#: src/libvlc.c:1040
msgid "[module] [description]\n"
msgstr ""
-#: src/libvlc.c:1101
+#: src/libvlc.c:1081
msgid ""
"This program comes with NO WARRANTY, to the extent permitted by law.\n"
"You may redistribute it under the terms of the GNU General Public License;\n"
"with it."
msgstr ""
+#: src/libvlc.h:281
+msgid ""
+"\n"
+"Playlist items:\n"
+" *.mpg, *.vob plain MPEG-1/2 files\n"
+" [dvd:][device][@raw_device][@[title][,[chapter][,angle]]]\n"
+" DVD device\n"
+" [vcd:][device][@[title][,[chapter]]\n"
+" VCD device\n"
+" udpstream:[@[<bind address>][:<bind port>]]\n"
+" UDP stream sent by VLS\n"
+" vlc:loop loop execution of the playlist\n"
+" vlc:pause pause execution of playlist items\n"
+" vlc:quit quit VLC\n"
+msgstr ""
+
#. Interface options
-#: src/libvlc.h:299
+#: src/libvlc.h:315
msgid "Interface"
msgstr ""
#. Audio options
-#: src/libvlc.h:307
+#: src/libvlc.h:323
msgid "Audio"
msgstr ""
#. Video options
-#: plugins/directx/directx.c:53 src/libvlc.h:317
+#: plugins/directx/directx.c:53 plugins/dummy/dummy.c:51 src/libvlc.h:333
msgid "Video"
msgstr ""
#. Input options
-#: plugins/satellite/satellite.c:66 src/libvlc.h:330
+#: plugins/satellite/satellite.c:66 src/libvlc.h:346
msgid "Input"
msgstr ""
#. Decoder options
-#: src/libvlc.h:349
+#: src/libvlc.h:365
msgid "Decoders"
msgstr ""
#. CPU options
-#: src/libvlc.h:354
+#: src/libvlc.h:370
msgid "CPU"
msgstr ""
#. Playlist options
#: plugins/gtk/gnome_interface.c:506 plugins/gtk/gnome_interface.c:1824
#: plugins/gtk/gnome_interface.c:1848 plugins/gtk/gtk_interface.c:611
-#: plugins/gtk/gtk_interface.c:2105 src/libvlc.h:362
+#: plugins/gtk/gtk_interface.c:2105 src/libvlc.h:378
msgid "Playlist"
msgstr ""
#. Misc options
#: plugins/a52/a52.c:85 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81
-#: plugins/dummy/dummy.c:51 plugins/fb/fb.c:70 plugins/filter/deinterlace.c:50
-#: plugins/filter/distort.c:50 plugins/filter/transform.c:51
-#: plugins/filter/wall.c:45 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:73
+#: plugins/fb/fb.c:70 plugins/filter/deinterlace.c:63
+#: plugins/filter/distort.c:55 plugins/filter/transform.c:56
+#: plugins/filter/wall.c:57 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:73
#: plugins/gtk/gtk.c:71 plugins/mad/mad_adec.c:66 plugins/mga/xmga.c:106
#: plugins/mpeg_vdec/video_parser.c:96 plugins/text/logger.c:86
#: plugins/win32/win32.cpp:48 plugins/x11/x11.c:55 plugins/x11/xvideo.c:65
-#: src/libvlc.h:368
+#: src/libvlc.h:384
msgid "Miscellaneous"
msgstr ""
-#: src/libvlc.h:380
+#: src/libvlc.h:399
msgid "main program"
msgstr ""
-#: src/libvlc.h:392
+#: src/libvlc.h:411
msgid "print help"
msgstr ""
-#: src/libvlc.h:394
+#: src/libvlc.h:412
msgid "print detailed help"
msgstr ""
-#: src/libvlc.h:396
+#: src/libvlc.h:413
msgid "print a list of available modules"
msgstr ""
-#: src/libvlc.h:398
+#: src/libvlc.h:414
msgid "print help on module"
msgstr ""
-#: src/libvlc.h:401
+#: src/libvlc.h:415
msgid "print version information"
msgstr ""
-#: src/libvlc.h:403
+#: src/libvlc.h:416
msgid "print build information"
msgstr ""
-#: src/misc/configuration.c:783
+#: src/misc/configuration.c:798
msgid "boolean"
msgstr ""
msgid "Linux console framebuffer module"
msgstr ""
-#: plugins/filter/deinterlace.c:51
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/filter/deinterlace.c:57
msgid "Deinterlace mode"
msgstr ""
-#: plugins/filter/deinterlace.c:52
-msgid "one of 'bob' and 'blend'"
+#: plugins/filter/deinterlace.c:58
+msgid "one of \"discard\", \"blend\", \"mean\", \"bob\" or \"linear\""
msgstr ""
-#: plugins/filter/deinterlace.c:56
+#: plugins/filter/deinterlace.c:69
msgid "deinterlacing module"
msgstr ""
-#: plugins/filter/distort.c:51
-msgid "distort mode"
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/filter/distort.c:49
+msgid "Distort mode"
msgstr ""
-#: plugins/filter/distort.c:52
+#: plugins/filter/distort.c:50
msgid "one of \"wave\" and \"ripple\""
msgstr ""
-#: plugins/filter/distort.c:56
+#: plugins/filter/distort.c:60
msgid "miscellaneous video effects module"
msgstr ""
msgid "invert video module"
msgstr ""
-#: plugins/filter/transform.c:52
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/filter/transform.c:50
msgid "Transform type"
msgstr ""
-#: plugins/filter/transform.c:53
+#: plugins/filter/transform.c:51
msgid "One of '90', '180', '270', 'hflip' and 'vflip'"
msgstr ""
-#: plugins/filter/transform.c:57
+#: plugins/filter/transform.c:61
msgid "image transformation module"
msgstr ""
-#: plugins/filter/wall.c:46
+#. ****************************************************************************
+#. * Build configuration tree.
+#. ****************************************************************************
+#: plugins/filter/wall.c:44
msgid "Number of columns"
msgstr ""
-#: plugins/filter/wall.c:47
+#: plugins/filter/wall.c:45
msgid ""
"Select the number of horizontal videowindows in which to split the video"
msgstr ""
-#: plugins/filter/wall.c:49
+#: plugins/filter/wall.c:48
msgid "Number of rows"
msgstr ""
-#: plugins/filter/wall.c:50
+#: plugins/filter/wall.c:49
msgid "Select the number of vertical videowindows in which to split the video"
msgstr ""
msgid "comma separated list of active windows, defaults to all"
msgstr ""
-#: plugins/filter/wall.c:57
+#: plugins/filter/wall.c:64
msgid "image wall video module"
msgstr ""
#: plugins/gtk/gtk_interface.c:1386 plugins/gtk/gtk_interface.c:1609
#: plugins/gtk/gtk_interface.c:1915 plugins/gtk/gtk_interface.c:2046
#: plugins/gtk/gtk_interface.c:2277 plugins/gtk/gtk_interface.c:2383
-#: plugins/gtk/gtk_interface.c:2589 plugins/gtk/gtk_preferences.c:526
+#: plugins/gtk/gtk_interface.c:2589 plugins/gtk/gtk_preferences.c:540
msgid "OK"
msgstr ""
#: plugins/gtk/gtk_interface.c:1616 plugins/gtk/gtk_interface.c:1922
#: plugins/gtk/gtk_interface.c:2053 plugins/gtk/gtk_interface.c:2284
-#: plugins/gtk/gtk_interface.c:2596 plugins/gtk/gtk_preferences.c:538
+#: plugins/gtk/gtk_interface.c:2596 plugins/gtk/gtk_preferences.c:552
msgid "Cancel"
msgstr ""
msgid "Invert"
msgstr ""
-#: plugins/gtk/gnome_interface.c:1773 plugins/gtk/gtk_preferences.c:364
+#: plugins/gtk/gnome_interface.c:1773 plugins/gtk/gtk_preferences.c:359
msgid "Select"
msgstr ""
msgid "Channel server"
msgstr ""
-#: plugins/gtk/gtk_preferences.c:310
+#: plugins/gtk/gtk_preferences.c:305
msgid "Name"
msgstr ""
-#: plugins/gtk/gtk_preferences.c:310
+#: plugins/gtk/gtk_preferences.c:305
msgid "Description"
msgstr ""
-#: plugins/gtk/gtk_preferences.c:353
+#: plugins/gtk/gtk_preferences.c:348
msgid "Configure"
msgstr ""
#. add new label
-#: plugins/gtk/gtk_preferences.c:376
+#: plugins/gtk/gtk_preferences.c:371
msgid "Selected:"
msgstr ""
-#: plugins/gtk/gtk_preferences.c:517 plugins/gtk/gtk_preferences.c:534
+#: plugins/gtk/gtk_preferences.c:531 plugins/gtk/gtk_preferences.c:548
msgid "Save"
msgstr ""
-#: plugins/gtk/gtk_preferences.c:530
+#: plugins/gtk/gtk_preferences.c:544
msgid "Apply"
msgstr ""
msgid "IPv4 network abstraction layer"
msgstr ""
-#: plugins/network/ipv6.c:78
+#: plugins/network/ipv6.c:79
msgid "IPv6 network abstraction layer"
msgstr ""
* and spawns threads.
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: libvlc.c,v 1.9 2002/06/07 23:53:44 sam Exp $
+ * $Id: libvlc.c,v 1.10 2002/06/11 09:44:22 gbazin Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
p_module->psz_object_name );
for( p_item = p_module->p_config;
- p_item->i_type != MODULE_CONFIG_HINT_END;
+ p_item->i_type != CONFIG_HINT_END;
p_item++ )
{
char *psz_bra = NULL, *psz_type = NULL, *psz_ket = NULL;
switch( p_item->i_type )
{
- case MODULE_CONFIG_HINT_CATEGORY:
+ case CONFIG_HINT_CATEGORY:
+ case CONFIG_HINT_USAGE:
fprintf( stderr, " %s\n", p_item->psz_text );
break;
- case MODULE_CONFIG_ITEM_STRING:
- case MODULE_CONFIG_ITEM_FILE:
- case MODULE_CONFIG_ITEM_MODULE: /* We could also have "=<" here */
+ case CONFIG_ITEM_STRING:
+ case CONFIG_ITEM_FILE:
+ case CONFIG_ITEM_MODULE: /* We could also have "=<" here */
psz_bra = " <"; psz_type = _("string"); psz_ket = ">";
break;
- case MODULE_CONFIG_ITEM_INTEGER:
+ case CONFIG_ITEM_INTEGER:
psz_bra = " <"; psz_type = _("integer"); psz_ket = ">";
break;
- case MODULE_CONFIG_ITEM_FLOAT:
+ case CONFIG_ITEM_FLOAT:
psz_bra = " <"; psz_type = _("float"); psz_ket = ">";
break;
- case MODULE_CONFIG_ITEM_BOOL:
+ case CONFIG_ITEM_BOOL:
psz_bra = ""; psz_type = ""; psz_ket = "";
if( !b_help_module )
{
i = PADDING_SPACES - strlen( p_item->psz_name )
- strlen( psz_bra ) - strlen( psz_type )
- strlen( psz_ket ) - 1;
- if( p_item->i_type == MODULE_CONFIG_ITEM_BOOL
+ if( p_item->i_type == CONFIG_ITEM_BOOL
&& !b_help_module )
{
vlc_bool_t b_dash = VLC_FALSE;
psz_spaces[i] = '\0';
}
- if( p_item->i_type == MODULE_CONFIG_ITEM_BOOL &&
+ if( p_item->i_type == CONFIG_ITEM_BOOL &&
!b_help_module )
{
fprintf( stderr, psz_format, p_item->psz_name, psz_prefix,
}
}
- /* Yet another nasty hack.
- * Maybe we could use MODULE_CONFIG_ITEM_END to display tail messages
- * for each module?? */
- if( !strcmp( "main", p_module->psz_object_name ) )
- {
- fprintf( stderr, _("\nPlaylist items:"
- "\n *.mpg, *.vob plain MPEG-1/2 files"
- "\n [dvd:][device][@raw_device][@[title][,[chapter][,angle]]]"
- "\n DVD device"
- "\n [vcd:][device][@[title][,[chapter]]"
- "\n VCD device"
- "\n udpstream:[@[<bind address>][:<bind port>]]"
- "\n UDP stream sent by VLS"
- "\n vlc:loop loop execution of the "
- "playlist"
- "\n vlc:pause pause execution of "
- "playlist items"
- "\n vlc:quit quit VLC"
- "\n") );
- }
-
fprintf( stderr, "\n" );
}
* libvlc.h: main libvlc header
*****************************************************************************
* Copyright (C) 1998-2002 VideoLAN
- * $Id: libvlc.h,v 1.3 2002/06/07 14:30:41 sam Exp $
+ * $Id: libvlc.h,v 1.4 2002/06/11 09:44:22 gbazin Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
"you can also use this faster implementation but you might experience " \
"problems with it.")
+#define PLAYLIST_USAGE N_("\nPlaylist items:" \
+ "\n *.mpg, *.vob plain MPEG-1/2 files" \
+ "\n [dvd:][device][@raw_device][@[title][,[chapter][,angle]]]" \
+ "\n DVD device" \
+ "\n [vcd:][device][@[title][,[chapter]]" \
+ "\n VCD device" \
+ "\n udpstream:[@[<bind address>][:<bind port>]]" \
+ "\n UDP stream sent by VLS" \
+ "\n vlc:loop loop execution of the " \
+ "playlist" \
+ "\n vlc:pause pause execution of " \
+ "playlist items" \
+ "\n vlc:quit quit VLC" \
+ "\n")
+
/*
* Quick usage guide for the configuration options:
*
* MODULE_CONFIG_START
* MODULE_CONFIG_STOP
- * ADD_CATEGORY_HINT( N_(text), longtext )
- * ADD_SUBCATEGORY_HINT( N_(text), longtext )
+ * ADD_CATEGORY_HINT( N_(text), N_(longtext) )
+ * ADD_SUBCATEGORY_HINT( N_(text), N_(longtext) )
+ * ADD_USAGE_HINT( N_(text) )
* ADD_STRING( option_name, value, p_callback, N_(text), N_(longtext) )
* ADD_FILE( option_name, psz_value, p_callback, N_(text), N_(longtext) )
* ADD_MODULE( option_name, psz_value, i_capability, p_callback,
/* Interface options */
ADD_CATEGORY_HINT( N_("Interface"), NULL)
-ADD_MODULE_WITH_SHORT ( "intf", 'I', MODULE_CAPABILITY_INTF, NULL, NULL, INTF_TEXT, INTF_LONGTEXT )
+ADD_MODULE_WITH_SHORT ( "intf", 'I', MODULE_CAPABILITY_INTF, NULL, NULL, INTF_TEXT, INTF_LONGTEXT )
ADD_BOOL_WITH_SHORT ( "verbose", 'v', 0, 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 )
/* Audio options */
ADD_CATEGORY_HINT( N_("Audio"), NULL)
-ADD_MODULE_WITH_SHORT ( "aout", 'A', MODULE_CAPABILITY_AOUT, NULL, NULL, AOUT_TEXT, AOUT_LONGTEXT )
+ADD_MODULE_WITH_SHORT ( "aout", 'A', MODULE_CAPABILITY_AOUT, NULL, NULL, AOUT_TEXT, AOUT_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 )
/* Video options */
ADD_CATEGORY_HINT( N_("Video"), NULL )
-ADD_MODULE_WITH_SHORT ( "vout", 'V', MODULE_CAPABILITY_VOUT, NULL, NULL, VOUT_TEXT, VOUT_LONGTEXT )
+ADD_MODULE_WITH_SHORT ( "vout", 'V', MODULE_CAPABILITY_VOUT, 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_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 )
-ADD_MODULE ( "filter", MODULE_CAPABILITY_VOUT, NULL, NULL, FILTER_TEXT, FILTER_LONGTEXT )
+ADD_MODULE ( "filter", MODULE_CAPABILITY_VOUT_FILTER, NULL, NULL, FILTER_TEXT, FILTER_LONGTEXT )
/* Input options */
ADD_CATEGORY_HINT( N_("Input"), NULL )
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_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 )
+ADD_BOOL_WITH_SHORT ( "ipv4", '4', 0, NULL, IPV4_TEXT, IPV4_LONGTEXT )
/* Decoder options */
ADD_CATEGORY_HINT( N_("Decoders"), NULL )
ADD_BOOL ( "fast-pthread", 0, NULL, FAST_PTHREAD_TEXT, FAST_PTHREAD_LONGTEXT )
#endif
+/* Usage (mainly useful for cmd line stuff) */
+ADD_USAGE_HINT( PLAYLIST_USAGE )
+
MODULE_CONFIG_STOP
MODULE_INIT_START
static module_config_t p_help_config[] =
{
- { MODULE_CONFIG_ITEM_BOOL, "help", 'h', N_("print help"),
- NULL, NULL, 0, 0, NULL, NULL, 0 },
- { MODULE_CONFIG_ITEM_BOOL, "longhelp", 'H', N_("print detailed help"),
- NULL, NULL, 0, 0, NULL, NULL, 0 },
- { MODULE_CONFIG_ITEM_BOOL, "list", 'l', N_("print a list of available "
- "modules"), NULL, NULL, 0, 0, NULL, NULL, 0 },
- { MODULE_CONFIG_ITEM_STRING, "module", 'p', N_("print help on module"),
- NULL, NULL, 0, 0, NULL, NULL, 0 },
- { MODULE_CONFIG_ITEM_BOOL, "version", '\0',
- N_("print version information"), NULL, NULL, 0, 0, NULL, NULL, 0 },
- { MODULE_CONFIG_ITEM_BOOL, "build", '\0',
- N_("print build information"), NULL, NULL, 0, 0, NULL, NULL, 0 },
- { MODULE_CONFIG_HINT_END, NULL, '\0', NULL, NULL, NULL, 0, 0,
- NULL, NULL, 0 }
+ { CONFIG_ITEM_BOOL, "help", 'h', N_("print help") },
+ { CONFIG_ITEM_BOOL, "longhelp", 'H', N_("print detailed help") },
+ { CONFIG_ITEM_BOOL, "list", 'l', N_("print a list of available modules") },
+ { CONFIG_ITEM_STRING, "module", 'p', N_("print help on module") },
+ { CONFIG_ITEM_BOOL, "version", '\0', N_("print version information") },
+ { CONFIG_ITEM_BOOL, "build", '\0', N_("print build information") },
+ { CONFIG_HINT_END, NULL, '\0' }
};
/*****************************************************************************
* End configuration.
*****************************************************************************/
-
* configuration.c management of the modules configuration
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: configuration.c,v 1.30 2002/06/04 00:11:12 sam Exp $
+ * $Id: configuration.c,v 1.31 2002/06/11 09:44:22 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
* config_GetInt: get the value of an int variable
*****************************************************************************
* This function is used to get the value of variables which are internally
- * represented by an integer (MODULE_CONFIG_ITEM_INTEGER and
- * MODULE_CONFIG_ITEM_BOOL).
+ * represented by an integer (CONFIG_ITEM_INTEGER and
+ * CONFIG_ITEM_BOOL).
*****************************************************************************/
int __config_GetInt( vlc_object_t *p_this, const char *psz_name )
{
msg_Err( p_this, "option %s does not exist", psz_name );
return -1;
}
- if( (p_config->i_type!=MODULE_CONFIG_ITEM_INTEGER) &&
- (p_config->i_type!=MODULE_CONFIG_ITEM_BOOL) )
+ if( (p_config->i_type!=CONFIG_ITEM_INTEGER) &&
+ (p_config->i_type!=CONFIG_ITEM_BOOL) )
{
msg_Err( p_this, "option %s does not refer to an int", psz_name );
return -1;
* config_GetFloat: get the value of a float variable
*****************************************************************************
* This function is used to get the value of variables which are internally
- * represented by a float (MODULE_CONFIG_ITEM_FLOAT).
+ * represented by a float (CONFIG_ITEM_FLOAT).
*****************************************************************************/
float __config_GetFloat( vlc_object_t *p_this, const char *psz_name )
{
msg_Err( p_this, "option %s does not exist", psz_name );
return -1;
}
- if( p_config->i_type != MODULE_CONFIG_ITEM_FLOAT )
+ if( p_config->i_type != CONFIG_ITEM_FLOAT )
{
msg_Err( p_this, "option %s does not refer to a float", psz_name );
return -1;
* config_GetPsz: get the string value of a string variable
*****************************************************************************
* This function is used to get the value of variables which are internally
- * represented by a string (MODULE_CONFIG_ITEM_STRING, MODULE_CONFIG_ITEM_FILE,
- * and MODULE_CONFIG_ITEM_MODULE).
+ * represented by a string (CONFIG_ITEM_STRING, CONFIG_ITEM_FILE,
+ * and CONFIG_ITEM_MODULE).
*
- * Important note: remember to free() the returned char* because it a duplicate
- * of the actual value. It isn't safe to return a pointer to the actual value
- * as it can be modified at any time.
+ * Important note: remember to free() the returned char* because it's a
+ * duplicate of the actual value. It isn't safe to return a pointer to the
+ * actual value as it can be modified at any time.
*****************************************************************************/
char * __config_GetPsz( vlc_object_t *p_this, const char *psz_name )
{
msg_Err( p_this, "option %s does not exist", psz_name );
return NULL;
}
- if( (p_config->i_type!=MODULE_CONFIG_ITEM_STRING) &&
- (p_config->i_type!=MODULE_CONFIG_ITEM_FILE) &&
- (p_config->i_type!=MODULE_CONFIG_ITEM_MODULE) )
+ if( (p_config->i_type!=CONFIG_ITEM_STRING) &&
+ (p_config->i_type!=CONFIG_ITEM_FILE) &&
+ (p_config->i_type!=CONFIG_ITEM_MODULE) )
{
msg_Err( p_this, "option %s does not refer to a string", psz_name );
return NULL;
* config_PutPsz: set the string value of a string variable
*****************************************************************************
* This function is used to set the value of variables which are internally
- * represented by a string (MODULE_CONFIG_ITEM_STRING, MODULE_CONFIG_ITEM_FILE,
- * and MODULE_CONFIG_ITEM_MODULE).
+ * represented by a string (CONFIG_ITEM_STRING, CONFIG_ITEM_FILE,
+ * and CONFIG_ITEM_MODULE).
*****************************************************************************/
void __config_PutPsz( vlc_object_t *p_this,
const char *psz_name, char *psz_value )
msg_Err( p_this, "option %s does not exist", psz_name );
return;
}
- if( (p_config->i_type!=MODULE_CONFIG_ITEM_STRING) &&
- (p_config->i_type!=MODULE_CONFIG_ITEM_FILE) &&
- (p_config->i_type!=MODULE_CONFIG_ITEM_MODULE) )
+ if( (p_config->i_type!=CONFIG_ITEM_STRING) &&
+ (p_config->i_type!=CONFIG_ITEM_FILE) &&
+ (p_config->i_type!=CONFIG_ITEM_MODULE) )
{
msg_Err( p_this, "option %s does not refer to a string", psz_name );
return;
* config_PutInt: set the integer value of an int variable
*****************************************************************************
* This function is used to set the value of variables which are internally
- * represented by an integer (MODULE_CONFIG_ITEM_INTEGER and
- * MODULE_CONFIG_ITEM_BOOL).
+ * represented by an integer (CONFIG_ITEM_INTEGER and
+ * CONFIG_ITEM_BOOL).
*****************************************************************************/
void __config_PutInt( vlc_object_t *p_this, const char *psz_name, int i_value )
{
msg_Err( p_this, "option %s does not exist", psz_name );
return;
}
- if( (p_config->i_type!=MODULE_CONFIG_ITEM_INTEGER) &&
- (p_config->i_type!=MODULE_CONFIG_ITEM_BOOL) )
+ if( (p_config->i_type!=CONFIG_ITEM_INTEGER) &&
+ (p_config->i_type!=CONFIG_ITEM_BOOL) )
{
msg_Err( p_this, "option %s does not refer to an int", psz_name );
return;
* config_PutFloat: set the value of a float variable
*****************************************************************************
* This function is used to set the value of variables which are internally
- * represented by a float (MODULE_CONFIG_ITEM_FLOAT).
+ * represented by a float (CONFIG_ITEM_FLOAT).
*****************************************************************************/
void __config_PutFloat( vlc_object_t *p_this,
const char *psz_name, float f_value )
msg_Err( p_this, "option %s does not exist", psz_name );
return;
}
- if( p_config->i_type != MODULE_CONFIG_ITEM_FLOAT )
+ if( p_config->i_type != CONFIG_ITEM_FLOAT )
{
msg_Err( p_this, "option %s does not refer to a float", psz_name );
return;
*****************************************************************************
* FIXME: This function really needs to be optimized.
*****************************************************************************/
-module_config_t *config_FindConfig( vlc_object_t *p_this, const char *psz_name )
+module_config_t *config_FindConfig( vlc_object_t *p_this, const char *psz_name)
{
module_t *p_module;
module_config_t *p_item;
p_module = p_module->next )
{
for( p_item = p_module->p_config;
- p_item->i_type != MODULE_CONFIG_HINT_END;
+ p_item->i_type != CONFIG_HINT_END;
p_item++ )
{
- if( p_item->i_type & MODULE_CONFIG_HINT )
+ if( p_item->i_type & CONFIG_HINT )
/* ignore hints */
continue;
if( !strcmp( psz_name, p_item->psz_name ) )
*****************************************************************************/
void config_Duplicate( module_t *p_module, module_config_t *p_orig )
{
- int i, i_lines = 1;
+ int i, j, i_lines = 1;
module_config_t *p_item;
/* Calculate the structure length */
p_module->i_config_items = 0;
p_module->i_bool_items = 0;
- for( p_item = p_orig; p_item->i_type != MODULE_CONFIG_HINT_END; p_item++ )
+ for( p_item = p_orig; p_item->i_type != CONFIG_HINT_END; p_item++ )
{
i_lines++;
- if( p_item->i_type & MODULE_CONFIG_ITEM )
+ if( p_item->i_type & CONFIG_ITEM )
{
p_module->i_config_items++;
}
- if( p_item->i_type == MODULE_CONFIG_ITEM_BOOL )
+ if( p_item->i_type == CONFIG_ITEM_BOOL )
{
p_module->i_bool_items++;
}
p_module->p_config[i].psz_longtext = p_orig[i].psz_longtext ?
strdup( _(p_orig[i].psz_longtext) ) : NULL;
p_module->p_config[i].psz_value = p_orig[i].psz_value ?
- strdup( _(p_orig[i].psz_value) ) : NULL;
+ strdup( p_orig[i].psz_value ) : NULL;
p_module->p_config[i].p_lock = &p_module->object_lock;
+ /* duplicate the string list */
+ p_module->p_config[i].ppsz_list = NULL;
+ if( p_orig[i].ppsz_list )
+ {
+ for( j = 0; p_orig[i].ppsz_list[j]; j++ );
+ p_module->p_config[i].ppsz_list = malloc( (j+1) *sizeof(char *) );
+ if( p_module->p_config[i].ppsz_list )
+ {
+ for( j = 0; p_orig[i].ppsz_list[j]; j++ )
+ p_module->p_config[i].ppsz_list[j] =
+ strdup( p_orig[i].ppsz_list[j] );
+ }
+ p_module->p_config[i].ppsz_list[j] = NULL;
+ }
+
/* the callback pointer is only valid when the module is loaded so this
* value is set in ActivateModule() and reset in DeactivateModule() */
p_module->p_config[i].pf_callback = NULL;
void config_Free( module_t *p_module )
{
module_config_t *p_item = p_module->p_config;
+ int i;
- for( ; p_item->i_type != MODULE_CONFIG_HINT_END ; p_item++ )
+ for( ; p_item->i_type != CONFIG_HINT_END ; p_item++ )
{
if( p_item->psz_name )
- {
free( p_item->psz_name );
- }
if( p_item->psz_text )
- {
free( p_item->psz_text );
- }
if( p_item->psz_longtext )
- {
free( p_item->psz_longtext );
- }
if( p_item->psz_value )
- {
free( p_item->psz_value );
- }
+
+ if( p_item->ppsz_list )
+ {
+ for( i = 0; p_item->ppsz_list[i]; i++ )
+ free(p_item->ppsz_list[i]);
+ free( p_item->ppsz_list );
+ }
}
free( p_module->p_config );
*****************************************************************************/
void config_SetCallbacks( module_config_t *p_new, module_config_t *p_orig )
{
- while( p_new->i_type != MODULE_CONFIG_HINT_END )
+ while( p_new->i_type != CONFIG_HINT_END )
{
p_new->pf_callback = p_orig->pf_callback;
p_new++;
*****************************************************************************/
void config_UnsetCallbacks( module_config_t *p_new )
{
- while( p_new->i_type != MODULE_CONFIG_HINT_END )
+ while( p_new->i_type != CONFIG_HINT_END )
{
p_new->pf_callback = NULL;
p_new++;
/* try to match this option with one of the module's options */
for( p_item = p_module->p_config;
- p_item->i_type != MODULE_CONFIG_HINT_END;
+ p_item->i_type != CONFIG_HINT_END;
p_item++ )
{
- if( p_item->i_type & MODULE_CONFIG_HINT )
+ if( p_item->i_type & CONFIG_HINT )
/* ignore hints */
continue;
/* We found it */
switch( p_item->i_type )
{
- case MODULE_CONFIG_ITEM_BOOL:
- case MODULE_CONFIG_ITEM_INTEGER:
+ case CONFIG_ITEM_BOOL:
+ case CONFIG_ITEM_INTEGER:
if( !*psz_option_value )
break; /* ignore empty option */
p_item->i_value = atoi( psz_option_value);
p_item->i_value );
break;
- case MODULE_CONFIG_ITEM_FLOAT:
+ case CONFIG_ITEM_FLOAT:
if( !*psz_option_value )
break; /* ignore empty option */
p_item->f_value = (float)atof( psz_option_value);
fprintf( file, "\n\n" );
for( p_item = p_module->p_config;
- p_item->i_type != MODULE_CONFIG_HINT_END;
+ p_item->i_type != CONFIG_HINT_END;
p_item++ )
{
- if( p_item->i_type & MODULE_CONFIG_HINT )
+ if( p_item->i_type & CONFIG_HINT )
/* ignore hints */
continue;
switch( p_item->i_type )
{
- case MODULE_CONFIG_ITEM_BOOL:
- case MODULE_CONFIG_ITEM_INTEGER:
+ case CONFIG_ITEM_BOOL:
+ case CONFIG_ITEM_INTEGER:
if( p_item->psz_text )
fprintf( file, "# %s (%s)\n", p_item->psz_text,
- (p_item->i_type == MODULE_CONFIG_ITEM_BOOL) ?
+ (p_item->i_type == CONFIG_ITEM_BOOL) ?
_("boolean") : _("integer") );
fprintf( file, "%s=%i\n", p_item->psz_name, p_item->i_value );
break;
- case MODULE_CONFIG_ITEM_FLOAT:
+ case CONFIG_ITEM_FLOAT:
if( p_item->psz_text )
fprintf( file, "# %s (%s)\n", p_item->psz_text,
_("float") );
p_module = p_module->next )
{
for( p_item = p_module->p_config;
- p_item->i_type != MODULE_CONFIG_HINT_END;
+ p_item->i_type != CONFIG_HINT_END;
p_item++ )
{
/* Ignore hints */
- if( p_item->i_type & MODULE_CONFIG_HINT )
+ if( p_item->i_type & CONFIG_HINT )
continue;
/* Add item to long options */
p_longopts[i_index].name = strdup( p_item->psz_name );
if( p_longopts[i_index].name == NULL ) continue;
p_longopts[i_index].has_arg =
- (p_item->i_type == MODULE_CONFIG_ITEM_BOOL)?
+ (p_item->i_type == CONFIG_ITEM_BOOL)?
no_argument : required_argument;
p_longopts[i_index].flag = &flag;
p_longopts[i_index].val = 0;
/* When dealing with bools we also need to add the --no-foo
* option */
- if( p_item->i_type == MODULE_CONFIG_ITEM_BOOL )
+ if( p_item->i_type == CONFIG_ITEM_BOOL )
{
char *psz_name = malloc( strlen(p_item->psz_name) + 3 );
if( psz_name == NULL ) continue;
pp_shortopts[(int)p_item->i_short] = p_item;
psz_shortopts[i_shortopts] = p_item->i_short;
i_shortopts++;
- if( p_item->i_type != MODULE_CONFIG_ITEM_BOOL )
+ if( p_item->i_type != CONFIG_ITEM_BOOL )
{
psz_shortopts[i_shortopts] = ':';
i_shortopts++;
if( p_conf ) switch( p_conf->i_type )
{
- case MODULE_CONFIG_ITEM_STRING:
- case MODULE_CONFIG_ITEM_FILE:
- case MODULE_CONFIG_ITEM_MODULE:
+ case CONFIG_ITEM_STRING:
+ case CONFIG_ITEM_FILE:
+ case CONFIG_ITEM_MODULE:
config_PutPsz( p_this, psz_name, optarg );
break;
- case MODULE_CONFIG_ITEM_INTEGER:
+ case CONFIG_ITEM_INTEGER:
config_PutInt( p_this, psz_name, atoi(optarg));
break;
- case MODULE_CONFIG_ITEM_FLOAT:
+ case CONFIG_ITEM_FLOAT:
config_PutFloat( p_this, psz_name, (float)atof(optarg) );
break;
- case MODULE_CONFIG_ITEM_BOOL:
+ case CONFIG_ITEM_BOOL:
config_PutInt( p_this, psz_name, !flag );
break;
}
{
switch( pp_shortopts[i_cmd]->i_type )
{
- case MODULE_CONFIG_ITEM_STRING:
- case MODULE_CONFIG_ITEM_FILE:
- case MODULE_CONFIG_ITEM_MODULE:
+ case CONFIG_ITEM_STRING:
+ case CONFIG_ITEM_FILE:
+ case CONFIG_ITEM_MODULE:
config_PutPsz( p_this, pp_shortopts[i_cmd]->psz_name, optarg );
break;
- case MODULE_CONFIG_ITEM_INTEGER:
+ case CONFIG_ITEM_INTEGER:
config_PutInt( p_this, pp_shortopts[i_cmd]->psz_name,
atoi(optarg));
break;
- case MODULE_CONFIG_ITEM_BOOL:
+ case CONFIG_ITEM_BOOL:
config_PutInt( p_this, pp_shortopts[i_cmd]->psz_name, 1 );
break;
}
* modules.c : Builtin and plugin modules management functions
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: modules.c,v 1.67 2002/06/07 23:53:44 sam Exp $
+ * $Id: modules.c,v 1.68 2002/06/11 09:44:22 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Ethan C. Baldridge <BaldridgeE@cadmus.com>
break;
case MODULE_CAPABILITY_VOUT:
+ case MODULE_CAPABILITY_VOUT_FILTER:
i_ret = p_tmp->p_module->p_functions->vout.functions.
vout.pf_create( (vout_thread_t *)p_data );
break;
* thread, and destroy a previously oppened video output thread.
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
- * $Id: video_output.c,v 1.184 2002/06/05 18:07:03 stef Exp $
+ * $Id: video_output.c,v 1.185 2002/06/11 09:44:22 gbazin Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
return( NULL );
}
- /* Choose the best module */
- if( !(psz_plugin = config_GetPsz( p_vout, "filter" )) )
+ /* If the parent is not a VOUT object, that means we are at the start of
+ * the video output pipe */
+ if( p_parent->i_object_type != VLC_OBJECT_VOUT )
{
- psz_plugin = config_GetPsz( p_vout, "vout" );
+ /* look for the default filter configuration */
+ p_vout->psz_filter_chain = config_GetPsz( p_parent, "filter" );
+ }
+ else
+ {
+ /* continue the parent's filter chain */
+ char *psz_end;
+
+ psz_end = strchr( ((vout_thread_t *)p_parent)->psz_filter_chain, ':' );
+ if( psz_end && *(psz_end+1) )
+ p_vout->psz_filter_chain = strdup( psz_end+1 );
+ else p_vout->psz_filter_chain = NULL;
+ }
+
+ /* Choose the video output module */
+ if( !p_vout->psz_filter_chain )
+ {
+ psz_plugin = config_GetPsz( p_parent, "vout" );
+ }
+ else
+ {
+ /* the filter chain is a string list of filters separated by double
+ * colons */
+ char *psz_end;
+
+ psz_end = strchr( p_vout->psz_filter_chain, ':' );
+ if( psz_end )
+ psz_plugin = strndup( p_vout->psz_filter_chain,
+ psz_end - p_vout->psz_filter_chain );
+ else psz_plugin = strdup( p_vout->psz_filter_chain );
}
/* Initialize pictures and subpictures - translation tables and functions
&p_vout->i_window_height );
- p_vout->p_module = module_Need( p_vout, MODULE_CAPABILITY_VOUT,
- psz_plugin, (void *)p_vout );
+ p_vout->p_module = module_Need( p_vout,
+ ( p_vout->psz_filter_chain ) ?
+ MODULE_CAPABILITY_VOUT_FILTER :
+ MODULE_CAPABILITY_VOUT,
+ psz_plugin, (void *)p_vout );
if( psz_plugin ) free( psz_plugin );
if( p_vout->p_module == NULL )
projects / vlc / commitdiff