Skip to content

V
vlc-2-2
Commit cecb7e86 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options 

* ./include/configuration.h: renamed MODULE_CONFIG_* macros into
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.
parent 4d2ae9f0
Show whitespace changes
Inline Side-by-side
Showing with 1225 additions and 1067 deletions
configure
View file @ cecb7e86
......@@ -89,7 +89,7 @@ ac_help="$ac_help
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
......@@ -7388,7 +7388,7 @@ echo "configure:7388: checking for directX headers in ${with_directx}" >&5
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
......
configure.in
View file @ cecb7e86
......@@ -1158,7 +1158,7 @@ then
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,
......@@ -1169,7 +1169,7 @@ then
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
......
include/configuration.h
View file @ cecb7e86
......@@ -4,7 +4,7 @@
* It includes functions allowing to declare, get or set configuration options.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: configuration.h,v 1.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>
*
......@@ -28,22 +28,23 @@
*****************************************************************************/
/* 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
{
......@@ -59,7 +60,9 @@ 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 */
};
......@@ -100,64 +103,71 @@ VLC_EXPORT( void, config_UnsetCallbacks, ( module_config_t * ) );
/*****************************************************************************
* 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 },
include/modules.h
View file @ cecb7e86
......@@ -2,7 +2,7 @@
* 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>
*
......@@ -48,12 +48,14 @@ typedef void * module_handle_t;
#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_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[] = \
......@@ -67,7 +69,9 @@ typedef void * module_handle_t;
"motion", \
"iDCT", \
"audio output", \
"audio output filter", \
"video output", \
"video output filter", \
"chroma transformation", \
"iMDCT", \
"downmix", \
......
include/video_output.h
View file @ cecb7e86
......@@ -5,7 +5,7 @@
* 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>
*
......@@ -136,8 +136,11 @@ struct vout_thread_s
count_t c_jitter_samples; /* number of samples used for the *
* calculation of the jitter */
/* 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
......@@ -194,4 +197,3 @@ VLC_EXPORT( void, vout_DisplaySubPicture, ( vout_thread_t *, subpict
subpicture_t * vout_SortSubPictures ( vout_thread_t *, mtime_t );
void vout_RenderSubPictures ( vout_thread_t *, picture_t *,
subpicture_t * );
plugins/dummy/dummy.c
View file @ cecb7e86
......@@ -2,7 +2,7 @@
* 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>
*
......@@ -48,7 +48,7 @@ void _M( intf_getfunctions ) ( function_list_t * p_function_list );
"efficient one.")
MODULE_CONFIG_START
ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL )
ADD_CATEGORY_HINT( N_("Video"), NULL )
ADD_STRING ( "dummy-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT )
MODULE_CONFIG_STOP
......
plugins/filter/clone.c
View file @ cecb7e86
......@@ -2,7 +2,7 @@
* 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>
*
......@@ -41,17 +41,20 @@ static void vout_getfunctions( function_list_t * p_function_list );
/*****************************************************************************
* 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
......@@ -143,7 +146,6 @@ static int vout_Create( vout_thread_t *p_vout )
static int vout_Init( vout_thread_t *p_vout )
{
int i_index, i_vout;
char *psz_filter;
picture_t *p_pic;
I_OUTPUTPICTURES = 0;
......@@ -155,9 +157,6 @@ static int vout_Init( vout_thread_t *p_vout )
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++ )
......@@ -172,15 +171,10 @@ static int vout_Init( vout_thread_t *p_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 );
......
plugins/filter/crop.c
View file @ cecb7e86
......@@ -2,7 +2,7 @@
* 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>
*
......@@ -41,17 +41,23 @@ static void vout_getfunctions( function_list_t * p_function_list );
/*****************************************************************************
* 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
......@@ -250,9 +256,6 @@ static int vout_Init( vout_thread_t *p_vout )
* 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,
......@@ -260,14 +263,9 @@ static int vout_Init( vout_thread_t *p_vout )
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;
......@@ -494,4 +492,3 @@ static void UpdateStats( vout_thread_t *p_vout, picture_t *p_pic )
p_vout->p_sys->b_changed = 1;
}
plugins/filter/deinterlace.c
View file @ cecb7e86
......@@ -2,7 +2,7 @@
* 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>
*
......@@ -54,17 +54,22 @@ static void Merge ( void *, const void *, const void *, size_t );
/*****************************************************************************
* 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
......@@ -193,7 +198,6 @@ static int vout_Create( vout_thread_t *p_vout )
static int vout_Init( vout_thread_t *p_vout )
{
int i_index;
char *psz_filter;
picture_t *p_pic;
I_OUTPUTPICTURES = 0;
......@@ -218,9 +222,6 @@ static int vout_Init( vout_thread_t *p_vout )
}
/* 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 )
......@@ -260,9 +261,6 @@ static int vout_Init( vout_thread_t *p_vout )
break;
}
config_PutPsz( p_vout, "filter", psz_filter );
if( psz_filter ) free( psz_filter );
/* Everything failed */
if( p_vout->p_sys->p_vout == NULL )
{
......@@ -623,4 +621,3 @@ static void Merge( void *p_dest, const void *p_s1,
*(u8*)p_dest++ = ( (u16)(*(u8*)p_s1++) + (u16)(*(u8*)p_s2++) ) >> 1;
}
}
plugins/filter/distort.c
View file @ cecb7e86
......@@ -2,7 +2,7 @@
* 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>
*
......@@ -46,17 +46,21 @@ static void vout_getfunctions( function_list_t * p_function_list );
/*****************************************************************************
* 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
......@@ -190,7 +194,6 @@ static int vout_Create( vout_thread_t *p_vout )
static int vout_Init( vout_thread_t *p_vout )
{
int i_index;
char *psz_filter;
picture_t *p_pic;
I_OUTPUTPICTURES = 0;
......@@ -202,9 +205,6 @@ static int vout_Init( vout_thread_t *p_vout )
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 =
......@@ -212,9 +212,6 @@ static int vout_Init( vout_thread_t *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 )
{
......@@ -466,4 +463,3 @@ static void DistortRipple( vout_thread_t *p_vout, picture_t *p_inpic,
}
}
}
plugins/filter/invert.c
View file @ cecb7e86
......@@ -2,7 +2,7 @@
* 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>
*
......@@ -48,7 +48,7 @@ MODULE_INIT_START
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
......@@ -120,7 +120,6 @@ static int vout_Create( vout_thread_t *p_vout )
static int vout_Init( vout_thread_t *p_vout )
{
int i_index;
char *psz_filter;
picture_t *p_pic;
I_OUTPUTPICTURES = 0;
......@@ -132,9 +131,6 @@ static int vout_Init( vout_thread_t *p_vout )
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 =
......@@ -142,9 +138,6 @@ static int vout_Init( vout_thread_t *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 )
{
......
plugins/filter/transform.c
View file @ cecb7e86
......@@ -2,7 +2,7 @@
* 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>
*
......@@ -47,17 +47,21 @@ static void vout_getfunctions( function_list_t * p_function_list );
/*****************************************************************************
* 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
......@@ -180,7 +184,6 @@ static int vout_Create( vout_thread_t *p_vout )
static int vout_Init( vout_thread_t *p_vout )
{
int i_index;
char *psz_filter;
picture_t *p_pic;
I_OUTPUTPICTURES = 0;
......@@ -192,9 +195,6 @@ static int vout_Init( vout_thread_t *p_vout )
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 )
......@@ -214,9 +214,6 @@ static int vout_Init( vout_thread_t *p_vout )
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 )
{
......@@ -431,4 +428,3 @@ static void vout_Display( vout_thread_t *p_vout, picture_t *p_pic )
{
;
}
plugins/filter/wall.c
View file @ cecb7e86
......@@ -2,7 +2,7 @@
* 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>
*
......@@ -41,23 +41,30 @@ static void vout_getfunctions( function_list_t * p_function_list );
/*****************************************************************************
* 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
......@@ -213,7 +220,6 @@ static int vout_Create( vout_thread_t *p_vout )
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;
......@@ -225,9 +231,6 @@ static int vout_Init( vout_thread_t *p_vout )
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;
......@@ -281,8 +284,6 @@ static int vout_Init( vout_thread_t *p_vout )
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;
}
......@@ -290,9 +291,6 @@ static int vout_Init( vout_thread_t *p_vout )
}
}
config_PutPsz( p_vout, "filter", psz_filter );
if( psz_filter ) free( psz_filter );
ALLOCATE_DIRECTBUFFERS( VOUT_MAX_PICTURES );
return( 0 );
......@@ -467,4 +465,3 @@ static void RemoveAllVout( vout_thread_t *p_vout )
}
}
}
plugins/gtk/gtk_preferences.c
View file @ cecb7e86
......@@ -2,7 +2,7 @@
* 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>
* Loc Minier <lool@via.ecp.fr>
......@@ -64,7 +64,7 @@ static void GtkIntChanged ( GtkEditable *, gpointer );
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 );
......@@ -147,6 +147,7 @@ static void GtkCreateConfigDialog( char *psz_module_name,
GtkWidget *item_hbox;
GtkWidget *item_label;
GtkWidget *item_vbox;
GtkWidget *item_combo;
GtkWidget *string_entry;
GtkWidget *integer_spinbutton;
GtkWidget *float_spinbutton;
......@@ -158,18 +159,13 @@ static void GtkCreateConfigDialog( char *psz_module_name,
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;
}
......@@ -209,9 +205,8 @@ static void GtkCreateConfigDialog( char *psz_module_name,
/* 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();
......@@ -225,8 +220,8 @@ static void GtkCreateConfigDialog( char *psz_module_name,
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
......@@ -281,7 +276,7 @@ static void GtkCreateConfigDialog( char *psz_module_name,
* 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 );
......@@ -294,7 +289,7 @@ static void GtkCreateConfigDialog( char *psz_module_name,
break;
case MODULE_CONFIG_ITEM_MODULE:
case CONFIG_ITEM_MODULE:
item_frame = gtk_frame_new( p_item->psz_text );
......@@ -405,11 +400,30 @@ static void GtkCreateConfigDialog( char *psz_module_name,
(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 */
string_entry = gtk_entry_new();
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 );
}
vlc_mutex_lock( p_item->p_lock );
gtk_entry_set_text( GTK_ENTRY(string_entry),
p_item->psz_value ? p_item->psz_value : "" );
......@@ -423,10 +437,10 @@ static void GtkCreateConfigDialog( char *psz_module_name,
(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,
......@@ -445,7 +459,7 @@ static void GtkCreateConfigDialog( char *psz_module_name,
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,
......@@ -464,7 +478,7 @@ static void GtkCreateConfigDialog( char *psz_module_name,
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();
......@@ -485,7 +499,7 @@ static void GtkCreateConfigDialog( char *psz_module_name,
}
}
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 */
......@@ -600,13 +614,13 @@ void GtkConfigApply( GtkButton * button, gpointer user_data )
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 )
......@@ -715,7 +729,7 @@ static void GtkStringChanged( GtkEditable *editable, 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" );
......@@ -752,7 +766,7 @@ static void GtkIntChanged( GtkEditable *editable, 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_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),
......@@ -790,7 +804,7 @@ static void GtkFloatChanged( GtkEditable *editable, 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_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),
......@@ -826,7 +840,7 @@ static void GtkBoolChanged( GtkToggleButton *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_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" );
......@@ -843,11 +857,12 @@ static void GtkBoolChanged( GtkToggleButton *button, gpointer user_data )
/****************************************************************************
* 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 );
......@@ -861,7 +876,7 @@ static void GtkFreeHashValue( gpointer key, gpointer value, gpointer user_data)
{
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 );
}
......@@ -879,23 +894,23 @@ static gboolean GtkSaveHashValue( gpointer key, gpointer value,
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 );
......@@ -918,4 +933,5 @@ static void GtkConfigDialogDestroyed( GtkObject *object, gpointer user_data )
gtk_object_set_data( GTK_OBJECT(p_intf->p_sys->p_window),
psz_module_name, NULL );
GtkFreeHashTable( object );
}
plugins/kde/kde_preferences.cpp
View file @ cecb7e86
......@@ -51,13 +51,13 @@ KPreferences::KPreferences(intf_thread_t *p_intf, const char *psz_module_name,
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 );
......@@ -74,7 +74,7 @@ KPreferences::KPreferences(intf_thread_t *p_intf, const char *psz_module_name,
break;
case MODULE_CONFIG_ITEM_MODULE:
case CONFIG_ITEM_MODULE:
{
......@@ -108,8 +108,8 @@ KPreferences::KPreferences(intf_thread_t *p_intf, const char *psz_module_name,
}
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);
......@@ -134,7 +134,7 @@ KPreferences::KPreferences(intf_thread_t *p_intf, const char *psz_module_name,
}
break;
case MODULE_CONFIG_ITEM_INTEGER:
case CONFIG_ITEM_INTEGER:
/* add input box with default value */
{
QHBox *hb = new QHBox(category_table);
......@@ -151,7 +151,7 @@ KPreferences::KPreferences(intf_thread_t *p_intf, const char *psz_module_name,
}
break;
case MODULE_CONFIG_ITEM_FLOAT:
case CONFIG_ITEM_FLOAT:
{
QHBox *hb = new QHBox(category_table);
hb->setSpacing(spacingHint());
......@@ -169,7 +169,7 @@ KPreferences::KPreferences(intf_thread_t *p_intf, const char *psz_module_name,
break;
case MODULE_CONFIG_ITEM_BOOL:
case CONFIG_ITEM_BOOL:
/* add check button */
{
......@@ -190,7 +190,7 @@ KPreferences::KPreferences(intf_thread_t *p_intf, const char *psz_module_name,
p_item++;
}
while( p_item->i_type != MODULE_CONFIG_HINT_END );
while( p_item->i_type != CONFIG_HINT_END );
exec();
}
......@@ -236,9 +236,9 @@ void KPreferences::slotApply()
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()));
......@@ -247,11 +247,11 @@ void KPreferences::slotApply()
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;
}
......
plugins/win32/preferences.cpp
View file @ cecb7e86
......@@ -395,7 +395,7 @@ void __fastcall TPreferencesDlg::CreateConfigDialog( char *psz_module_name )
{
switch( p_item->i_type )
{
case MODULE_CONFIG_HINT_CATEGORY:
case CONFIG_HINT_CATEGORY:
/* create a new tabsheet. */
TabSheet = new TTabSheet( this );
......@@ -413,7 +413,7 @@ void __fastcall TPreferencesDlg::CreateConfigDialog( char *psz_module_name )
break;
case MODULE_CONFIG_ITEM_MODULE:
case CONFIG_ITEM_MODULE:
/* add new groupbox for the config option */
GroupBoxPlugin = new TGroupBoxPlugin( this, p_item );
......@@ -437,9 +437,9 @@ void __fastcall TPreferencesDlg::CreateConfigDialog( char *psz_module_name )
break;
case MODULE_CONFIG_ITEM_FILE:
case CONFIG_ITEM_FILE:
case MODULE_CONFIG_ITEM_STRING:
case CONFIG_ITEM_STRING:
/* add new groupbox for the config option */
GroupBoxString = new TGroupBoxString( this, p_item );
......@@ -450,7 +450,7 @@ void __fastcall TPreferencesDlg::CreateConfigDialog( char *psz_module_name )
break;
case MODULE_CONFIG_ITEM_INTEGER:
case CONFIG_ITEM_INTEGER:
/* add new groupbox for the config option */
GroupBoxInteger = new TGroupBoxInteger( this, p_item );
......@@ -461,7 +461,7 @@ void __fastcall TPreferencesDlg::CreateConfigDialog( char *psz_module_name )
break;
case MODULE_CONFIG_ITEM_BOOL:
case CONFIG_ITEM_BOOL:
/* add new groupbox for the config option */
GroupBoxBool = new TGroupBoxBool( this, p_item );
......@@ -475,7 +475,7 @@ void __fastcall TPreferencesDlg::CreateConfigDialog( char *psz_module_name )
p_item++;
}
while( p_item->i_type != MODULE_CONFIG_HINT_END );
while( p_item->i_type != CONFIG_HINT_END );
/* Reorder groupboxes inside the tabsheets */
for( i_pages = 0; i_pages < PageControlPref->PageCount; i_pages++ )
......@@ -541,14 +541,14 @@ void __fastcall TPreferencesDlg::SaveValue( module_config_t *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_intfGlobal, 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_intfGlobal, p_config->psz_name,
p_config->i_value );
break;
......
po/de.po
View file @ cecb7e86
......@@ -6,7 +6,7 @@
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"
......@@ -28,58 +28,27 @@ msgid ""
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:][Gert][@Raw_Gert][@[title][,[Kapitel][,Winkel]]]\n"
" DVD Gert\n"
" [vcd:][Gert][@[Titel][,[Kapitel]]\n"
" VCD Gert\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"
......@@ -89,19 +58,19 @@ msgstr ""
"Drck 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"
......@@ -648,86 +617,117 @@ msgid ""
"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:][Gert][@Raw_Gert][@[title][,[Kapitel][,Winkel]]]\n"
" DVD Gert\n"
" [vcd:][Gert][@[Titel][,[Kapitel]]\n"
" VCD Gert\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 "Oberflche"
#. 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 verfgbaren 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"
......@@ -916,29 +916,35 @@ msgstr "Frambuffer Ger
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 "Oberflche 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"
......@@ -946,32 +952,38 @@ 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 ""
......@@ -983,7 +995,7 @@ 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"
......@@ -1397,7 +1409,7 @@ 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"
......@@ -1447,7 +1459,7 @@ msgstr "Ger
#: 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"
......@@ -1673,7 +1685,7 @@ msgstr "K
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 "Auswhlen"
......@@ -1713,28 +1725,28 @@ msgstr "Kan
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"
......@@ -1966,7 +1978,7 @@ msgstr "MPEG I/II Video Dekoder Modul"
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"
......
po/en_GB.po
View file @ cecb7e86
......@@ -5,7 +5,7 @@
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"
......@@ -27,61 +27,45 @@ msgid ""
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"
......@@ -584,84 +568,100 @@ msgid ""
"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 ""
......@@ -850,27 +850,33 @@ 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 ""
......@@ -878,32 +884,38 @@ 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 ""
......@@ -915,7 +927,7 @@ 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 ""
......@@ -1324,7 +1336,7 @@ 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 ""
......@@ -1374,7 +1386,7 @@ 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 ""
......@@ -1596,7 +1608,7 @@ 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 ""
......@@ -1636,28 +1648,28 @@ 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 ""
......@@ -1879,7 +1891,7 @@ msgstr ""
msgid "IPv4 network abstraction layer"
msgstr ""
#: plugins/network/ipv6.c:78
#: plugins/network/ipv6.c:79
msgid "IPv6 network abstraction layer"
msgstr ""
......
po/fr.po
View file @ cecb7e86
......@@ -5,7 +5,7 @@
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"
......@@ -29,55 +29,27 @@ msgstr ""
"\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 "chane"
#: 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 dfaut)"
#: src/libvlc.c:931
#: src/libvlc.c:932
msgid " (default disabled)"
msgstr " (dsactiv par dfaut)"
#: 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"
"lments d'une playlist :\n"
" *.mpg, *.vob fichiers MPEG-1/2 standards\n"
" [dvd:][device][@raw_device][@[titre][,[chapitre][,angle]]]\n"
" priphrique DVD\n"
" [vcd:][device][@[titre][,[chapitre]]\n"
" priphrique 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"
......@@ -86,7 +58,7 @@ msgstr ""
"Appuyez sur ENTRE pour continuer...\n"
#. Usage
#: src/libvlc.c:1057
#: src/libvlc.c:1037
#, c-format
msgid ""
"Usage: %s [options] [parameters] [file]...\n"
......@@ -95,11 +67,11 @@ msgstr ""
"Utilisation: %s [options] [paramtres] [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"
......@@ -644,84 +616,112 @@ msgstr ""
"pthread. Vous pouvez utiliser cette implmentation qui est plus rapide mais "
"avec laquelle vous pouvez rencontrer des problmes."
#: 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"
"lments d'une playlist :\n"
" *.mpg, *.vob fichiers MPEG-1/2 standards\n"
" [dvd:][device][@raw_device][@[titre][,[chapitre][,angle]]]\n"
" priphrique DVD\n"
" [vcd:][device][@[titre][,[chapitre]]\n"
" priphrique 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 "Vido"
#. Input options
#: plugins/satellite/satellite.c:66 src/libvlc.h:330
#: plugins/satellite/satellite.c:66 src/libvlc.h:346
msgid "Input"
msgstr "Entre"
#. Decoder options
#: src/libvlc.h:349
#: src/libvlc.h:365
msgid "Decoders"
msgstr "Dcodeurs"
#. 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 dtaille"
#: 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 "boolen"
......@@ -910,27 +910,34 @@ msgstr "p
msgid "Linux console framebuffer module"
msgstr "module vido pour le framebuffer de Linux"
#: plugins/filter/deinterlace.c:51
#. ****************************************************************************
#. * Build configuration tree.
#. ****************************************************************************
#: plugins/filter/deinterlace.c:57
msgid "Deinterlace mode"
msgstr "Mode de dsentrelacement"
#: 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 dsentrelacement"
#: 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 vido varis"
......@@ -938,32 +945,38 @@ msgstr "module d'effets vid
msgid "invert video module"
msgstr "module d'inversion vido"
#: 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 vido 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 ""
......@@ -975,7 +988,7 @@ 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 vido de murs d'images"
......@@ -1392,7 +1405,7 @@ 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 "Valider"
......@@ -1442,7 +1455,7 @@ msgstr "Nom du device"
#: 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"
......@@ -1666,7 +1679,7 @@ msgstr "Rogner"
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 "Slectionner"
......@@ -1706,28 +1719,28 @@ msgstr "Canaux"
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 "Slectionn :"
#: 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"
......@@ -1961,7 +1974,7 @@ msgstr "module d
msgid "IPv4 network abstraction layer"
msgstr "couche d'abstraction de rseau IPv4"
#: plugins/network/ipv6.c:78
#: plugins/network/ipv6.c:79
msgid "IPv6 network abstraction layer"
msgstr "couche d'abstraction de rseau IPv6"
......@@ -2114,6 +2127,9 @@ msgstr ""
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 "dsactiver l'acclration matrielle de l'affichage"
......
po/ja.po
View file @ cecb7e86
......@@ -4,7 +4,7 @@
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"
......@@ -26,61 +26,45 @@ msgid ""
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"
......@@ -582,89 +566,105 @@ msgid ""
"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 ""
......@@ -854,29 +854,35 @@ 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 ""
......@@ -884,32 +890,38 @@ 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 ""
......@@ -921,7 +933,7 @@ 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 ""
......@@ -1341,7 +1353,7 @@ 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 ""
......@@ -1391,7 +1403,7 @@ 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 "キャンセル"
......@@ -1624,7 +1636,7 @@ 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 "選択"
......@@ -1666,31 +1678,31 @@ 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 ""
......@@ -1908,7 +1920,7 @@ msgstr ""
msgid "IPv4 network abstraction layer"
msgstr ""
#: plugins/network/ipv6.c:78
#: plugins/network/ipv6.c:79
msgid "IPv6 network abstraction layer"
msgstr ""
......
po/nl.po
View file @ cecb7e86
......@@ -5,7 +5,7 @@
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"
......@@ -28,56 +28,27 @@ msgid ""
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"
......@@ -87,19 +58,19 @@ msgstr ""
"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"
......@@ -666,86 +637,115 @@ msgstr ""
"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 ""
......@@ -934,29 +934,35 @@ 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"
......@@ -964,32 +970,38 @@ 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 ""
......@@ -1001,7 +1013,7 @@ 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"
......@@ -1423,7 +1435,7 @@ 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 ""
......@@ -1473,7 +1485,7 @@ msgstr "Apparaat naam"
#: 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"
......@@ -1699,7 +1711,7 @@ msgstr "Verklein"
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"
......@@ -1739,28 +1751,28 @@ msgstr "Kanalen"
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"
......@@ -1995,7 +2007,7 @@ msgstr ""
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"
......
po/no.po
View file @ cecb7e86
......@@ -5,7 +5,7 @@
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"
......@@ -27,61 +27,45 @@ msgid ""
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"
......@@ -592,86 +576,102 @@ msgid ""
"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 ""
......@@ -862,30 +862,36 @@ msgstr "Standardenhet:"
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 ""
......@@ -894,32 +900,38 @@ 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 ""
......@@ -931,7 +943,7 @@ 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 ""
......@@ -1358,7 +1370,7 @@ 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"
......@@ -1408,7 +1420,7 @@ msgstr "Navn p
#: 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"
......@@ -1642,7 +1654,7 @@ msgstr "Crop?"
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"
......@@ -1686,31 +1698,31 @@ msgstr "Kanaler"
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"
......@@ -1929,7 +1941,7 @@ msgstr ""
msgid "IPv4 network abstraction layer"
msgstr ""
#: plugins/network/ipv6.c:78
#: plugins/network/ipv6.c:79
msgid "IPv6 network abstraction layer"
msgstr ""
......
po/pl.po
View file @ cecb7e86
......@@ -5,7 +5,7 @@
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"
......@@ -29,55 +29,27 @@ msgstr ""
"\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 cakowita"
#: 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 " (domylnie wczone)"
#: src/libvlc.c:931
#: src/libvlc.c:932
msgid " (default disabled)"
msgstr " (domylnie wyczone)"
#: 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 zwyke pliki MPEG-1/2\n"
" [dvd:][urzdzenie][@urzadzenie_surowe][@[tytu][,[rozdzia][,kt]]]\n"
" urzadzenie DVD\n"
" [vcd:][urzdzenie][@[tytu][,[rozdzia]]\n"
" urzdzenie VCD\n"
" udpstream:[@[<przypisany adres>][:<przypisany port>]]\n"
" strumie UDP wysyany przez VLS\n"
" vlc:loop wykonywanie ptli listy odtwarzania\n"
" vlc:pause zatrzymanie odtwarzania obiektw listy\n"
" vlc:quit wyjcie 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"
......@@ -86,7 +58,7 @@ msgstr ""
"Nacinij klawisz ENTER aby kontynuowa...\n"
#. Usage
#: src/libvlc.c:1057
#: src/libvlc.c:1037
#, c-format
msgid ""
"Usage: %s [options] [parameters] [file]...\n"
......@@ -95,11 +67,11 @@ msgstr ""
"Uycie: %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"
......@@ -669,84 +641,112 @@ msgstr ""
"wtkw pthread, mona take wybra szybsz implementacj lecz wwczas mona "
"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 zwyke pliki MPEG-1/2\n"
" [dvd:][urzdzenie][@urzadzenie_surowe][@[tytu][,[rozdzia][,kt]]]\n"
" urzadzenie DVD\n"
" [vcd:][urzdzenie][@[tytu][,[rozdzia]]\n"
" urzdzenie VCD\n"
" udpstream:[@[<przypisany adres>][:<przypisany port>]]\n"
" strumie UDP wysyany przez VLS\n"
" vlc:loop wykonywanie ptli listy odtwarzania\n"
" vlc:pause zatrzymanie odtwarzania obiektw listy\n"
" vlc:quit wyjcie 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 "Dwik"
#. 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 "Wejcie"
#. 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 "Rne"
#: src/libvlc.h:380
#: src/libvlc.h:399
msgid "main program"
msgstr "gwny program"
#: src/libvlc.h:392
#: src/libvlc.h:411
msgid "print help"
msgstr "wywietl pomoc"
#: src/libvlc.h:394
#: src/libvlc.h:412
msgid "print detailed help"
msgstr "wywietl pomoc szczegow"
#: src/libvlc.h:396
#: src/libvlc.h:413
msgid "print a list of available modules"
msgstr "wywietl list dostpnych moduw"
#: src/libvlc.h:398
#: src/libvlc.h:414
msgid "print help on module"
msgstr "wywietl pomoc na temat moduu"
#: src/libvlc.h:401
#: src/libvlc.h:415
msgid "print version information"
msgstr "Wywietl informacje o wersji"
#: src/libvlc.h:403
#: src/libvlc.h:416
msgid "print build information"
msgstr "Wywietl informacje o budowaniu"
#: src/misc/configuration.c:783
#: src/misc/configuration.c:798
msgid "boolean"
msgstr "zm. logiczna"
......@@ -949,27 +949,34 @@ msgstr "urz
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 znieksztace"
#: 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 "rne moduy efektw obrazu"
......@@ -977,32 +984,38 @@ msgstr "r
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 przeksztacenia"
#: 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 ktre bdzie 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 ktre bdzie on rozdzielony obraz"
......@@ -1014,7 +1027,7 @@ msgstr "Aktywne okna"
msgid "comma separated list of active windows, defaults to all"
msgstr "rozdzielana przecinkami lista aktywnych okien, domylnie na wszystkie"
#: plugins/filter/wall.c:57
#: plugins/filter/wall.c:64
msgid "image wall video module"
msgstr "modu ciany obrazu (image wall)"
......@@ -1431,7 +1444,7 @@ 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"
......@@ -1481,7 +1494,7 @@ msgstr "Nazwa urz
#: 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"
......@@ -1705,7 +1718,7 @@ msgstr "Usu
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"
......@@ -1745,28 +1758,28 @@ msgstr "Kana
msgid "Channel server"
msgstr "Serwer kanaw"
#: 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"
......@@ -2002,7 +2015,7 @@ msgstr "modu
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"
......@@ -2161,3 +2174,6 @@ msgstr ""
#: 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\""
po/ru.po
View file @ cecb7e86
......@@ -6,7 +6,7 @@
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"
......@@ -28,61 +28,45 @@ msgid ""
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"
......@@ -573,84 +557,100 @@ msgid ""
"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 ""
......@@ -839,28 +839,34 @@ 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 ""
......@@ -868,32 +874,38 @@ 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 ""
......@@ -905,7 +917,7 @@ 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 ""
......@@ -1327,7 +1339,7 @@ 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 ""
......@@ -1379,7 +1391,7 @@ 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 ""
......@@ -1608,7 +1620,7 @@ 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 ""
......@@ -1650,28 +1662,28 @@ 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 ""
......@@ -1888,7 +1900,7 @@ msgstr ""
msgid "IPv4 network abstraction layer"
msgstr ""
#: plugins/network/ipv6.c:78
#: plugins/network/ipv6.c:79
msgid "IPv6 network abstraction layer"
msgstr ""
......
po/vlc.pot
View file @ cecb7e86
......@@ -6,7 +6,7 @@
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"
......@@ -28,61 +28,45 @@ msgid ""
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"
......@@ -573,84 +557,100 @@ msgid ""
"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 ""
......@@ -839,27 +839,33 @@ 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 ""
......@@ -867,32 +873,38 @@ 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 ""
......@@ -904,7 +916,7 @@ 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 ""
......@@ -1313,7 +1325,7 @@ 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 ""
......@@ -1363,7 +1375,7 @@ 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 ""
......@@ -1585,7 +1597,7 @@ 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 ""
......@@ -1625,28 +1637,28 @@ 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 ""
......@@ -1863,7 +1875,7 @@ msgstr ""
msgid "IPv4 network abstraction layer"
msgstr ""
#: plugins/network/ipv6.c:78
#: plugins/network/ipv6.c:79
msgid "IPv6 network abstraction layer"
msgstr ""
......
src/libvlc.c
View file @ cecb7e86
......@@ -4,7 +4,7 @@
* 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>
......@@ -899,7 +899,7 @@ static void Usage( vlc_t *p_this, const char *psz_module_name )
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;
......@@ -908,22 +908,23 @@ static void Usage( vlc_t *p_this, const char *psz_module_name )
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 )
{
......@@ -952,7 +953,7 @@ static void Usage( vlc_t *p_this, const char *psz_module_name )
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;
......@@ -988,7 +989,7 @@ static void Usage( vlc_t *p_this, const char *psz_module_name )
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,
......@@ -1005,27 +1006,6 @@ static void Usage( vlc_t *p_this, const char *psz_module_name )
}
}
/* 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" );
}
......
src/libvlc.h
View file @ cecb7e86
......@@ -2,7 +2,7 @@
* 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>
......@@ -278,13 +278,29 @@
"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,
......@@ -324,7 +340,7 @@ ADD_BOOL ( "grayscale", 0, NULL, GRAYSCALE_TEXT, GRAYSCALE_LONGTEXT )
ADD_BOOL ( "fullscreen", 0, NULL, FULLSCREEN_TEXT, FULLSCREEN_LONGTEXT )
ADD_BOOL ( "overlay", 1, NULL, OVERLAY_TEXT, OVERLAY_LONGTEXT )
ADD_INTEGER ( "spumargin", -1, NULL, SPUMARGIN_TEXT, SPUMARGIN_LONGTEXT )
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 )
......@@ -374,6 +390,9 @@ ADD_MODULE ( "demux", MODULE_CAPABILITY_DEMUX, NULL, NULL, DEMUX_TEXT, DEMUX_LO
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
......@@ -389,23 +408,15 @@ MODULE_DEACTIVATE_STOP
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.
*****************************************************************************/
src/misc/configuration.c
View file @ cecb7e86
......@@ -2,7 +2,7 @@
* 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>
*
......@@ -51,8 +51,8 @@
* 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 )
{
......@@ -66,8 +66,8 @@ 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;
......@@ -80,7 +80,7 @@ int __config_GetInt( vlc_object_t *p_this, const char *psz_name )
* 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 )
{
......@@ -94,7 +94,7 @@ 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;
......@@ -107,12 +107,12 @@ float __config_GetFloat( vlc_object_t *p_this, const char *psz_name )
* 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 )
{
......@@ -127,9 +127,9 @@ 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;
......@@ -147,8 +147,8 @@ char * __config_GetPsz( vlc_object_t *p_this, const char *psz_name )
* 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 )
......@@ -163,9 +163,9 @@ void __config_PutPsz( vlc_object_t *p_this,
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;
......@@ -191,8 +191,8 @@ void __config_PutPsz( vlc_object_t *p_this,
* 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 )
{
......@@ -206,8 +206,8 @@ 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;
......@@ -225,7 +225,7 @@ void __config_PutInt( vlc_object_t *p_this, const char *psz_name, int i_value )
* 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 )
......@@ -240,7 +240,7 @@ void __config_PutFloat( vlc_object_t *p_this,
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;
......@@ -259,7 +259,7 @@ void __config_PutFloat( vlc_object_t *p_this,
*****************************************************************************
* 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;
......@@ -271,10 +271,10 @@ module_config_t *config_FindConfig( vlc_object_t *p_this, const char *psz_name )
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 ) )
......@@ -294,23 +294,23 @@ module_config_t *config_FindConfig( vlc_object_t *p_this, const char *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++;
}
......@@ -344,10 +344,25 @@ void config_Duplicate( module_t *p_module, module_config_t *p_orig )
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;
......@@ -362,27 +377,27 @@ void config_Duplicate( module_t *p_module, module_config_t *p_orig )
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 );
}
}
......@@ -402,7 +417,7 @@ void config_Free( module_t *p_module )
*****************************************************************************/
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++;
......@@ -417,7 +432,7 @@ void config_SetCallbacks( module_config_t *p_new, module_config_t *p_orig )
*****************************************************************************/
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++;
......@@ -523,10 +538,10 @@ int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name )
/* 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;
......@@ -535,8 +550,8 @@ int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name )
/* 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);
......@@ -545,7 +560,7 @@ int __config_LoadConfigFile( vlc_object_t *p_this, const char *psz_module_name )
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);
......@@ -766,25 +781,25 @@ int __config_SaveConfigFile( vlc_object_t *p_this, const char *psz_module_name )
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") );
......@@ -925,18 +940,18 @@ int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, char *ppsz_argv[],
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;
......@@ -944,7 +959,7 @@ int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, char *ppsz_argv[],
/* 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;
......@@ -975,7 +990,7 @@ int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, char *ppsz_argv[],
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++;
......@@ -1010,18 +1025,18 @@ int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, char *ppsz_argv[],
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;
}
......@@ -1034,16 +1049,16 @@ int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc, char *ppsz_argv[],
{
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;
}
......
src/misc/modules.c
View file @ cecb7e86
......@@ -2,7 +2,7 @@
* 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>
......@@ -461,6 +461,7 @@ module_t * __module_Need( vlc_object_t *p_this,
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;
......
src/video_output/video_output.c
View file @ cecb7e86
......@@ -5,7 +5,7 @@
* 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>
*
......@@ -77,10 +77,40 @@ vout_thread_t * __vout_CreateThread ( vlc_object_t *p_parent,
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 )
{
/* 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
{
psz_plugin = config_GetPsz( p_vout, "vout" );
/* 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
......@@ -148,7 +178,10 @@ vout_thread_t * __vout_CreateThread ( vlc_object_t *p_parent,
&p_vout->i_window_height );
p_vout->p_module = module_Need( p_vout, MODULE_CAPABILITY_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 );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment