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
Expand all Hide 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 ...@@ -89,7 +89,7 @@ ac_help="$ac_help
ac_help="$ac_help ac_help="$ac_help
--enable-directx Win32 DirectX support (default enabled on Win32)" --enable-directx Win32 DirectX support (default enabled on Win32)"
ac_help="$ac_help ac_help="$ac_help
--with-directx=PATH Win32 DirectX headers and libraries" --with-directx=PATH Win32 DirectX headers"
ac_help="$ac_help ac_help="$ac_help
--enable-fb Linux framebuffer support (default enabled on Linux)" --enable-fb Linux framebuffer support (default enabled on Linux)"
ac_help="$ac_help ac_help="$ac_help
...@@ -7388,7 +7388,7 @@ echo "configure:7388: checking for directX headers in ${with_directx}" >&5 ...@@ -7388,7 +7388,7 @@ echo "configure:7388: checking for directX headers in ${with_directx}" >&5
if test -f ${with_directx}/ddraw.h if test -f ${with_directx}/ddraw.h
then then
PLUGINS="${PLUGINS} directx" PLUGINS="${PLUGINS} directx"
directx_LDFLAGS="${directx_LDFLAGS} -L${with_directx}/lib -lgdi32" directx_LDFLAGS="${directx_LDFLAGS} -lgdi32"
directx_CFLAGS="${directx_CFLAGS} -I${with_directx}" directx_CFLAGS="${directx_CFLAGS} -I${with_directx}"
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
else else
......
configure.in
View file @ cecb7e86
...@@ -1158,7 +1158,7 @@ then ...@@ -1158,7 +1158,7 @@ then
if test x$SYS = xmingw32 if test x$SYS = xmingw32
then then
AC_ARG_WITH(directx, AC_ARG_WITH(directx,
[ --with-directx=PATH Win32 DirectX headers and libraries]) [ --with-directx=PATH Win32 DirectX headers])
if test "x$with_directx" = "x" if test "x$with_directx" = "x"
then then
AC_CHECK_HEADERS(ddraw.h, AC_CHECK_HEADERS(ddraw.h,
...@@ -1169,7 +1169,7 @@ then ...@@ -1169,7 +1169,7 @@ then
if test -f ${with_directx}/ddraw.h if test -f ${with_directx}/ddraw.h
then then
PLUGINS="${PLUGINS} directx" PLUGINS="${PLUGINS} directx"
directx_LDFLAGS="${directx_LDFLAGS} -L${with_directx}/lib -lgdi32" directx_LDFLAGS="${directx_LDFLAGS} -lgdi32"
directx_CFLAGS="${directx_CFLAGS} -I${with_directx}" directx_CFLAGS="${directx_CFLAGS} -I${with_directx}"
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
else else
......
include/configuration.h
View file @ cecb7e86
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* It includes functions allowing to declare, get or set configuration options. * It includes functions allowing to declare, get or set configuration options.
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * 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> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -28,22 +28,23 @@ ...@@ -28,22 +28,23 @@
*****************************************************************************/ *****************************************************************************/
/* Configuration hint types */ /* Configuration hint types */
#define MODULE_CONFIG_HINT_END 0x0001 /* End of config */ #define CONFIG_HINT_END 0x0001 /* End of config */
#define MODULE_CONFIG_HINT_CATEGORY 0x0002 /* Start of new category */ #define CONFIG_HINT_CATEGORY 0x0002 /* Start of new category */
#define MODULE_CONFIG_HINT_SUBCATEGORY 0x0003 /* Start of sub-category */ #define CONFIG_HINT_SUBCATEGORY 0x0003 /* Start of sub-category */
#define MODULE_CONFIG_HINT_SUBCATEGORY_END 0x0004 /* End 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 */ /* Configuration item types */
#define MODULE_CONFIG_ITEM_STRING 0x0010 /* String option */ #define CONFIG_ITEM_STRING 0x0010 /* String option */
#define MODULE_CONFIG_ITEM_FILE 0x0020 /* File option */ #define CONFIG_ITEM_FILE 0x0020 /* File option */
#define MODULE_CONFIG_ITEM_MODULE 0x0030 /* Module option */ #define CONFIG_ITEM_MODULE 0x0030 /* Module option */
#define MODULE_CONFIG_ITEM_INTEGER 0x0040 /* Integer option */ #define CONFIG_ITEM_INTEGER 0x0040 /* Integer option */
#define MODULE_CONFIG_ITEM_BOOL 0x0050 /* Bool option */ #define CONFIG_ITEM_BOOL 0x0050 /* Bool option */
#define MODULE_CONFIG_ITEM_FLOAT 0x0060 /* Float option */ #define CONFIG_ITEM_FLOAT 0x0060 /* Float option */
#define MODULE_CONFIG_ITEM 0x00F0 #define CONFIG_ITEM 0x00F0
struct module_config_s struct module_config_s
{ {
...@@ -59,7 +60,9 @@ struct module_config_s ...@@ -59,7 +60,9 @@ struct module_config_s
/* Function to call when commiting a change */ /* Function to call when commiting a change */
void ( * pf_callback ) ( vlc_object_t * ); 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 */ vlc_bool_t b_dirty; /* Dirty flag to indicate a config change */
}; };
...@@ -100,64 +103,71 @@ VLC_EXPORT( void, config_UnsetCallbacks, ( module_config_t * ) ); ...@@ -100,64 +103,71 @@ VLC_EXPORT( void, config_UnsetCallbacks, ( module_config_t * ) );
/***************************************************************************** /*****************************************************************************
* Macros used to build the configuration structure. * Macros used to build the configuration structure.
* *
* Note that internally we support only 2 types of config data: int and string. * Note that internally we support only 3 types of config data: int , float
* The other types declared here just map to one of these 2 basic types but * 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 * have the advantage of also providing very good hints to a configuration
* interface so as to make it more user friendly. * interface so as to make it more user friendly.
* The configuration structure also includes category hints. These hints can * The configuration structure also includes category hints. These hints can
* provide a configuration inteface with some very useful data and also allow * provide a configuration interface with some very useful data and again
* for a more user friendly interface. * allow for a more user friendly interface.
*****************************************************************************/ *****************************************************************************/
#define MODULE_CONFIG_START \ #define MODULE_CONFIG_START \
static module_config_t p_config[] = { static module_config_t p_config[] = {
#define MODULE_CONFIG_STOP \ #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 ) \ #define ADD_CATEGORY_HINT( text, longtext ) \
{ MODULE_CONFIG_HINT_CATEGORY, NULL, '\0', text, longtext, NULL, 0, 0, \ { CONFIG_HINT_CATEGORY, NULL, '\0', text, longtext },
NULL, NULL, 0 },
#define ADD_SUBCATEGORY_HINT( text, longtext ) \ #define ADD_SUBCATEGORY_HINT( text, longtext ) \
{ MODULE_CONFIG_HINT_SUBCATEGORY, NULL, '\0', text, longtext, NULL, 0, 0, \ { CONFIG_HINT_SUBCATEGORY, NULL, '\0', text, longtext },
NULL, NULL, 0 },
#define END_SUBCATEGORY_HINT \ #define END_SUBCATEGORY_HINT \
{ MODULE_CONFIG_HINT_SUBCATEGORY_END, NULL, '\0', NULL, NULL, NULL, 0, 0, \ { CONFIG_HINT_SUBCATEGORY_END, NULL, '\0' },
NULL, NULL, 0 }, #define ADD_USAGE_HINT( text ) \
#define ADD_STRING( name, value, p_callback, text, longtext ) \ { CONFIG_HINT_USAGE, NULL, '\0', text },
{ MODULE_CONFIG_ITEM_STRING, name, '\0', text, longtext, value, 0, 0, \
p_callback, NULL, 0 }, #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 ) \ #define ADD_FILE( name, psz_value, p_callback, text, longtext ) \
{ MODULE_CONFIG_ITEM_FILE, name, '\0', text, longtext, psz_value, 0, 0, \ { CONFIG_ITEM_FILE, name, '\0', text, longtext, psz_value, 0, 0, \
p_callback, NULL, 0 }, p_callback },
#define ADD_MODULE( name, i_capability, psz_value, p_callback, text, longtext)\ #define ADD_MODULE( name, i_caps, psz_value, p_callback, text, longtext ) \
{ MODULE_CONFIG_ITEM_MODULE, name, '\0', text, longtext, psz_value, \ { CONFIG_ITEM_MODULE, name, '\0', text, longtext, psz_value, i_caps, 0, \
i_capability, 0, p_callback, NULL, 0 }, p_callback },
#define ADD_INTEGER( name, i_value, p_callback, text, longtext ) \ #define ADD_INTEGER( name, i_value, p_callback, text, longtext ) \
{ MODULE_CONFIG_ITEM_INTEGER, name, '\0', text, longtext, NULL, i_value, \ { CONFIG_ITEM_INTEGER, name, '\0', text, longtext, NULL, i_value, 0, \
0, p_callback, NULL, 0 }, p_callback },
#define ADD_FLOAT( name, f_value, p_callback, text, longtext ) \ #define ADD_FLOAT( name, f_value, p_callback, text, longtext ) \
{ MODULE_CONFIG_ITEM_FLOAT, name, '\0', text, longtext, NULL, 0, f_value, \ { CONFIG_ITEM_FLOAT, name, '\0', text, longtext, NULL, 0, f_value, \
p_callback, NULL, 0 }, p_callback },
#define ADD_BOOL( name, b_value, p_callback, text, longtext ) \ #define ADD_BOOL( name, b_value, p_callback, text, longtext ) \
{ MODULE_CONFIG_ITEM_BOOL, name, '\0', text, longtext, NULL, b_value, 0, \ { CONFIG_ITEM_BOOL, name, '\0', text, longtext, NULL, b_value, 0, \
p_callback, NULL, 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 ) \ #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, \ { CONFIG_ITEM_STRING, name, ch, text, ltext, psz_value, 0, 0, \
p_callback, NULL, 0 }, p_callback },
#define ADD_FILE_WITH_SHORT( name, ch, psz_value, p_callback, text, ltext ) \ #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, \ { CONFIG_ITEM_FILE, name, ch, text, ltext, psz_value, 0, 0, \
p_callback, NULL, 0 }, p_callback },
#define ADD_MODULE_WITH_SHORT( name, ch, i_capability, psz_value, p_callback, \ #define ADD_MODULE_WITH_SHORT( name, ch, i_capability, psz_value, p_callback, \
text, ltext) \ text, ltext) \
{ MODULE_CONFIG_ITEM_MODULE, name, ch, text, ltext, psz_value, \ { CONFIG_ITEM_MODULE, name, ch, text, ltext, psz_value, i_capability, 0, \
i_capability, 0, p_callback, NULL, 0 }, p_callback },
#define ADD_INTEGER_WITH_SHORT( name, ch, i_value, p_callback, text, ltext ) \ #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, \ { CONFIG_ITEM_INTEGER, name, ch, text, ltext, NULL, i_value, 0, \
p_callback, NULL, 0 }, p_callback },
#define ADD_FLOAT_WITH_SHORT( name, ch, f_value, p_callback, text, ltext ) \ #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, \ { CONFIG_ITEM_FLOAT, name, ch, text, ltext, NULL, 0, f_value, \
p_callback, NULL, 0 }, p_callback },
#define ADD_BOOL_WITH_SHORT( name, ch, b_value, p_callback, text, ltext ) \ #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, \ { CONFIG_ITEM_BOOL, name, ch, text, ltext, NULL, b_value, 0, \
p_callback, NULL, 0 }, p_callback },
include/modules.h
View file @ cecb7e86
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* modules.h : Module management functions. * modules.h : Module management functions.
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * 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> * Authors: Samuel Hocevar <sam@zoy.org>
* *
...@@ -39,21 +39,23 @@ typedef void * module_handle_t; ...@@ -39,21 +39,23 @@ typedef void * module_handle_t;
/***************************************************************************** /*****************************************************************************
* Module capabilities. * Module capabilities.
*****************************************************************************/ *****************************************************************************/
#define MODULE_CAPABILITY_MAIN 0 /* Main */ #define MODULE_CAPABILITY_MAIN 0 /* Main */
#define MODULE_CAPABILITY_INTF 1 /* Interface */ #define MODULE_CAPABILITY_INTF 1 /* Interface */
#define MODULE_CAPABILITY_ACCESS 2 /* Input */ #define MODULE_CAPABILITY_ACCESS 2 /* Input */
#define MODULE_CAPABILITY_DEMUX 3 /* Input */ #define MODULE_CAPABILITY_DEMUX 3 /* Input */
#define MODULE_CAPABILITY_NETWORK 4 /* Network */ #define MODULE_CAPABILITY_NETWORK 4 /* Network */
#define MODULE_CAPABILITY_DECODER 5 /* Audio or video decoder */ #define MODULE_CAPABILITY_DECODER 5 /* Audio or video decoder */
#define MODULE_CAPABILITY_MOTION 6 /* Motion compensation */ #define MODULE_CAPABILITY_MOTION 6 /* Motion compensation */
#define MODULE_CAPABILITY_IDCT 7 /* IDCT transformation */ #define MODULE_CAPABILITY_IDCT 7 /* IDCT transformation */
#define MODULE_CAPABILITY_AOUT 8 /* Audio output */ #define MODULE_CAPABILITY_AOUT 8 /* Audio output */
#define MODULE_CAPABILITY_VOUT 9 /* Video output */ #define MODULE_CAPABILITY_AOUT_FILTER 9 /* Audio output filter */
#define MODULE_CAPABILITY_CHROMA 10 /* colorspace conversion */ #define MODULE_CAPABILITY_VOUT 10 /* Video output */
#define MODULE_CAPABILITY_IMDCT 11 /* IMDCT transformation */ #define MODULE_CAPABILITY_VOUT_FILTER 11 /* Video output filter */
#define MODULE_CAPABILITY_DOWNMIX 12 /* AC3 downmix */ #define MODULE_CAPABILITY_CHROMA 12 /* colorspace conversion */
#define MODULE_CAPABILITY_MEMCPY 13 /* memcpy */ #define MODULE_CAPABILITY_IMDCT 13 /* IMDCT transformation */
#define MODULE_CAPABILITY_MAX 14 /* Total number of capabilities */ #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 \ #define DECLARE_MODULE_CAPABILITY_TABLE \
static const char *ppsz_capabilities[] = \ static const char *ppsz_capabilities[] = \
...@@ -67,7 +69,9 @@ typedef void * module_handle_t; ...@@ -67,7 +69,9 @@ typedef void * module_handle_t;
"motion", \ "motion", \
"iDCT", \ "iDCT", \
"audio output", \ "audio output", \
"audio output filter", \
"video output", \ "video output", \
"video output filter", \
"chroma transformation", \ "chroma transformation", \
"iMDCT", \ "iMDCT", \
"downmix", \ "downmix", \
......
include/video_output.h
View file @ cecb7e86
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* thread, and destroy a previously opened video output thread. * thread, and destroy a previously opened video output thread.
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * 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> * Authors: Vincent Seguin <seguin@via.ecp.fr>
* *
...@@ -136,8 +136,11 @@ struct vout_thread_s ...@@ -136,8 +136,11 @@ struct vout_thread_s
count_t c_jitter_samples; /* number of samples used for the * count_t c_jitter_samples; /* number of samples used for the *
* calculation of the jitter */ * calculation of the jitter */
int i_mouse_x, i_mouse_y, i_mouse_button; /* Mouse */
int i_mouse_x, i_mouse_y, i_mouse_button;
/* Filter chain */
char *psz_filter_chain;
}; };
#define I_OUTPUTPICTURES p_vout->output.i_pictures #define I_OUTPUTPICTURES p_vout->output.i_pictures
...@@ -194,4 +197,3 @@ VLC_EXPORT( void, vout_DisplaySubPicture, ( vout_thread_t *, subpict ...@@ -194,4 +197,3 @@ VLC_EXPORT( void, vout_DisplaySubPicture, ( vout_thread_t *, subpict
subpicture_t * vout_SortSubPictures ( vout_thread_t *, mtime_t ); subpicture_t * vout_SortSubPictures ( vout_thread_t *, mtime_t );
void vout_RenderSubPictures ( vout_thread_t *, picture_t *, void vout_RenderSubPictures ( vout_thread_t *, picture_t *,
subpicture_t * ); subpicture_t * );
plugins/dummy/dummy.c
View file @ cecb7e86
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* dummy.c : dummy plugin for vlc * dummy.c : dummy plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN * 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> * Authors: Samuel Hocevar <sam@zoy.org>
* *
...@@ -48,8 +48,8 @@ void _M( intf_getfunctions ) ( function_list_t * p_function_list ); ...@@ -48,8 +48,8 @@ void _M( intf_getfunctions ) ( function_list_t * p_function_list );
"efficient one.") "efficient one.")
MODULE_CONFIG_START 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 ) ADD_STRING ( "dummy-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT )
MODULE_CONFIG_STOP MODULE_CONFIG_STOP
......
plugins/filter/clone.c
View file @ cecb7e86
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* clone.c : Clone video plugin for vlc * clone.c : Clone video plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * 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> * Authors: Samuel Hocevar <sam@zoy.org>
* *
...@@ -41,17 +41,20 @@ static void vout_getfunctions( function_list_t * p_function_list ); ...@@ -41,17 +41,20 @@ static void vout_getfunctions( function_list_t * p_function_list );
/***************************************************************************** /*****************************************************************************
* Build configuration tree. * 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 MODULE_CONFIG_START
ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL ) ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL )
ADD_INTEGER ( "clone-count", 2, NULL, N_("Number of clones"), ADD_INTEGER ( "clone-count", 2, NULL, COUNT_TEXT, COUNT_LONGTEXT )
N_("Select the number of videowindows in which to clone the video") )
MODULE_CONFIG_STOP MODULE_CONFIG_STOP
MODULE_INIT_START MODULE_INIT_START
SET_DESCRIPTION( _("image clone video module") ) SET_DESCRIPTION( _("image clone video module") )
/* Capability score set to 0 because we don't want to be spawned /* Capability score set to 0 because we don't want to be spawned
* as a video output unless explicitly requested to */ * as a video output unless explicitly requested to */
ADD_CAPABILITY( VOUT, 0 ) ADD_CAPABILITY( VOUT_FILTER, 0 )
ADD_SHORTCUT( "clone" ) ADD_SHORTCUT( "clone" )
MODULE_INIT_STOP MODULE_INIT_STOP
...@@ -143,7 +146,6 @@ static int vout_Create( vout_thread_t *p_vout ) ...@@ -143,7 +146,6 @@ static int vout_Create( vout_thread_t *p_vout )
static int vout_Init( vout_thread_t *p_vout ) static int vout_Init( vout_thread_t *p_vout )
{ {
int i_index, i_vout; int i_index, i_vout;
char *psz_filter;
picture_t *p_pic; picture_t *p_pic;
I_OUTPUTPICTURES = 0; I_OUTPUTPICTURES = 0;
...@@ -155,9 +157,6 @@ static int vout_Init( vout_thread_t *p_vout ) ...@@ -155,9 +157,6 @@ static int vout_Init( vout_thread_t *p_vout )
p_vout->output.i_aspect = p_vout->render.i_aspect; p_vout->output.i_aspect = p_vout->render.i_aspect;
/* Try to open the real video output */ /* 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" ); msg_Dbg( p_vout, "spawning the real video outputs" );
for( i_vout = 0; i_vout < p_vout->p_sys->i_clones; i_vout++ ) 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 ) ...@@ -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 );
p_vout->p_sys->i_clones = i_vout; p_vout->p_sys->i_clones = i_vout;
RemoveAllVout( p_vout ); RemoveAllVout( p_vout );
config_PutPsz( p_vout, "filter", psz_filter );
if( psz_filter ) free( psz_filter );
return 0; return 0;
} }
} }
config_PutPsz( p_vout, "filter", psz_filter );
if( psz_filter ) free( psz_filter );
ALLOCATE_DIRECTBUFFERS( VOUT_MAX_PICTURES ); ALLOCATE_DIRECTBUFFERS( VOUT_MAX_PICTURES );
return( 0 ); return( 0 );
......
plugins/filter/crop.c
View file @ cecb7e86
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* crop.c : Crop video plugin for vlc * crop.c : Crop video plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * 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> * Authors: Samuel Hocevar <sam@zoy.org>
* *
...@@ -41,17 +41,23 @@ static void vout_getfunctions( function_list_t * p_function_list ); ...@@ -41,17 +41,23 @@ static void vout_getfunctions( function_list_t * p_function_list );
/***************************************************************************** /*****************************************************************************
* Build configuration tree. * 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 MODULE_CONFIG_START
ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL ) 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_STRING ( "crop-geometry", NULL, NULL, GEOMETRY_TEXT, GEOMETRY_LONGTEXT )
ADD_BOOL ( "autocrop", 0, NULL, N_("Automatic cropping"), N_("Activate automatic black border cropping") ) ADD_BOOL ( "autocrop", 0, NULL, AUTOCROP_TEXT, AUTOCROP_LONGTEXT )
MODULE_CONFIG_STOP MODULE_CONFIG_STOP
MODULE_INIT_START MODULE_INIT_START
SET_DESCRIPTION( _("image crop video module") ) SET_DESCRIPTION( _("image crop video module") )
/* Capability score set to 0 because we don't want to be spawned /* Capability score set to 0 because we don't want to be spawned
* as a video output unless explicitly requested to */ * as a video output unless explicitly requested to */
ADD_CAPABILITY( VOUT, 0 ) ADD_CAPABILITY( VOUT_FILTER, 0 )
ADD_SHORTCUT( "crop" ) ADD_SHORTCUT( "crop" )
MODULE_INIT_STOP MODULE_INIT_STOP
...@@ -250,9 +256,6 @@ static int vout_Init( vout_thread_t *p_vout ) ...@@ -250,9 +256,6 @@ static int vout_Init( vout_thread_t *p_vout )
* p_vout->p_sys->i_width / p_vout->output.i_width; * p_vout->p_sys->i_width / p_vout->output.i_width;
/* Try to open the real video output */ /* 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 = p_vout->p_sys->p_vout =
vout_CreateThread( p_vout, vout_CreateThread( p_vout,
p_vout->p_sys->i_width, p_vout->p_sys->i_height, 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 ) ...@@ -260,14 +263,9 @@ static int vout_Init( vout_thread_t *p_vout )
if( p_vout->p_sys->p_vout == NULL ) if( p_vout->p_sys->p_vout == NULL )
{ {
msg_Err( p_vout, "failed to create vout" ); msg_Err( p_vout, "failed to create vout" );
config_PutPsz( p_vout, "filter", psz_var );
if( psz_var ) free( psz_var );
return 0; return 0;
} }
config_PutPsz( p_vout, "filter", psz_var );
if( psz_var ) free( psz_var );
ALLOCATE_DIRECTBUFFERS( VOUT_MAX_PICTURES ); ALLOCATE_DIRECTBUFFERS( VOUT_MAX_PICTURES );
return 0; return 0;
...@@ -494,4 +492,3 @@ static void UpdateStats( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -494,4 +492,3 @@ static void UpdateStats( vout_thread_t *p_vout, picture_t *p_pic )
p_vout->p_sys->b_changed = 1; p_vout->p_sys->b_changed = 1;
} }
plugins/filter/deinterlace.c
View file @ cecb7e86
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* deinterlace.c : deinterlacer plugin for vlc * deinterlace.c : deinterlacer plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN * 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> * Authors: Samuel Hocevar <sam@zoy.org>
* *
...@@ -54,17 +54,22 @@ static void Merge ( void *, const void *, const void *, size_t ); ...@@ -54,17 +54,22 @@ static void Merge ( void *, const void *, const void *, size_t );
/***************************************************************************** /*****************************************************************************
* Build configuration tree. * 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 MODULE_CONFIG_START
ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL ) ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL )
ADD_STRING ( "deinterlace-mode", "discard", NULL, N_("Deinterlace mode"), ADD_STRING_FROM_LIST ( "deinterlace-mode", "discard", mode_list, NULL, \
N_("one of \"discard\", \"blend\", \"mean\", \"bob\" or \"linear\"") ) MODE_TEXT, MODE_LONGTEXT )
MODULE_CONFIG_STOP MODULE_CONFIG_STOP
MODULE_INIT_START MODULE_INIT_START
SET_DESCRIPTION( _("deinterlacing module") ) SET_DESCRIPTION( _("deinterlacing module") )
/* Capability score set to 0 because we don't want to be spawned /* Capability score set to 0 because we don't want to be spawned
* as a video output unless explicitly requested to */ * as a video output unless explicitly requested to */
ADD_CAPABILITY( VOUT, 0 ) ADD_CAPABILITY( VOUT_FILTER, 0 )
ADD_SHORTCUT( "deinterlace" ) ADD_SHORTCUT( "deinterlace" )
MODULE_INIT_STOP MODULE_INIT_STOP
...@@ -193,7 +198,6 @@ static int vout_Create( vout_thread_t *p_vout ) ...@@ -193,7 +198,6 @@ static int vout_Create( vout_thread_t *p_vout )
static int vout_Init( vout_thread_t *p_vout ) static int vout_Init( vout_thread_t *p_vout )
{ {
int i_index; int i_index;
char *psz_filter;
picture_t *p_pic; picture_t *p_pic;
I_OUTPUTPICTURES = 0; I_OUTPUTPICTURES = 0;
...@@ -218,9 +222,6 @@ static int vout_Init( vout_thread_t *p_vout ) ...@@ -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 */ /* 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" ); msg_Dbg( p_vout, "spawning the real video output" );
switch( p_vout->render.i_chroma ) switch( p_vout->render.i_chroma )
...@@ -260,9 +261,6 @@ static int vout_Init( vout_thread_t *p_vout ) ...@@ -260,9 +261,6 @@ static int vout_Init( vout_thread_t *p_vout )
break; break;
} }
config_PutPsz( p_vout, "filter", psz_filter );
if( psz_filter ) free( psz_filter );
/* Everything failed */ /* Everything failed */
if( p_vout->p_sys->p_vout == NULL ) if( p_vout->p_sys->p_vout == NULL )
{ {
...@@ -623,4 +621,3 @@ static void Merge( void *p_dest, const void *p_s1, ...@@ -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; *(u8*)p_dest++ = ( (u16)(*(u8*)p_s1++) + (u16)(*(u8*)p_s2++) ) >> 1;
} }
} }
plugins/filter/distort.c
View file @ cecb7e86
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* distort.c : Misc video effects plugin for vlc * distort.c : Misc video effects plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN * 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> * Authors: Samuel Hocevar <sam@zoy.org>
* *
...@@ -46,17 +46,21 @@ static void vout_getfunctions( function_list_t * p_function_list ); ...@@ -46,17 +46,21 @@ static void vout_getfunctions( function_list_t * p_function_list );
/***************************************************************************** /*****************************************************************************
* Build configuration tree. * 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 MODULE_CONFIG_START
ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL ) ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL )
ADD_STRING ( "distort-mode", "wave", NULL, N_("distort mode"), ADD_STRING_FROM_LIST( "distort-mode", "wave", mode_list, NULL, MODE_TEXT, MODE_LONGTEXT )
N_("one of \"wave\" and \"ripple\"") )
MODULE_CONFIG_STOP MODULE_CONFIG_STOP
MODULE_INIT_START MODULE_INIT_START
SET_DESCRIPTION( _("miscellaneous video effects module") ) SET_DESCRIPTION( _("miscellaneous video effects module") )
/* Capability score set to 0 because we don't want to be spawned /* Capability score set to 0 because we don't want to be spawned
* as a video output unless explicitly requested to */ * as a video output unless explicitly requested to */
ADD_CAPABILITY( VOUT, 0 ) ADD_CAPABILITY( VOUT_FILTER, 0 )
ADD_SHORTCUT( "distort" ) ADD_SHORTCUT( "distort" )
MODULE_INIT_STOP MODULE_INIT_STOP
...@@ -190,7 +194,6 @@ static int vout_Create( vout_thread_t *p_vout ) ...@@ -190,7 +194,6 @@ static int vout_Create( vout_thread_t *p_vout )
static int vout_Init( vout_thread_t *p_vout ) static int vout_Init( vout_thread_t *p_vout )
{ {
int i_index; int i_index;
char *psz_filter;
picture_t *p_pic; picture_t *p_pic;
I_OUTPUTPICTURES = 0; I_OUTPUTPICTURES = 0;
...@@ -202,9 +205,6 @@ static int vout_Init( vout_thread_t *p_vout ) ...@@ -202,9 +205,6 @@ static int vout_Init( vout_thread_t *p_vout )
p_vout->output.i_aspect = p_vout->render.i_aspect; p_vout->output.i_aspect = p_vout->render.i_aspect;
/* Try to open the real video output */ /* 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" ); msg_Dbg( p_vout, "spawning the real video output" );
p_vout->p_sys->p_vout = p_vout->p_sys->p_vout =
...@@ -212,9 +212,6 @@ static int vout_Init( vout_thread_t *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_width, p_vout->render.i_height,
p_vout->render.i_chroma, p_vout->render.i_aspect ); 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 */ /* Everything failed */
if( p_vout->p_sys->p_vout == NULL ) if( p_vout->p_sys->p_vout == NULL )
{ {
...@@ -466,4 +463,3 @@ static void DistortRipple( vout_thread_t *p_vout, picture_t *p_inpic, ...@@ -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 @@ ...@@ -2,7 +2,7 @@
* invert.c : Invert video plugin for vlc * invert.c : Invert video plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN * 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> * Authors: Samuel Hocevar <sam@zoy.org>
* *
...@@ -48,7 +48,7 @@ MODULE_INIT_START ...@@ -48,7 +48,7 @@ MODULE_INIT_START
SET_DESCRIPTION( _("invert video module") ) SET_DESCRIPTION( _("invert video module") )
/* Capability score set to 0 because we don't want to be spawned /* Capability score set to 0 because we don't want to be spawned
* as a video output unless explicitly requested to */ * as a video output unless explicitly requested to */
ADD_CAPABILITY( VOUT, 0 ) ADD_CAPABILITY( VOUT_FILTER, 0 )
ADD_SHORTCUT( "invert" ) ADD_SHORTCUT( "invert" )
MODULE_INIT_STOP MODULE_INIT_STOP
...@@ -120,7 +120,6 @@ static int vout_Create( vout_thread_t *p_vout ) ...@@ -120,7 +120,6 @@ static int vout_Create( vout_thread_t *p_vout )
static int vout_Init( vout_thread_t *p_vout ) static int vout_Init( vout_thread_t *p_vout )
{ {
int i_index; int i_index;
char *psz_filter;
picture_t *p_pic; picture_t *p_pic;
I_OUTPUTPICTURES = 0; I_OUTPUTPICTURES = 0;
...@@ -132,9 +131,6 @@ static int vout_Init( vout_thread_t *p_vout ) ...@@ -132,9 +131,6 @@ static int vout_Init( vout_thread_t *p_vout )
p_vout->output.i_aspect = p_vout->render.i_aspect; p_vout->output.i_aspect = p_vout->render.i_aspect;
/* Try to open the real video output */ /* 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" ); msg_Dbg( p_vout, "spawning the real video output" );
p_vout->p_sys->p_vout = p_vout->p_sys->p_vout =
...@@ -142,9 +138,6 @@ static int vout_Init( vout_thread_t *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_width, p_vout->render.i_height,
p_vout->render.i_chroma, p_vout->render.i_aspect ); 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 */ /* Everything failed */
if( p_vout->p_sys->p_vout == NULL ) if( p_vout->p_sys->p_vout == NULL )
{ {
......
plugins/filter/transform.c
View file @ cecb7e86
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* transform.c : transform image plugin for vlc * transform.c : transform image plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN * 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> * Authors: Samuel Hocevar <sam@zoy.org>
* *
...@@ -47,17 +47,21 @@ static void vout_getfunctions( function_list_t * p_function_list ); ...@@ -47,17 +47,21 @@ static void vout_getfunctions( function_list_t * p_function_list );
/***************************************************************************** /*****************************************************************************
* Build configuration tree. * 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 MODULE_CONFIG_START
ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL ) ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL )
ADD_STRING("transform-type", "90", NULL, N_("Transform type"), ADD_STRING_FROM_LIST("transform-type", "90", type_list, NULL, TYPE_TEXT, TYPE_LONGTEXT)
N_("One of '90', '180', '270', 'hflip' and 'vflip'"))
MODULE_CONFIG_STOP MODULE_CONFIG_STOP
MODULE_INIT_START MODULE_INIT_START
SET_DESCRIPTION( _("image transformation module") ) SET_DESCRIPTION( _("image transformation module") )
/* Capability score set to 0 because we don't want to be spawned /* Capability score set to 0 because we don't want to be spawned
* as a video output unless explicitly requested to */ * as a video output unless explicitly requested to */
ADD_CAPABILITY( VOUT, 0 ) ADD_CAPABILITY( VOUT_FILTER, 0 )
ADD_SHORTCUT( "transform" ) ADD_SHORTCUT( "transform" )
MODULE_INIT_STOP MODULE_INIT_STOP
...@@ -180,7 +184,6 @@ static int vout_Create( vout_thread_t *p_vout ) ...@@ -180,7 +184,6 @@ static int vout_Create( vout_thread_t *p_vout )
static int vout_Init( vout_thread_t *p_vout ) static int vout_Init( vout_thread_t *p_vout )
{ {
int i_index; int i_index;
char *psz_filter;
picture_t *p_pic; picture_t *p_pic;
I_OUTPUTPICTURES = 0; I_OUTPUTPICTURES = 0;
...@@ -192,9 +195,6 @@ static int vout_Init( vout_thread_t *p_vout ) ...@@ -192,9 +195,6 @@ static int vout_Init( vout_thread_t *p_vout )
p_vout->output.i_aspect = p_vout->render.i_aspect; p_vout->output.i_aspect = p_vout->render.i_aspect;
/* Try to open the real video output */ /* 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" ); msg_Dbg( p_vout, "spawning the real video output" );
if( p_vout->p_sys->b_rotation ) if( p_vout->p_sys->b_rotation )
...@@ -214,9 +214,6 @@ static int vout_Init( vout_thread_t *p_vout ) ...@@ -214,9 +214,6 @@ static int vout_Init( vout_thread_t *p_vout )
p_vout->render.i_chroma, p_vout->render.i_aspect ); 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 */ /* Everything failed */
if( p_vout->p_sys->p_vout == NULL ) 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 ) ...@@ -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 @@ ...@@ -2,7 +2,7 @@
* wall.c : Wall video plugin for vlc * wall.c : Wall video plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN * 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> * Authors: Samuel Hocevar <sam@zoy.org>
* *
...@@ -41,23 +41,30 @@ static void vout_getfunctions( function_list_t * p_function_list ); ...@@ -41,23 +41,30 @@ static void vout_getfunctions( function_list_t * p_function_list );
/***************************************************************************** /*****************************************************************************
* Build configuration tree. * 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 MODULE_CONFIG_START
ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL ) ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL )
ADD_INTEGER ( "wall-cols", 3, NULL, N_("Number of columns"), ADD_INTEGER ( "wall-cols", 3, NULL, COLS_TEXT, COLS_LONGTEXT )
N_("Select the number of horizontal videowindows in which " ADD_INTEGER ( "wall-rows", 3, NULL, ROWS_TEXT, ROWS_LONGTEXT )
"to split the video") ) ADD_STRING ( "wall-active", NULL, NULL, ACTIVE_TEXT, ACTIVE_LONGTEXT )
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") )
MODULE_CONFIG_STOP MODULE_CONFIG_STOP
MODULE_INIT_START MODULE_INIT_START
SET_DESCRIPTION( _("image wall video module") ) SET_DESCRIPTION( _("image wall video module") )
/* Capability score set to 0 because we don't want to be spawned /* Capability score set to 0 because we don't want to be spawned
* as a video output unless explicitly requested to */ * as a video output unless explicitly requested to */
ADD_CAPABILITY( VOUT, 0 ) ADD_CAPABILITY( VOUT_FILTER, 0 )
ADD_SHORTCUT( "wall" ) ADD_SHORTCUT( "wall" )
MODULE_INIT_STOP MODULE_INIT_STOP
...@@ -213,7 +220,6 @@ static int vout_Create( vout_thread_t *p_vout ) ...@@ -213,7 +220,6 @@ static int vout_Create( vout_thread_t *p_vout )
static int vout_Init( 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; int i_index, i_row, i_col, i_width, i_height;
char *psz_filter;
picture_t *p_pic; picture_t *p_pic;
I_OUTPUTPICTURES = 0; I_OUTPUTPICTURES = 0;
...@@ -225,9 +231,6 @@ static int vout_Init( vout_thread_t *p_vout ) ...@@ -225,9 +231,6 @@ static int vout_Init( vout_thread_t *p_vout )
p_vout->output.i_aspect = p_vout->render.i_aspect; p_vout->output.i_aspect = p_vout->render.i_aspect;
/* Try to open the real video output */ /* 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" ); msg_Dbg( p_vout, "spawning the real video outputs" );
p_vout->p_sys->i_vout = 0; p_vout->p_sys->i_vout = 0;
...@@ -281,8 +284,6 @@ static int vout_Init( vout_thread_t *p_vout ) ...@@ -281,8 +284,6 @@ static int vout_Init( vout_thread_t *p_vout )
msg_Err( p_vout, "failed to get %ix%i vout threads", msg_Err( p_vout, "failed to get %ix%i vout threads",
p_vout->p_sys->i_col, p_vout->p_sys->i_row ); p_vout->p_sys->i_col, p_vout->p_sys->i_row );
RemoveAllVout( p_vout ); RemoveAllVout( p_vout );
config_PutPsz( p_vout, "filter", psz_filter );
if( psz_filter ) free( psz_filter );
return 0; return 0;
} }
...@@ -290,9 +291,6 @@ static int vout_Init( vout_thread_t *p_vout ) ...@@ -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 ); ALLOCATE_DIRECTBUFFERS( VOUT_MAX_PICTURES );
return( 0 ); return( 0 );
...@@ -467,4 +465,3 @@ static void RemoveAllVout( vout_thread_t *p_vout ) ...@@ -467,4 +465,3 @@ static void RemoveAllVout( vout_thread_t *p_vout )
} }
} }
} }
plugins/gtk/gtk_preferences.c
View file @ cecb7e86
This diff is collapsed.
plugins/kde/kde_preferences.cpp
View file @ cecb7e86
...@@ -51,13 +51,13 @@ KPreferences::KPreferences(intf_thread_t *p_intf, const char *psz_module_name, ...@@ -51,13 +51,13 @@ KPreferences::KPreferences(intf_thread_t *p_intf, const char *psz_module_name,
switch( p_item->i_type ) switch( p_item->i_type )
{ {
case MODULE_CONFIG_HINT_CATEGORY: case CONFIG_HINT_CATEGORY:
case MODULE_CONFIG_HINT_END: case CONFIG_HINT_END:
/* /*
* Now we can start taking care of the new category * 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 ); category_label = new QString( p_item->psz_text );
QFrame *page = addPage( *category_label ); QFrame *page = addPage( *category_label );
...@@ -74,7 +74,7 @@ KPreferences::KPreferences(intf_thread_t *p_intf, const char *psz_module_name, ...@@ -74,7 +74,7 @@ KPreferences::KPreferences(intf_thread_t *p_intf, const char *psz_module_name,
break; 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, ...@@ -108,8 +108,8 @@ KPreferences::KPreferences(intf_thread_t *p_intf, const char *psz_module_name,
} }
break; break;
case MODULE_CONFIG_ITEM_STRING: case CONFIG_ITEM_STRING:
case MODULE_CONFIG_ITEM_FILE: case CONFIG_ITEM_FILE:
{ {
QHBox *hb = new QHBox(category_table); QHBox *hb = new QHBox(category_table);
...@@ -134,7 +134,7 @@ KPreferences::KPreferences(intf_thread_t *p_intf, const char *psz_module_name, ...@@ -134,7 +134,7 @@ KPreferences::KPreferences(intf_thread_t *p_intf, const char *psz_module_name,
} }
break; break;
case MODULE_CONFIG_ITEM_INTEGER: case CONFIG_ITEM_INTEGER:
/* add input box with default value */ /* add input box with default value */
{ {
QHBox *hb = new QHBox(category_table); QHBox *hb = new QHBox(category_table);
...@@ -151,7 +151,7 @@ KPreferences::KPreferences(intf_thread_t *p_intf, const char *psz_module_name, ...@@ -151,7 +151,7 @@ KPreferences::KPreferences(intf_thread_t *p_intf, const char *psz_module_name,
} }
break; break;
case MODULE_CONFIG_ITEM_FLOAT: case CONFIG_ITEM_FLOAT:
{ {
QHBox *hb = new QHBox(category_table); QHBox *hb = new QHBox(category_table);
hb->setSpacing(spacingHint()); hb->setSpacing(spacingHint());
...@@ -169,7 +169,7 @@ KPreferences::KPreferences(intf_thread_t *p_intf, const char *psz_module_name, ...@@ -169,7 +169,7 @@ KPreferences::KPreferences(intf_thread_t *p_intf, const char *psz_module_name,
break; break;
case MODULE_CONFIG_ITEM_BOOL: case CONFIG_ITEM_BOOL:
/* add check button */ /* add check button */
{ {
...@@ -190,7 +190,7 @@ KPreferences::KPreferences(intf_thread_t *p_intf, const char *psz_module_name, ...@@ -190,7 +190,7 @@ KPreferences::KPreferences(intf_thread_t *p_intf, const char *psz_module_name,
p_item++; p_item++;
} }
while( p_item->i_type != MODULE_CONFIG_HINT_END ); while( p_item->i_type != CONFIG_HINT_END );
exec(); exec();
} }
...@@ -236,9 +236,9 @@ void KPreferences::slotApply() ...@@ -236,9 +236,9 @@ void KPreferences::slotApply()
switch( p_config->getType() ) { switch( p_config->getType() ) {
case MODULE_CONFIG_ITEM_STRING: case CONFIG_ITEM_STRING:
case MODULE_CONFIG_ITEM_FILE: case CONFIG_ITEM_FILE:
case MODULE_CONFIG_ITEM_MODULE: case CONFIG_ITEM_MODULE:
if (p_config->sValue()) { if (p_config->sValue()) {
config_PutPsz( p_intf, p_config->name(), config_PutPsz( p_intf, p_config->name(),
strdup(p_config->sValue().latin1())); strdup(p_config->sValue().latin1()));
...@@ -247,11 +247,11 @@ void KPreferences::slotApply() ...@@ -247,11 +247,11 @@ void KPreferences::slotApply()
config_PutPsz( p_intf, p_config->name(), NULL ); config_PutPsz( p_intf, p_config->name(), NULL );
} }
break; break;
case MODULE_CONFIG_ITEM_INTEGER: case CONFIG_ITEM_INTEGER:
case MODULE_CONFIG_ITEM_BOOL: case CONFIG_ITEM_BOOL:
config_PutInt( p_intf, p_config->name(), p_config->iValue() ); config_PutInt( p_intf, p_config->name(), p_config->iValue() );
break; break;
case MODULE_CONFIG_ITEM_FLOAT: case CONFIG_ITEM_FLOAT:
config_PutFloat( p_intf, p_config->name(), p_config->fValue() ); config_PutFloat( p_intf, p_config->name(), p_config->fValue() );
break; break;
} }
......
plugins/win32/preferences.cpp
View file @ cecb7e86
...@@ -395,7 +395,7 @@ void __fastcall TPreferencesDlg::CreateConfigDialog( char *psz_module_name ) ...@@ -395,7 +395,7 @@ void __fastcall TPreferencesDlg::CreateConfigDialog( char *psz_module_name )
{ {
switch( p_item->i_type ) switch( p_item->i_type )
{ {
case MODULE_CONFIG_HINT_CATEGORY: case CONFIG_HINT_CATEGORY:
/* create a new tabsheet. */ /* create a new tabsheet. */
TabSheet = new TTabSheet( this ); TabSheet = new TTabSheet( this );
...@@ -413,7 +413,7 @@ void __fastcall TPreferencesDlg::CreateConfigDialog( char *psz_module_name ) ...@@ -413,7 +413,7 @@ void __fastcall TPreferencesDlg::CreateConfigDialog( char *psz_module_name )
break; break;
case MODULE_CONFIG_ITEM_MODULE: case CONFIG_ITEM_MODULE:
/* add new groupbox for the config option */ /* add new groupbox for the config option */
GroupBoxPlugin = new TGroupBoxPlugin( this, p_item ); GroupBoxPlugin = new TGroupBoxPlugin( this, p_item );
...@@ -437,9 +437,9 @@ void __fastcall TPreferencesDlg::CreateConfigDialog( char *psz_module_name ) ...@@ -437,9 +437,9 @@ void __fastcall TPreferencesDlg::CreateConfigDialog( char *psz_module_name )
break; 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 */ /* add new groupbox for the config option */
GroupBoxString = new TGroupBoxString( this, p_item ); GroupBoxString = new TGroupBoxString( this, p_item );
...@@ -450,7 +450,7 @@ void __fastcall TPreferencesDlg::CreateConfigDialog( char *psz_module_name ) ...@@ -450,7 +450,7 @@ void __fastcall TPreferencesDlg::CreateConfigDialog( char *psz_module_name )
break; break;
case MODULE_CONFIG_ITEM_INTEGER: case CONFIG_ITEM_INTEGER:
/* add new groupbox for the config option */ /* add new groupbox for the config option */
GroupBoxInteger = new TGroupBoxInteger( this, p_item ); GroupBoxInteger = new TGroupBoxInteger( this, p_item );
...@@ -461,7 +461,7 @@ void __fastcall TPreferencesDlg::CreateConfigDialog( char *psz_module_name ) ...@@ -461,7 +461,7 @@ void __fastcall TPreferencesDlg::CreateConfigDialog( char *psz_module_name )
break; break;
case MODULE_CONFIG_ITEM_BOOL: case CONFIG_ITEM_BOOL:
/* add new groupbox for the config option */ /* add new groupbox for the config option */
GroupBoxBool = new TGroupBoxBool( this, p_item ); GroupBoxBool = new TGroupBoxBool( this, p_item );
...@@ -475,7 +475,7 @@ void __fastcall TPreferencesDlg::CreateConfigDialog( char *psz_module_name ) ...@@ -475,7 +475,7 @@ void __fastcall TPreferencesDlg::CreateConfigDialog( char *psz_module_name )
p_item++; p_item++;
} }
while( p_item->i_type != MODULE_CONFIG_HINT_END ); while( p_item->i_type != CONFIG_HINT_END );
/* Reorder groupboxes inside the tabsheets */ /* Reorder groupboxes inside the tabsheets */
for( i_pages = 0; i_pages < PageControlPref->PageCount; i_pages++ ) for( i_pages = 0; i_pages < PageControlPref->PageCount; i_pages++ )
...@@ -541,14 +541,14 @@ void __fastcall TPreferencesDlg::SaveValue( module_config_t *p_config ) ...@@ -541,14 +541,14 @@ void __fastcall TPreferencesDlg::SaveValue( module_config_t *p_config )
{ {
switch( p_config->i_type ) switch( p_config->i_type )
{ {
case MODULE_CONFIG_ITEM_STRING: case CONFIG_ITEM_STRING:
case MODULE_CONFIG_ITEM_FILE: case CONFIG_ITEM_FILE:
case MODULE_CONFIG_ITEM_MODULE: case CONFIG_ITEM_MODULE:
config_PutPsz( p_intfGlobal, p_config->psz_name, config_PutPsz( p_intfGlobal, p_config->psz_name,
*p_config->psz_value ? p_config->psz_value : NULL ); *p_config->psz_value ? p_config->psz_value : NULL );
break; break;
case MODULE_CONFIG_ITEM_INTEGER: case CONFIG_ITEM_INTEGER:
case MODULE_CONFIG_ITEM_BOOL: case CONFIG_ITEM_BOOL:
config_PutInt( p_intfGlobal, p_config->psz_name, config_PutInt( p_intfGlobal, p_config->psz_name,
p_config->i_value ); p_config->i_value );
break; break;
......
po/de.po
View file @ cecb7e86
This diff is collapsed.
po/en_GB.po
View file @ cecb7e86
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "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" "PO-Revision-Date: 2002-04-22 09:56+0200\n"
"Last-Translator: Samuel Hocevar <sam@zoy.org>\n" "Last-Translator: Samuel Hocevar <sam@zoy.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -27,61 +27,45 @@ msgid "" ...@@ -27,61 +27,45 @@ msgid ""
msgstr "" msgstr ""
#. We could also have "=<" here #. 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" msgid "string"
msgstr "" msgstr ""
#: src/libvlc.c:921 src/misc/configuration.c:783 #: src/libvlc.c:922 src/misc/configuration.c:798
msgid "integer" msgid "integer"
msgstr "" msgstr ""
#: src/libvlc.c:924 src/misc/configuration.c:790 #: src/libvlc.c:925 src/misc/configuration.c:805
msgid "float" msgid "float"
msgstr "" msgstr ""
#: src/libvlc.c:930 #: src/libvlc.c:931
msgid " (default enabled)" msgid " (default enabled)"
msgstr "" msgstr ""
#: src/libvlc.c:931 #: src/libvlc.c:932
msgid " (default disabled)" msgid " (default disabled)"
msgstr "" msgstr ""
#: src/libvlc.c:1013 #: src/libvlc.c:1014 src/libvlc.c:1063 src/libvlc.c:1087 src/libvlc.c:1106
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
msgid "" msgid ""
"\n" "\n"
"Press the RETURN key to continue...\n" "Press the RETURN key to continue...\n"
msgstr "" msgstr ""
#. Usage #. Usage
#: src/libvlc.c:1057 #: src/libvlc.c:1037
#, c-format #, c-format
msgid "" msgid ""
"Usage: %s [options] [parameters] [file]...\n" "Usage: %s [options] [parameters] [file]...\n"
"\n" "\n"
msgstr "" msgstr ""
#: src/libvlc.c:1060 #: src/libvlc.c:1040
msgid "[module] [description]\n" msgid "[module] [description]\n"
msgstr "" msgstr ""
#: src/libvlc.c:1101 #: src/libvlc.c:1081
msgid "" msgid ""
"This program comes with NO WARRANTY, to the extent permitted by law.\n" "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" "You may redistribute it under the terms of the GNU General Public License;\n"
...@@ -584,84 +568,100 @@ msgid "" ...@@ -584,84 +568,100 @@ msgid ""
"with it." "with it."
msgstr "" 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 #. Interface options
#: src/libvlc.h:299 #: src/libvlc.h:315
msgid "Interface" msgid "Interface"
msgstr "" msgstr ""
#. Audio options #. Audio options
#: src/libvlc.h:307 #: src/libvlc.h:323
msgid "Audio" msgid "Audio"
msgstr "" msgstr ""
#. Video options #. 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" msgid "Video"
msgstr "" msgstr ""
#. Input options #. Input options
#: plugins/satellite/satellite.c:66 src/libvlc.h:330 #: plugins/satellite/satellite.c:66 src/libvlc.h:346
msgid "Input" msgid "Input"
msgstr "" msgstr ""
#. Decoder options #. Decoder options
#: src/libvlc.h:349 #: src/libvlc.h:365
msgid "Decoders" msgid "Decoders"
msgstr "" msgstr ""
#. CPU options #. CPU options
#: src/libvlc.h:354 #: src/libvlc.h:370
msgid "CPU" msgid "CPU"
msgstr "" msgstr ""
#. Playlist options #. Playlist options
#: plugins/gtk/gnome_interface.c:506 plugins/gtk/gnome_interface.c:1824 #: 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/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" msgid "Playlist"
msgstr "" msgstr ""
#. Misc options #. Misc options
#: plugins/a52/a52.c:85 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81 #: 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/fb/fb.c:70 plugins/filter/deinterlace.c:63
#: plugins/filter/distort.c:50 plugins/filter/transform.c:51 #: plugins/filter/distort.c:55 plugins/filter/transform.c:56
#: plugins/filter/wall.c:45 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:73 #: 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/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/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 #: 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" msgid "Miscellaneous"
msgstr "" msgstr ""
#: src/libvlc.h:380 #: src/libvlc.h:399
msgid "main program" msgid "main program"
msgstr "main programme" msgstr "main programme"
#: src/libvlc.h:392 #: src/libvlc.h:411
msgid "print help" msgid "print help"
msgstr "" msgstr ""
#: src/libvlc.h:394 #: src/libvlc.h:412
msgid "print detailed help" msgid "print detailed help"
msgstr "" msgstr ""
#: src/libvlc.h:396 #: src/libvlc.h:413
msgid "print a list of available modules" msgid "print a list of available modules"
msgstr "" msgstr ""
#: src/libvlc.h:398 #: src/libvlc.h:414
msgid "print help on module" msgid "print help on module"
msgstr "" msgstr ""
#: src/libvlc.h:401 #: src/libvlc.h:415
msgid "print version information" msgid "print version information"
msgstr "" msgstr ""
#: src/libvlc.h:403 #: src/libvlc.h:416
msgid "print build information" msgid "print build information"
msgstr "" msgstr ""
#: src/misc/configuration.c:783 #: src/misc/configuration.c:798
msgid "boolean" msgid "boolean"
msgstr "" msgstr ""
...@@ -850,27 +850,33 @@ msgstr "" ...@@ -850,27 +850,33 @@ msgstr ""
msgid "Linux console framebuffer module" msgid "Linux console framebuffer module"
msgstr "" msgstr ""
#: plugins/filter/deinterlace.c:51 #. ****************************************************************************
#. * Build configuration tree.
#. ****************************************************************************
#: plugins/filter/deinterlace.c:57
msgid "Deinterlace mode" msgid "Deinterlace mode"
msgstr "" msgstr ""
#: plugins/filter/deinterlace.c:52 #: plugins/filter/deinterlace.c:58
msgid "one of 'bob' and 'blend'" msgid "one of \"discard\", \"blend\", \"mean\", \"bob\" or \"linear\""
msgstr "" msgstr ""
#: plugins/filter/deinterlace.c:56 #: plugins/filter/deinterlace.c:69
msgid "deinterlacing module" msgid "deinterlacing module"
msgstr "" msgstr ""
#: plugins/filter/distort.c:51 #. ****************************************************************************
msgid "distort mode" #. * Build configuration tree.
#. ****************************************************************************
#: plugins/filter/distort.c:49
msgid "Distort mode"
msgstr "" msgstr ""
#: plugins/filter/distort.c:52 #: plugins/filter/distort.c:50
msgid "one of \"wave\" and \"ripple\"" msgid "one of \"wave\" and \"ripple\""
msgstr "" msgstr ""
#: plugins/filter/distort.c:56 #: plugins/filter/distort.c:60
msgid "miscellaneous video effects module" msgid "miscellaneous video effects module"
msgstr "" msgstr ""
...@@ -878,32 +884,38 @@ msgstr "" ...@@ -878,32 +884,38 @@ msgstr ""
msgid "invert video module" msgid "invert video module"
msgstr "" msgstr ""
#: plugins/filter/transform.c:52 #. ****************************************************************************
#. * Build configuration tree.
#. ****************************************************************************
#: plugins/filter/transform.c:50
msgid "Transform type" msgid "Transform type"
msgstr "" msgstr ""
#: plugins/filter/transform.c:53 #: plugins/filter/transform.c:51
msgid "One of '90', '180', '270', 'hflip' and 'vflip'" msgid "One of '90', '180', '270', 'hflip' and 'vflip'"
msgstr "" msgstr ""
#: plugins/filter/transform.c:57 #: plugins/filter/transform.c:61
msgid "image transformation module" msgid "image transformation module"
msgstr "" msgstr ""
#: plugins/filter/wall.c:46 #. ****************************************************************************
#. * Build configuration tree.
#. ****************************************************************************
#: plugins/filter/wall.c:44
msgid "Number of columns" msgid "Number of columns"
msgstr "" msgstr ""
#: plugins/filter/wall.c:47 #: plugins/filter/wall.c:45
msgid "" msgid ""
"Select the number of horizontal videowindows in which to split the video" "Select the number of horizontal videowindows in which to split the video"
msgstr "" msgstr ""
#: plugins/filter/wall.c:49 #: plugins/filter/wall.c:48
msgid "Number of rows" msgid "Number of rows"
msgstr "" msgstr ""
#: plugins/filter/wall.c:50 #: plugins/filter/wall.c:49
msgid "Select the number of vertical videowindows in which to split the video" msgid "Select the number of vertical videowindows in which to split the video"
msgstr "" msgstr ""
...@@ -915,7 +927,7 @@ msgstr "" ...@@ -915,7 +927,7 @@ msgstr ""
msgid "comma separated list of active windows, defaults to all" msgid "comma separated list of active windows, defaults to all"
msgstr "" msgstr ""
#: plugins/filter/wall.c:57 #: plugins/filter/wall.c:64
msgid "image wall video module" msgid "image wall video module"
msgstr "" msgstr ""
...@@ -1324,7 +1336,7 @@ msgstr "" ...@@ -1324,7 +1336,7 @@ msgstr ""
#: plugins/gtk/gtk_interface.c:1386 plugins/gtk/gtk_interface.c:1609 #: 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:1915 plugins/gtk/gtk_interface.c:2046
#: plugins/gtk/gtk_interface.c:2277 plugins/gtk/gtk_interface.c:2383 #: 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" msgid "OK"
msgstr "" msgstr ""
...@@ -1374,7 +1386,7 @@ msgstr "" ...@@ -1374,7 +1386,7 @@ msgstr ""
#: plugins/gtk/gtk_interface.c:1616 plugins/gtk/gtk_interface.c:1922 #: 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: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" msgid "Cancel"
msgstr "" msgstr ""
...@@ -1596,7 +1608,7 @@ msgstr "" ...@@ -1596,7 +1608,7 @@ msgstr ""
msgid "Invert" msgid "Invert"
msgstr "" 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" msgid "Select"
msgstr "" msgstr ""
...@@ -1636,28 +1648,28 @@ msgstr "" ...@@ -1636,28 +1648,28 @@ msgstr ""
msgid "Channel server" msgid "Channel server"
msgstr "" msgstr ""
#: plugins/gtk/gtk_preferences.c:310 #: plugins/gtk/gtk_preferences.c:305
msgid "Name" msgid "Name"
msgstr "" msgstr ""
#: plugins/gtk/gtk_preferences.c:310 #: plugins/gtk/gtk_preferences.c:305
msgid "Description" msgid "Description"
msgstr "" msgstr ""
#: plugins/gtk/gtk_preferences.c:353 #: plugins/gtk/gtk_preferences.c:348
msgid "Configure" msgid "Configure"
msgstr "" msgstr ""
#. add new label #. add new label
#: plugins/gtk/gtk_preferences.c:376 #: plugins/gtk/gtk_preferences.c:371
msgid "Selected:" msgid "Selected:"
msgstr "" 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" msgid "Save"
msgstr "" msgstr ""
#: plugins/gtk/gtk_preferences.c:530 #: plugins/gtk/gtk_preferences.c:544
msgid "Apply" msgid "Apply"
msgstr "" msgstr ""
...@@ -1879,7 +1891,7 @@ msgstr "" ...@@ -1879,7 +1891,7 @@ msgstr ""
msgid "IPv4 network abstraction layer" msgid "IPv4 network abstraction layer"
msgstr "" msgstr ""
#: plugins/network/ipv6.c:78 #: plugins/network/ipv6.c:79
msgid "IPv6 network abstraction layer" msgid "IPv6 network abstraction layer"
msgstr "" msgstr ""
......
po/fr.po
View file @ cecb7e86
This diff is collapsed.
po/ja.po
View file @ cecb7e86
This diff is collapsed.
po/nl.po
View file @ cecb7e86
This diff is collapsed.
po/no.po
View file @ cecb7e86
This diff is collapsed.
po/pl.po
View file @ cecb7e86
This diff is collapsed.
po/ru.po
View file @ cecb7e86
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gnome-vlc\n" "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" "PO-Revision-Date: 2001-02-19 19:58+03:00\n"
"Last-Translator: Valek Filippov <frob@df.ru>\n" "Last-Translator: Valek Filippov <frob@df.ru>\n"
"Language-Team: Russian <ru@li.org>\n" "Language-Team: Russian <ru@li.org>\n"
...@@ -28,61 +28,45 @@ msgid "" ...@@ -28,61 +28,45 @@ msgid ""
msgstr "" msgstr ""
#. We could also have "=<" here #. 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" msgid "string"
msgstr "" msgstr ""
#: src/libvlc.c:921 src/misc/configuration.c:783 #: src/libvlc.c:922 src/misc/configuration.c:798
msgid "integer" msgid "integer"
msgstr "" msgstr ""
#: src/libvlc.c:924 src/misc/configuration.c:790 #: src/libvlc.c:925 src/misc/configuration.c:805
msgid "float" msgid "float"
msgstr "" msgstr ""
#: src/libvlc.c:930 #: src/libvlc.c:931
msgid " (default enabled)" msgid " (default enabled)"
msgstr "" msgstr ""
#: src/libvlc.c:931 #: src/libvlc.c:932
msgid " (default disabled)" msgid " (default disabled)"
msgstr "" msgstr ""
#: src/libvlc.c:1013 #: src/libvlc.c:1014 src/libvlc.c:1063 src/libvlc.c:1087 src/libvlc.c:1106
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
msgid "" msgid ""
"\n" "\n"
"Press the RETURN key to continue...\n" "Press the RETURN key to continue...\n"
msgstr "" msgstr ""
#. Usage #. Usage
#: src/libvlc.c:1057 #: src/libvlc.c:1037
#, c-format #, c-format
msgid "" msgid ""
"Usage: %s [options] [parameters] [file]...\n" "Usage: %s [options] [parameters] [file]...\n"
"\n" "\n"
msgstr "" msgstr ""
#: src/libvlc.c:1060 #: src/libvlc.c:1040
msgid "[module] [description]\n" msgid "[module] [description]\n"
msgstr "" msgstr ""
#: src/libvlc.c:1101 #: src/libvlc.c:1081
msgid "" msgid ""
"This program comes with NO WARRANTY, to the extent permitted by law.\n" "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" "You may redistribute it under the terms of the GNU General Public License;\n"
...@@ -573,84 +557,100 @@ msgid "" ...@@ -573,84 +557,100 @@ msgid ""
"with it." "with it."
msgstr "" 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 #. Interface options
#: src/libvlc.h:299 #: src/libvlc.h:315
msgid "Interface" msgid "Interface"
msgstr "" msgstr ""
#. Audio options #. Audio options
#: src/libvlc.h:307 #: src/libvlc.h:323
msgid "Audio" msgid "Audio"
msgstr "" msgstr ""
#. Video options #. 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" msgid "Video"
msgstr "" msgstr ""
#. Input options #. Input options
#: plugins/satellite/satellite.c:66 src/libvlc.h:330 #: plugins/satellite/satellite.c:66 src/libvlc.h:346
msgid "Input" msgid "Input"
msgstr "" msgstr ""
#. Decoder options #. Decoder options
#: src/libvlc.h:349 #: src/libvlc.h:365
msgid "Decoders" msgid "Decoders"
msgstr "" msgstr ""
#. CPU options #. CPU options
#: src/libvlc.h:354 #: src/libvlc.h:370
msgid "CPU" msgid "CPU"
msgstr "" msgstr ""
#. Playlist options #. Playlist options
#: plugins/gtk/gnome_interface.c:506 plugins/gtk/gnome_interface.c:1824 #: 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/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" msgid "Playlist"
msgstr " " msgstr " "
#. Misc options #. Misc options
#: plugins/a52/a52.c:85 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81 #: 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/fb/fb.c:70 plugins/filter/deinterlace.c:63
#: plugins/filter/distort.c:50 plugins/filter/transform.c:51 #: plugins/filter/distort.c:55 plugins/filter/transform.c:56
#: plugins/filter/wall.c:45 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:73 #: 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/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/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 #: 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" msgid "Miscellaneous"
msgstr "" msgstr ""
#: src/libvlc.h:380 #: src/libvlc.h:399
msgid "main program" msgid "main program"
msgstr "" msgstr ""
#: src/libvlc.h:392 #: src/libvlc.h:411
msgid "print help" msgid "print help"
msgstr "" msgstr ""
#: src/libvlc.h:394 #: src/libvlc.h:412
msgid "print detailed help" msgid "print detailed help"
msgstr "" msgstr ""
#: src/libvlc.h:396 #: src/libvlc.h:413
msgid "print a list of available modules" msgid "print a list of available modules"
msgstr "" msgstr ""
#: src/libvlc.h:398 #: src/libvlc.h:414
msgid "print help on module" msgid "print help on module"
msgstr "" msgstr ""
#: src/libvlc.h:401 #: src/libvlc.h:415
msgid "print version information" msgid "print version information"
msgstr "" msgstr ""
#: src/libvlc.h:403 #: src/libvlc.h:416
msgid "print build information" msgid "print build information"
msgstr "" msgstr ""
#: src/misc/configuration.c:783 #: src/misc/configuration.c:798
msgid "boolean" msgid "boolean"
msgstr "" msgstr ""
...@@ -839,28 +839,34 @@ msgstr "" ...@@ -839,28 +839,34 @@ msgstr ""
msgid "Linux console framebuffer module" msgid "Linux console framebuffer module"
msgstr "" msgstr ""
#: plugins/filter/deinterlace.c:51 #. ****************************************************************************
#. * Build configuration tree.
#. ****************************************************************************
#: plugins/filter/deinterlace.c:57
msgid "Deinterlace mode" msgid "Deinterlace mode"
msgstr "" msgstr ""
#: plugins/filter/deinterlace.c:52 #: plugins/filter/deinterlace.c:58
msgid "one of 'bob' and 'blend'" msgid "one of \"discard\", \"blend\", \"mean\", \"bob\" or \"linear\""
msgstr "" msgstr ""
#: plugins/filter/deinterlace.c:56 #: plugins/filter/deinterlace.c:69
msgid "deinterlacing module" msgid "deinterlacing module"
msgstr "" msgstr ""
#: plugins/filter/distort.c:51 #. ****************************************************************************
#. * Build configuration tree.
#. ****************************************************************************
#: plugins/filter/distort.c:49
#, fuzzy #, fuzzy
msgid "distort mode" msgid "Distort mode"
msgstr " " msgstr " "
#: plugins/filter/distort.c:52 #: plugins/filter/distort.c:50
msgid "one of \"wave\" and \"ripple\"" msgid "one of \"wave\" and \"ripple\""
msgstr "" msgstr ""
#: plugins/filter/distort.c:56 #: plugins/filter/distort.c:60
msgid "miscellaneous video effects module" msgid "miscellaneous video effects module"
msgstr "" msgstr ""
...@@ -868,32 +874,38 @@ msgstr "" ...@@ -868,32 +874,38 @@ msgstr ""
msgid "invert video module" msgid "invert video module"
msgstr "" msgstr ""
#: plugins/filter/transform.c:52 #. ****************************************************************************
#. * Build configuration tree.
#. ****************************************************************************
#: plugins/filter/transform.c:50
msgid "Transform type" msgid "Transform type"
msgstr "" msgstr ""
#: plugins/filter/transform.c:53 #: plugins/filter/transform.c:51
msgid "One of '90', '180', '270', 'hflip' and 'vflip'" msgid "One of '90', '180', '270', 'hflip' and 'vflip'"
msgstr "" msgstr ""
#: plugins/filter/transform.c:57 #: plugins/filter/transform.c:61
msgid "image transformation module" msgid "image transformation module"
msgstr "" msgstr ""
#: plugins/filter/wall.c:46 #. ****************************************************************************
#. * Build configuration tree.
#. ****************************************************************************
#: plugins/filter/wall.c:44
msgid "Number of columns" msgid "Number of columns"
msgstr "" msgstr ""
#: plugins/filter/wall.c:47 #: plugins/filter/wall.c:45
msgid "" msgid ""
"Select the number of horizontal videowindows in which to split the video" "Select the number of horizontal videowindows in which to split the video"
msgstr "" msgstr ""
#: plugins/filter/wall.c:49 #: plugins/filter/wall.c:48
msgid "Number of rows" msgid "Number of rows"
msgstr "" msgstr ""
#: plugins/filter/wall.c:50 #: plugins/filter/wall.c:49
msgid "Select the number of vertical videowindows in which to split the video" msgid "Select the number of vertical videowindows in which to split the video"
msgstr "" msgstr ""
...@@ -905,7 +917,7 @@ msgstr "" ...@@ -905,7 +917,7 @@ msgstr ""
msgid "comma separated list of active windows, defaults to all" msgid "comma separated list of active windows, defaults to all"
msgstr "" msgstr ""
#: plugins/filter/wall.c:57 #: plugins/filter/wall.c:64
msgid "image wall video module" msgid "image wall video module"
msgstr "" msgstr ""
...@@ -1327,7 +1339,7 @@ msgstr "" ...@@ -1327,7 +1339,7 @@ msgstr ""
#: plugins/gtk/gtk_interface.c:1386 plugins/gtk/gtk_interface.c:1609 #: 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:1915 plugins/gtk/gtk_interface.c:2046
#: plugins/gtk/gtk_interface.c:2277 plugins/gtk/gtk_interface.c:2383 #: 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" msgid "OK"
msgstr "" msgstr ""
...@@ -1379,7 +1391,7 @@ msgstr "" ...@@ -1379,7 +1391,7 @@ msgstr ""
#: plugins/gtk/gtk_interface.c:1616 plugins/gtk/gtk_interface.c:1922 #: 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: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" msgid "Cancel"
msgstr "" msgstr ""
...@@ -1608,7 +1620,7 @@ msgstr "" ...@@ -1608,7 +1620,7 @@ msgstr ""
msgid "Invert" msgid "Invert"
msgstr "" 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" msgid "Select"
msgstr "" msgstr ""
...@@ -1650,28 +1662,28 @@ msgstr "" ...@@ -1650,28 +1662,28 @@ msgstr ""
msgid "Channel server" msgid "Channel server"
msgstr "" msgstr ""
#: plugins/gtk/gtk_preferences.c:310 #: plugins/gtk/gtk_preferences.c:305
msgid "Name" msgid "Name"
msgstr "" msgstr ""
#: plugins/gtk/gtk_preferences.c:310 #: plugins/gtk/gtk_preferences.c:305
msgid "Description" msgid "Description"
msgstr "" msgstr ""
#: plugins/gtk/gtk_preferences.c:353 #: plugins/gtk/gtk_preferences.c:348
msgid "Configure" msgid "Configure"
msgstr "" msgstr ""
#. add new label #. add new label
#: plugins/gtk/gtk_preferences.c:376 #: plugins/gtk/gtk_preferences.c:371
msgid "Selected:" msgid "Selected:"
msgstr "" 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" msgid "Save"
msgstr "" msgstr ""
#: plugins/gtk/gtk_preferences.c:530 #: plugins/gtk/gtk_preferences.c:544
msgid "Apply" msgid "Apply"
msgstr "" msgstr ""
...@@ -1888,7 +1900,7 @@ msgstr "" ...@@ -1888,7 +1900,7 @@ msgstr ""
msgid "IPv4 network abstraction layer" msgid "IPv4 network abstraction layer"
msgstr "" msgstr ""
#: plugins/network/ipv6.c:78 #: plugins/network/ipv6.c:79
msgid "IPv6 network abstraction layer" msgid "IPv6 network abstraction layer"
msgstr "" msgstr ""
......
po/vlc.pot
View file @ cecb7e86
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -28,61 +28,45 @@ msgid "" ...@@ -28,61 +28,45 @@ msgid ""
msgstr "" msgstr ""
#. We could also have "=<" here #. 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" msgid "string"
msgstr "" msgstr ""
#: src/libvlc.c:921 src/misc/configuration.c:783 #: src/libvlc.c:922 src/misc/configuration.c:798
msgid "integer" msgid "integer"
msgstr "" msgstr ""
#: src/libvlc.c:924 src/misc/configuration.c:790 #: src/libvlc.c:925 src/misc/configuration.c:805
msgid "float" msgid "float"
msgstr "" msgstr ""
#: src/libvlc.c:930 #: src/libvlc.c:931
msgid " (default enabled)" msgid " (default enabled)"
msgstr "" msgstr ""
#: src/libvlc.c:931 #: src/libvlc.c:932
msgid " (default disabled)" msgid " (default disabled)"
msgstr "" msgstr ""
#: src/libvlc.c:1013 #: src/libvlc.c:1014 src/libvlc.c:1063 src/libvlc.c:1087 src/libvlc.c:1106
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
msgid "" msgid ""
"\n" "\n"
"Press the RETURN key to continue...\n" "Press the RETURN key to continue...\n"
msgstr "" msgstr ""
#. Usage #. Usage
#: src/libvlc.c:1057 #: src/libvlc.c:1037
#, c-format #, c-format
msgid "" msgid ""
"Usage: %s [options] [parameters] [file]...\n" "Usage: %s [options] [parameters] [file]...\n"
"\n" "\n"
msgstr "" msgstr ""
#: src/libvlc.c:1060 #: src/libvlc.c:1040
msgid "[module] [description]\n" msgid "[module] [description]\n"
msgstr "" msgstr ""
#: src/libvlc.c:1101 #: src/libvlc.c:1081
msgid "" msgid ""
"This program comes with NO WARRANTY, to the extent permitted by law.\n" "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" "You may redistribute it under the terms of the GNU General Public License;\n"
...@@ -573,84 +557,100 @@ msgid "" ...@@ -573,84 +557,100 @@ msgid ""
"with it." "with it."
msgstr "" 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 #. Interface options
#: src/libvlc.h:299 #: src/libvlc.h:315
msgid "Interface" msgid "Interface"
msgstr "" msgstr ""
#. Audio options #. Audio options
#: src/libvlc.h:307 #: src/libvlc.h:323
msgid "Audio" msgid "Audio"
msgstr "" msgstr ""
#. Video options #. 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" msgid "Video"
msgstr "" msgstr ""
#. Input options #. Input options
#: plugins/satellite/satellite.c:66 src/libvlc.h:330 #: plugins/satellite/satellite.c:66 src/libvlc.h:346
msgid "Input" msgid "Input"
msgstr "" msgstr ""
#. Decoder options #. Decoder options
#: src/libvlc.h:349 #: src/libvlc.h:365
msgid "Decoders" msgid "Decoders"
msgstr "" msgstr ""
#. CPU options #. CPU options
#: src/libvlc.h:354 #: src/libvlc.h:370
msgid "CPU" msgid "CPU"
msgstr "" msgstr ""
#. Playlist options #. Playlist options
#: plugins/gtk/gnome_interface.c:506 plugins/gtk/gnome_interface.c:1824 #: 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/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" msgid "Playlist"
msgstr "" msgstr ""
#. Misc options #. Misc options
#: plugins/a52/a52.c:85 plugins/ac3_adec/ac3_adec.c:72 plugins/dsp/dsp.c:81 #: 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/fb/fb.c:70 plugins/filter/deinterlace.c:63
#: plugins/filter/distort.c:50 plugins/filter/transform.c:51 #: plugins/filter/distort.c:55 plugins/filter/transform.c:56
#: plugins/filter/wall.c:45 plugins/ggi/ggi.c:64 plugins/gtk/gnome.c:73 #: 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/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/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 #: 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" msgid "Miscellaneous"
msgstr "" msgstr ""
#: src/libvlc.h:380 #: src/libvlc.h:399
msgid "main program" msgid "main program"
msgstr "" msgstr ""
#: src/libvlc.h:392 #: src/libvlc.h:411
msgid "print help" msgid "print help"
msgstr "" msgstr ""
#: src/libvlc.h:394 #: src/libvlc.h:412
msgid "print detailed help" msgid "print detailed help"
msgstr "" msgstr ""
#: src/libvlc.h:396 #: src/libvlc.h:413
msgid "print a list of available modules" msgid "print a list of available modules"
msgstr "" msgstr ""
#: src/libvlc.h:398 #: src/libvlc.h:414
msgid "print help on module" msgid "print help on module"
msgstr "" msgstr ""
#: src/libvlc.h:401 #: src/libvlc.h:415
msgid "print version information" msgid "print version information"
msgstr "" msgstr ""
#: src/libvlc.h:403 #: src/libvlc.h:416
msgid "print build information" msgid "print build information"
msgstr "" msgstr ""
#: src/misc/configuration.c:783 #: src/misc/configuration.c:798
msgid "boolean" msgid "boolean"
msgstr "" msgstr ""
...@@ -839,27 +839,33 @@ msgstr "" ...@@ -839,27 +839,33 @@ msgstr ""
msgid "Linux console framebuffer module" msgid "Linux console framebuffer module"
msgstr "" msgstr ""
#: plugins/filter/deinterlace.c:51 #. ****************************************************************************
#. * Build configuration tree.
#. ****************************************************************************
#: plugins/filter/deinterlace.c:57
msgid "Deinterlace mode" msgid "Deinterlace mode"
msgstr "" msgstr ""
#: plugins/filter/deinterlace.c:52 #: plugins/filter/deinterlace.c:58
msgid "one of 'bob' and 'blend'" msgid "one of \"discard\", \"blend\", \"mean\", \"bob\" or \"linear\""
msgstr "" msgstr ""
#: plugins/filter/deinterlace.c:56 #: plugins/filter/deinterlace.c:69
msgid "deinterlacing module" msgid "deinterlacing module"
msgstr "" msgstr ""
#: plugins/filter/distort.c:51 #. ****************************************************************************
msgid "distort mode" #. * Build configuration tree.
#. ****************************************************************************
#: plugins/filter/distort.c:49
msgid "Distort mode"
msgstr "" msgstr ""
#: plugins/filter/distort.c:52 #: plugins/filter/distort.c:50
msgid "one of \"wave\" and \"ripple\"" msgid "one of \"wave\" and \"ripple\""
msgstr "" msgstr ""
#: plugins/filter/distort.c:56 #: plugins/filter/distort.c:60
msgid "miscellaneous video effects module" msgid "miscellaneous video effects module"
msgstr "" msgstr ""
...@@ -867,32 +873,38 @@ msgstr "" ...@@ -867,32 +873,38 @@ msgstr ""
msgid "invert video module" msgid "invert video module"
msgstr "" msgstr ""
#: plugins/filter/transform.c:52 #. ****************************************************************************
#. * Build configuration tree.
#. ****************************************************************************
#: plugins/filter/transform.c:50
msgid "Transform type" msgid "Transform type"
msgstr "" msgstr ""
#: plugins/filter/transform.c:53 #: plugins/filter/transform.c:51
msgid "One of '90', '180', '270', 'hflip' and 'vflip'" msgid "One of '90', '180', '270', 'hflip' and 'vflip'"
msgstr "" msgstr ""
#: plugins/filter/transform.c:57 #: plugins/filter/transform.c:61
msgid "image transformation module" msgid "image transformation module"
msgstr "" msgstr ""
#: plugins/filter/wall.c:46 #. ****************************************************************************
#. * Build configuration tree.
#. ****************************************************************************
#: plugins/filter/wall.c:44
msgid "Number of columns" msgid "Number of columns"
msgstr "" msgstr ""
#: plugins/filter/wall.c:47 #: plugins/filter/wall.c:45
msgid "" msgid ""
"Select the number of horizontal videowindows in which to split the video" "Select the number of horizontal videowindows in which to split the video"
msgstr "" msgstr ""
#: plugins/filter/wall.c:49 #: plugins/filter/wall.c:48
msgid "Number of rows" msgid "Number of rows"
msgstr "" msgstr ""
#: plugins/filter/wall.c:50 #: plugins/filter/wall.c:49
msgid "Select the number of vertical videowindows in which to split the video" msgid "Select the number of vertical videowindows in which to split the video"
msgstr "" msgstr ""
...@@ -904,7 +916,7 @@ msgstr "" ...@@ -904,7 +916,7 @@ msgstr ""
msgid "comma separated list of active windows, defaults to all" msgid "comma separated list of active windows, defaults to all"
msgstr "" msgstr ""
#: plugins/filter/wall.c:57 #: plugins/filter/wall.c:64
msgid "image wall video module" msgid "image wall video module"
msgstr "" msgstr ""
...@@ -1313,7 +1325,7 @@ msgstr "" ...@@ -1313,7 +1325,7 @@ msgstr ""
#: plugins/gtk/gtk_interface.c:1386 plugins/gtk/gtk_interface.c:1609 #: 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:1915 plugins/gtk/gtk_interface.c:2046
#: plugins/gtk/gtk_interface.c:2277 plugins/gtk/gtk_interface.c:2383 #: 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" msgid "OK"
msgstr "" msgstr ""
...@@ -1363,7 +1375,7 @@ msgstr "" ...@@ -1363,7 +1375,7 @@ msgstr ""
#: plugins/gtk/gtk_interface.c:1616 plugins/gtk/gtk_interface.c:1922 #: 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: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" msgid "Cancel"
msgstr "" msgstr ""
...@@ -1585,7 +1597,7 @@ msgstr "" ...@@ -1585,7 +1597,7 @@ msgstr ""
msgid "Invert" msgid "Invert"
msgstr "" 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" msgid "Select"
msgstr "" msgstr ""
...@@ -1625,28 +1637,28 @@ msgstr "" ...@@ -1625,28 +1637,28 @@ msgstr ""
msgid "Channel server" msgid "Channel server"
msgstr "" msgstr ""
#: plugins/gtk/gtk_preferences.c:310 #: plugins/gtk/gtk_preferences.c:305
msgid "Name" msgid "Name"
msgstr "" msgstr ""
#: plugins/gtk/gtk_preferences.c:310 #: plugins/gtk/gtk_preferences.c:305
msgid "Description" msgid "Description"
msgstr "" msgstr ""
#: plugins/gtk/gtk_preferences.c:353 #: plugins/gtk/gtk_preferences.c:348
msgid "Configure" msgid "Configure"
msgstr "" msgstr ""
#. add new label #. add new label
#: plugins/gtk/gtk_preferences.c:376 #: plugins/gtk/gtk_preferences.c:371
msgid "Selected:" msgid "Selected:"
msgstr "" 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" msgid "Save"
msgstr "" msgstr ""
#: plugins/gtk/gtk_preferences.c:530 #: plugins/gtk/gtk_preferences.c:544
msgid "Apply" msgid "Apply"
msgstr "" msgstr ""
...@@ -1863,7 +1875,7 @@ msgstr "" ...@@ -1863,7 +1875,7 @@ msgstr ""
msgid "IPv4 network abstraction layer" msgid "IPv4 network abstraction layer"
msgstr "" msgstr ""
#: plugins/network/ipv6.c:78 #: plugins/network/ipv6.c:79
msgid "IPv6 network abstraction layer" msgid "IPv6 network abstraction layer"
msgstr "" msgstr ""
......
src/libvlc.c
View file @ cecb7e86
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* and spawns threads. * and spawns threads.
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2001 VideoLAN * 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> * Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org> * Samuel Hocevar <sam@zoy.org>
...@@ -899,7 +899,7 @@ static void Usage( vlc_t *p_this, const char *psz_module_name ) ...@@ -899,7 +899,7 @@ static void Usage( vlc_t *p_this, const char *psz_module_name )
p_module->psz_object_name ); p_module->psz_object_name );
for( p_item = p_module->p_config; for( p_item = p_module->p_config;
p_item->i_type != MODULE_CONFIG_HINT_END; p_item->i_type != CONFIG_HINT_END;
p_item++ ) p_item++ )
{ {
char *psz_bra = NULL, *psz_type = NULL, *psz_ket = NULL; 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 ) ...@@ -908,22 +908,23 @@ static void Usage( vlc_t *p_this, const char *psz_module_name )
switch( p_item->i_type ) 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 ); fprintf( stderr, " %s\n", p_item->psz_text );
break; break;
case MODULE_CONFIG_ITEM_STRING: case CONFIG_ITEM_STRING:
case MODULE_CONFIG_ITEM_FILE: case CONFIG_ITEM_FILE:
case MODULE_CONFIG_ITEM_MODULE: /* We could also have "=<" here */ case CONFIG_ITEM_MODULE: /* We could also have "=<" here */
psz_bra = " <"; psz_type = _("string"); psz_ket = ">"; psz_bra = " <"; psz_type = _("string"); psz_ket = ">";
break; break;
case MODULE_CONFIG_ITEM_INTEGER: case CONFIG_ITEM_INTEGER:
psz_bra = " <"; psz_type = _("integer"); psz_ket = ">"; psz_bra = " <"; psz_type = _("integer"); psz_ket = ">";
break; break;
case MODULE_CONFIG_ITEM_FLOAT: case CONFIG_ITEM_FLOAT:
psz_bra = " <"; psz_type = _("float"); psz_ket = ">"; psz_bra = " <"; psz_type = _("float"); psz_ket = ">";
break; break;
case MODULE_CONFIG_ITEM_BOOL: case CONFIG_ITEM_BOOL:
psz_bra = ""; psz_type = ""; psz_ket = ""; psz_bra = ""; psz_type = ""; psz_ket = "";
if( !b_help_module ) if( !b_help_module )
{ {
...@@ -952,7 +953,7 @@ static void Usage( vlc_t *p_this, const char *psz_module_name ) ...@@ -952,7 +953,7 @@ static void Usage( vlc_t *p_this, const char *psz_module_name )
i = PADDING_SPACES - strlen( p_item->psz_name ) i = PADDING_SPACES - strlen( p_item->psz_name )
- strlen( psz_bra ) - strlen( psz_type ) - strlen( psz_bra ) - strlen( psz_type )
- strlen( psz_ket ) - 1; - strlen( psz_ket ) - 1;
if( p_item->i_type == MODULE_CONFIG_ITEM_BOOL if( p_item->i_type == CONFIG_ITEM_BOOL
&& !b_help_module ) && !b_help_module )
{ {
vlc_bool_t b_dash = VLC_FALSE; vlc_bool_t b_dash = VLC_FALSE;
...@@ -988,7 +989,7 @@ static void Usage( vlc_t *p_this, const char *psz_module_name ) ...@@ -988,7 +989,7 @@ static void Usage( vlc_t *p_this, const char *psz_module_name )
psz_spaces[i] = '\0'; psz_spaces[i] = '\0';
} }
if( p_item->i_type == MODULE_CONFIG_ITEM_BOOL && if( p_item->i_type == CONFIG_ITEM_BOOL &&
!b_help_module ) !b_help_module )
{ {
fprintf( stderr, psz_format, p_item->psz_name, psz_prefix, 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 ) ...@@ -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" ); fprintf( stderr, "\n" );
} }
......
src/libvlc.h
View file @ cecb7e86
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* libvlc.h: main libvlc header * libvlc.h: main libvlc header
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2002 VideoLAN * 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> * Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org> * Samuel Hocevar <sam@zoy.org>
...@@ -278,13 +278,29 @@ ...@@ -278,13 +278,29 @@
"you can also use this faster implementation but you might experience " \ "you can also use this faster implementation but you might experience " \
"problems with it.") "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: * Quick usage guide for the configuration options:
* *
* MODULE_CONFIG_START * MODULE_CONFIG_START
* MODULE_CONFIG_STOP * MODULE_CONFIG_STOP
* ADD_CATEGORY_HINT( N_(text), longtext ) * ADD_CATEGORY_HINT( N_(text), N_(longtext) )
* ADD_SUBCATEGORY_HINT( N_(text), 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_STRING( option_name, value, p_callback, N_(text), N_(longtext) )
* ADD_FILE( option_name, psz_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, * ADD_MODULE( option_name, psz_value, i_capability, p_callback,
...@@ -297,7 +313,7 @@ MODULE_CONFIG_START ...@@ -297,7 +313,7 @@ MODULE_CONFIG_START
/* Interface options */ /* Interface options */
ADD_CATEGORY_HINT( N_("Interface"), NULL) ADD_CATEGORY_HINT( N_("Interface"), NULL)
ADD_MODULE_WITH_SHORT ( "intf", 'I', MODULE_CAPABILITY_INTF, NULL, NULL, INTF_TEXT, INTF_LONGTEXT ) ADD_MODULE_WITH_SHORT ( "intf", 'I', MODULE_CAPABILITY_INTF, NULL, NULL, INTF_TEXT, INTF_LONGTEXT )
ADD_BOOL_WITH_SHORT ( "verbose", 'v', 0, NULL, VERBOSE_TEXT, VERBOSE_LONGTEXT ) ADD_BOOL_WITH_SHORT ( "verbose", 'v', 0, NULL, VERBOSE_TEXT, VERBOSE_LONGTEXT )
ADD_BOOL_WITH_SHORT ( "quiet", 'q', 0, NULL, QUIET_TEXT, QUIET_LONGTEXT ) ADD_BOOL_WITH_SHORT ( "quiet", 'q', 0, NULL, QUIET_TEXT, QUIET_LONGTEXT )
ADD_BOOL ( "color", 0, NULL, COLOR_TEXT, COLOR_LONGTEXT ) ADD_BOOL ( "color", 0, NULL, COLOR_TEXT, COLOR_LONGTEXT )
...@@ -305,7 +321,7 @@ ADD_STRING ( "search-path", NULL, NULL, INTF_PATH_TEXT, INTF_PATH_LONGTEXT ) ...@@ -305,7 +321,7 @@ ADD_STRING ( "search-path", NULL, NULL, INTF_PATH_TEXT, INTF_PATH_LONGTEXT )
/* Audio options */ /* Audio options */
ADD_CATEGORY_HINT( N_("Audio"), NULL) ADD_CATEGORY_HINT( N_("Audio"), NULL)
ADD_MODULE_WITH_SHORT ( "aout", 'A', MODULE_CAPABILITY_AOUT, NULL, NULL, AOUT_TEXT, AOUT_LONGTEXT ) ADD_MODULE_WITH_SHORT ( "aout", 'A', MODULE_CAPABILITY_AOUT, NULL, NULL, AOUT_TEXT, AOUT_LONGTEXT )
ADD_BOOL ( "audio", 1, NULL, AUDIO_TEXT, AUDIO_LONGTEXT ) ADD_BOOL ( "audio", 1, NULL, AUDIO_TEXT, AUDIO_LONGTEXT )
ADD_BOOL ( "mono", 0, NULL, MONO_TEXT, MONO_LONGTEXT ) ADD_BOOL ( "mono", 0, NULL, MONO_TEXT, MONO_LONGTEXT )
ADD_INTEGER ( "volume", VOLUME_DEFAULT, NULL, VOLUME_TEXT, VOLUME_LONGTEXT ) ADD_INTEGER ( "volume", VOLUME_DEFAULT, NULL, VOLUME_TEXT, VOLUME_LONGTEXT )
...@@ -315,7 +331,7 @@ ADD_INTEGER ( "audio-format", 0, NULL, FORMAT_TEXT, FORMAT_LONGTEXT ) ...@@ -315,7 +331,7 @@ ADD_INTEGER ( "audio-format", 0, NULL, FORMAT_TEXT, FORMAT_LONGTEXT )
/* Video options */ /* Video options */
ADD_CATEGORY_HINT( N_("Video"), NULL ) ADD_CATEGORY_HINT( N_("Video"), NULL )
ADD_MODULE_WITH_SHORT ( "vout", 'V', MODULE_CAPABILITY_VOUT, NULL, NULL, VOUT_TEXT, VOUT_LONGTEXT ) ADD_MODULE_WITH_SHORT ( "vout", 'V', MODULE_CAPABILITY_VOUT, NULL, NULL, VOUT_TEXT, VOUT_LONGTEXT )
ADD_BOOL ( "video", 1, NULL, VIDEO_TEXT, VIDEO_LONGTEXT ) ADD_BOOL ( "video", 1, NULL, VIDEO_TEXT, VIDEO_LONGTEXT )
ADD_INTEGER ( "width", -1, NULL, WIDTH_TEXT, WIDTH_LONGTEXT ) ADD_INTEGER ( "width", -1, NULL, WIDTH_TEXT, WIDTH_LONGTEXT )
ADD_INTEGER ( "height", -1, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT ) ADD_INTEGER ( "height", -1, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT )
...@@ -324,7 +340,7 @@ ADD_BOOL ( "grayscale", 0, NULL, GRAYSCALE_TEXT, GRAYSCALE_LONGTEXT ) ...@@ -324,7 +340,7 @@ ADD_BOOL ( "grayscale", 0, NULL, GRAYSCALE_TEXT, GRAYSCALE_LONGTEXT )
ADD_BOOL ( "fullscreen", 0, NULL, FULLSCREEN_TEXT, FULLSCREEN_LONGTEXT ) ADD_BOOL ( "fullscreen", 0, NULL, FULLSCREEN_TEXT, FULLSCREEN_LONGTEXT )
ADD_BOOL ( "overlay", 1, NULL, OVERLAY_TEXT, OVERLAY_LONGTEXT ) ADD_BOOL ( "overlay", 1, NULL, OVERLAY_TEXT, OVERLAY_LONGTEXT )
ADD_INTEGER ( "spumargin", -1, NULL, SPUMARGIN_TEXT, SPUMARGIN_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 */ /* Input options */
ADD_CATEGORY_HINT( N_("Input"), NULL ) ADD_CATEGORY_HINT( N_("Input"), NULL )
...@@ -342,8 +358,8 @@ ADD_INTEGER ( "spu-channel", -1, NULL, INPUT_SUBT_TEXT, INPUT_SUBT_LONGTEXT ) ...@@ -342,8 +358,8 @@ ADD_INTEGER ( "spu-channel", -1, NULL, INPUT_SUBT_TEXT, INPUT_SUBT_LONGTEXT )
ADD_STRING ( "dvd", DVD_DEVICE, NULL, DVD_DEV_TEXT, DVD_DEV_LONGTEXT ) ADD_STRING ( "dvd", DVD_DEVICE, NULL, DVD_DEV_TEXT, DVD_DEV_LONGTEXT )
ADD_STRING ( "vcd", VCD_DEVICE, NULL, VCD_DEV_TEXT, VCD_DEV_LONGTEXT ) ADD_STRING ( "vcd", VCD_DEVICE, NULL, VCD_DEV_TEXT, VCD_DEV_LONGTEXT )
ADD_BOOL_WITH_SHORT ( "ipv6", '6', 0, NULL, IPV6_TEXT, IPV6_LONGTEXT ) ADD_BOOL_WITH_SHORT ( "ipv6", '6', 0, NULL, IPV6_TEXT, IPV6_LONGTEXT )
ADD_BOOL_WITH_SHORT ( "ipv4", '4', 0, NULL, IPV4_TEXT, IPV4_LONGTEXT ) ADD_BOOL_WITH_SHORT ( "ipv4", '4', 0, NULL, IPV4_TEXT, IPV4_LONGTEXT )
/* Decoder options */ /* Decoder options */
ADD_CATEGORY_HINT( N_("Decoders"), NULL ) ADD_CATEGORY_HINT( N_("Decoders"), NULL )
...@@ -374,6 +390,9 @@ ADD_MODULE ( "demux", MODULE_CAPABILITY_DEMUX, NULL, NULL, DEMUX_TEXT, DEMUX_LO ...@@ -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 ) ADD_BOOL ( "fast-pthread", 0, NULL, FAST_PTHREAD_TEXT, FAST_PTHREAD_LONGTEXT )
#endif #endif
/* Usage (mainly useful for cmd line stuff) */
ADD_USAGE_HINT( PLAYLIST_USAGE )
MODULE_CONFIG_STOP MODULE_CONFIG_STOP
MODULE_INIT_START MODULE_INIT_START
...@@ -389,23 +408,15 @@ MODULE_DEACTIVATE_STOP ...@@ -389,23 +408,15 @@ MODULE_DEACTIVATE_STOP
static module_config_t p_help_config[] = static module_config_t p_help_config[] =
{ {
{ MODULE_CONFIG_ITEM_BOOL, "help", 'h', N_("print help"), { CONFIG_ITEM_BOOL, "help", 'h', N_("print help") },
NULL, NULL, 0, 0, NULL, NULL, 0 }, { CONFIG_ITEM_BOOL, "longhelp", 'H', N_("print detailed help") },
{ MODULE_CONFIG_ITEM_BOOL, "longhelp", 'H', N_("print detailed help"), { CONFIG_ITEM_BOOL, "list", 'l', N_("print a list of available modules") },
NULL, NULL, 0, 0, NULL, NULL, 0 }, { CONFIG_ITEM_STRING, "module", 'p', N_("print help on module") },
{ MODULE_CONFIG_ITEM_BOOL, "list", 'l', N_("print a list of available " { CONFIG_ITEM_BOOL, "version", '\0', N_("print version information") },
"modules"), NULL, NULL, 0, 0, NULL, NULL, 0 }, { CONFIG_ITEM_BOOL, "build", '\0', N_("print build information") },
{ MODULE_CONFIG_ITEM_STRING, "module", 'p', N_("print help on module"), { CONFIG_HINT_END, NULL, '\0' }
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 }
}; };
/***************************************************************************** /*****************************************************************************
* End configuration. * End configuration.
*****************************************************************************/ *****************************************************************************/
src/misc/configuration.c
View file @ cecb7e86
This diff is collapsed.
src/misc/modules.c
View file @ cecb7e86
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* modules.c : Builtin and plugin modules management functions * modules.c : Builtin and plugin modules management functions
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * 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> * Authors: Samuel Hocevar <sam@zoy.org>
* Ethan C. Baldridge <BaldridgeE@cadmus.com> * Ethan C. Baldridge <BaldridgeE@cadmus.com>
...@@ -461,6 +461,7 @@ module_t * __module_Need( vlc_object_t *p_this, ...@@ -461,6 +461,7 @@ module_t * __module_Need( vlc_object_t *p_this,
break; break;
case MODULE_CAPABILITY_VOUT: case MODULE_CAPABILITY_VOUT:
case MODULE_CAPABILITY_VOUT_FILTER:
i_ret = p_tmp->p_module->p_functions->vout.functions. i_ret = p_tmp->p_module->p_functions->vout.functions.
vout.pf_create( (vout_thread_t *)p_data ); vout.pf_create( (vout_thread_t *)p_data );
break; break;
......
src/video_output/video_output.c
View file @ cecb7e86
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* thread, and destroy a previously oppened video output thread. * thread, and destroy a previously oppened video output thread.
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2001 VideoLAN * 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> * Authors: Vincent Seguin <seguin@via.ecp.fr>
* *
...@@ -77,10 +77,40 @@ vout_thread_t * __vout_CreateThread ( vlc_object_t *p_parent, ...@@ -77,10 +77,40 @@ vout_thread_t * __vout_CreateThread ( vlc_object_t *p_parent,
return( NULL ); return( NULL );
} }
/* Choose the best module */ /* If the parent is not a VOUT object, that means we are at the start of
if( !(psz_plugin = config_GetPsz( p_vout, "filter" )) ) * the video output pipe */
if( p_parent->i_object_type != VLC_OBJECT_VOUT )
{ {
psz_plugin = config_GetPsz( p_vout, "vout" ); /* look for the default filter configuration */
p_vout->psz_filter_chain = config_GetPsz( p_parent, "filter" );
}
else
{
/* continue the parent's filter chain */
char *psz_end;
psz_end = strchr( ((vout_thread_t *)p_parent)->psz_filter_chain, ':' );
if( psz_end && *(psz_end+1) )
p_vout->psz_filter_chain = strdup( psz_end+1 );
else p_vout->psz_filter_chain = NULL;
}
/* Choose the video output module */
if( !p_vout->psz_filter_chain )
{
psz_plugin = config_GetPsz( p_parent, "vout" );
}
else
{
/* the filter chain is a string list of filters separated by double
* colons */
char *psz_end;
psz_end = strchr( p_vout->psz_filter_chain, ':' );
if( psz_end )
psz_plugin = strndup( p_vout->psz_filter_chain,
psz_end - p_vout->psz_filter_chain );
else psz_plugin = strdup( p_vout->psz_filter_chain );
} }
/* Initialize pictures and subpictures - translation tables and functions /* Initialize pictures and subpictures - translation tables and functions
...@@ -148,8 +178,11 @@ vout_thread_t * __vout_CreateThread ( vlc_object_t *p_parent, ...@@ -148,8 +178,11 @@ vout_thread_t * __vout_CreateThread ( vlc_object_t *p_parent,
&p_vout->i_window_height ); &p_vout->i_window_height );
p_vout->p_module = module_Need( p_vout, MODULE_CAPABILITY_VOUT, p_vout->p_module = module_Need( p_vout,
psz_plugin, (void *)p_vout ); ( p_vout->psz_filter_chain ) ?
MODULE_CAPABILITY_VOUT_FILTER :
MODULE_CAPABILITY_VOUT,
psz_plugin, (void *)p_vout );
if( psz_plugin ) free( psz_plugin ); if( psz_plugin ) free( psz_plugin );
if( p_vout->p_module == NULL ) if( p_vout->p_module == NULL )
......
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