From becc54dc00c7ae782712ba2acd3bc0e933809d08 Mon Sep 17 00:00:00 2001 From: Derk-Jan Hartman Date: Fri, 10 Jun 2005 15:32:08 +0000 Subject: [PATCH] * backport of [11386] --- modules/audio_filter/converter/mpgatofixed32.c | 4 ++-- modules/audio_filter/format.c | 2 ++ modules/audio_output/file.c | 2 ++ modules/codec/dts.c | 2 -- modules/gui/macosx/macosx.m | 4 ++++ modules/misc/freetype.c | 4 ++-- modules/misc/network/ipv4.c | 2 ++ modules/misc/svg.c | 2 ++ modules/video_filter/mosaic.c | 2 ++ modules/video_filter/motionblur.c | 2 ++ modules/video_filter/motiondetect.c | 2 ++ modules/video_filter/swscale/filter.c | 2 ++ modules/video_output/fb.c | 2 +- modules/video_output/opengl.c | 7 +++++-- modules/video_output/sdl.c | 3 +++ modules/video_output/svgalib.c | 3 +++ modules/video_output/wingdi.c | 4 ++++ src/libvlc.h | 6 +++--- 18 files changed, 43 insertions(+), 12 deletions(-) diff --git a/modules/audio_filter/converter/mpgatofixed32.c b/modules/audio_filter/converter/mpgatofixed32.c index 2c547b5205..8295a24c2e 100644 --- a/modules/audio_filter/converter/mpgatofixed32.c +++ b/modules/audio_filter/converter/mpgatofixed32.c @@ -62,8 +62,8 @@ struct filter_sys_t * Module descriptor *****************************************************************************/ vlc_module_begin(); - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_MISC ); + set_category( CAT_INPUT ); + set_subcategory( SUBCAT_INPUT_ACODEC ); set_description( _("MPEG audio decoder") ); set_capability( "audio filter", 100 ); set_callbacks( Create, Destroy ); diff --git a/modules/audio_filter/format.c b/modules/audio_filter/format.c index 28b338a4e4..89768a7d54 100644 --- a/modules/audio_filter/format.c +++ b/modules/audio_filter/format.c @@ -199,6 +199,8 @@ static struct *****************************************************************************/ vlc_module_begin(); set_description( _("audio filter for PCM format conversion") ); + set_category( CAT_AUDIO ); + set_subcategory( SUBCAT_AUDIO_MISC ); set_capability( "audio filter2", 1 ); set_callbacks( Open, NULL ); vlc_module_end(); diff --git a/modules/audio_output/file.c b/modules/audio_output/file.c index 1dff0d785e..7f9035e2d9 100644 --- a/modules/audio_output/file.c +++ b/modules/audio_output/file.c @@ -109,6 +109,8 @@ static int format_int[] = { VLC_FOURCC('u','8',' ',' '), vlc_module_begin(); set_description( N_("File audio output") ); set_shortname( _("File") ); + set_category( CAT_AUDIO ); + set_subcategory( SUBCAT_AUDIO_AOUT ); add_string( "audiofile-format", "s16", NULL, FORMAT_TEXT, FORMAT_LONGTEXT, VLC_TRUE ); diff --git a/modules/codec/dts.c b/modules/codec/dts.c index c6adbc0700..aa208d2f26 100644 --- a/modules/codec/dts.c +++ b/modules/codec/dts.c @@ -90,8 +90,6 @@ static block_t *GetSoutBuffer( decoder_t * ); vlc_module_begin(); set_description( _("DTS parser") ); set_capability( "decoder", 100 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACODEC ); set_callbacks( OpenDecoder, CloseDecoder ); add_submodule(); diff --git a/modules/gui/macosx/macosx.m b/modules/gui/macosx/macosx.m index aded06b028..a48e0e8f7d 100644 --- a/modules/gui/macosx/macosx.m +++ b/modules/gui/macosx/macosx.m @@ -76,6 +76,8 @@ vlc_module_begin(); add_submodule(); set_description( _("Quartz video") ); set_capability( "video output", 100 ); + set_category( CAT_VIDEO); + set_subcategory( SUBCAT_VIDEO_VOUT ); set_callbacks( E_(OpenVideoQT), E_(CloseVideoQT) ); add_integer( "macosx-vdev", 0, NULL, VDEV_TEXT, VDEV_LONGTEXT, VLC_FALSE ); @@ -88,6 +90,8 @@ vlc_module_begin(); add_submodule(); set_description( "Mac OS X OpenGL" ); set_capability( "opengl provider", 100 ); + set_category( CAT_VIDEO); + set_subcategory( SUBCAT_VIDEO_VOUT ); set_callbacks( E_(OpenVideoGL), E_(CloseVideoGL) ); vlc_module_end(); diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c index 88a6e6c52c..7b2a35cb0f 100644 --- a/modules/misc/freetype.c +++ b/modules/misc/freetype.c @@ -123,11 +123,11 @@ vlc_module_begin(); /* opacity valid on 0..255, with default 255 = fully opaque */ add_integer_with_range( "freetype-opacity", 255, 0, 255, NULL, - OPACITY_TEXT, OPACITY_LONGTEXT, VLC_FALSE ); + OPACITY_TEXT, OPACITY_LONGTEXT, VLC_TRUE ); /* hook to the color values list, with default 0x00ffffff = white */ add_integer( "freetype-color", 0x00FFFFFF, NULL, COLOR_TEXT, - COLOR_LONGTEXT, VLC_TRUE ); + COLOR_LONGTEXT, VLC_FALSE ); change_integer_list( pi_color_values, ppsz_color_descriptions, 0 ); add_integer( "freetype-rel-fontsize", 16, NULL, FONTSIZER_TEXT, diff --git a/modules/misc/network/ipv4.c b/modules/misc/network/ipv4.c index 2338ed08c3..e7827cd5d0 100644 --- a/modules/misc/network/ipv4.c +++ b/modules/misc/network/ipv4.c @@ -105,6 +105,8 @@ static int NetOpen( vlc_object_t * ); vlc_module_begin(); set_description( _("IPv4 network abstraction layer") ); set_capability( "network", 50 ); + set_category( CAT_INPUT ); + set_subcategory( SUBCAT_INPUT_ADVANCED ); set_callbacks( NetOpen, NULL ); add_integer( "ipv4-timeout", 5 * 1000, NULL, TIMEOUT_TEXT, diff --git a/modules/misc/svg.c b/modules/misc/svg.c index 09f7811cbb..16ba9d0023 100644 --- a/modules/misc/svg.c +++ b/modules/misc/svg.c @@ -58,6 +58,8 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out, #define TEMPLATE_LONGTEXT N_( "Location of a file holding a SVG template for automatic string conversion" ) vlc_module_begin(); + set_category( CAT_INPUT); + set_category( SUBCAT_INPUT_SCODEC ); set_capability( "text renderer", 101 ); add_shortcut( "svg" ); add_string( "svg-template-file", "", NULL, TEMPLATE_TEXT, TEMPLATE_LONGTEXT, VLC_TRUE ); diff --git a/modules/video_filter/mosaic.c b/modules/video_filter/mosaic.c index 34c6d11bf6..7b045e013b 100644 --- a/modules/video_filter/mosaic.c +++ b/modules/video_filter/mosaic.c @@ -124,6 +124,8 @@ static char *ppsz_align_descriptions[] = vlc_module_begin(); set_description( N_("Mosaic video sub filter") ); set_shortname( N_("Mosaic") ); + set_category( CAT_VIDEO ); + set_subcategory( SUBCAT_VIDEO_SUBPIC); set_capability( "sub filter", 0 ); set_callbacks( CreateFilter, DestroyFilter ); diff --git a/modules/video_filter/motionblur.c b/modules/video_filter/motionblur.c index 406f9e59bc..1e1b01d281 100644 --- a/modules/video_filter/motionblur.c +++ b/modules/video_filter/motionblur.c @@ -57,6 +57,8 @@ static int SendEvents( vlc_object_t *, char const *, vlc_module_begin(); set_description( _("Motion blur filter") ); set_capability( "video filter", 0 ); + set_category( CAT_VIDEO ); + set_subcategory( SUBCAT_VIDEO_VFILTER ); add_integer_with_range( "blur-factor", 80, 1, 127, NULL, MODE_TEXT, MODE_LONGTEXT, VLC_FALSE ); diff --git a/modules/video_filter/motiondetect.c b/modules/video_filter/motiondetect.c index 34bd4cff94..1eea40fdb2 100644 --- a/modules/video_filter/motiondetect.c +++ b/modules/video_filter/motiondetect.c @@ -59,6 +59,8 @@ static int SendEvents ( vlc_object_t *, char const *, vlc_module_begin(); set_description( _("Motion detect video filter") ); set_shortname( N_( "Motion detect" )); + set_category( CAT_VIDEO ); + set_subcategory( SUBCAT_VIDEO_VFILTER ); set_capability( "video filter", 0 ); add_integer( "motiondetect-history", 1, NULL, HISTORY_TEXT, diff --git a/modules/video_filter/swscale/filter.c b/modules/video_filter/swscale/filter.c index e780117aec..63315c501b 100644 --- a/modules/video_filter/swscale/filter.c +++ b/modules/video_filter/swscale/filter.c @@ -73,6 +73,8 @@ static char *ppsz_mode_descriptions[] = vlc_module_begin(); set_description( _("Video scaling filter") ); set_capability( "video filter2", 1000 ); + set_category( CAT_VIDEO ); + set_subcategory( SUBCAT_VIDEO_VFILTER ); set_callbacks( OpenFilter, CloseFilter ); add_integer( "swscale-mode", 0, NULL, MODE_TEXT, MODE_LONGTEXT, VLC_TRUE ); diff --git a/modules/video_output/fb.c b/modules/video_output/fb.c index 0cca7d4338..24066de168 100644 --- a/modules/video_output/fb.c +++ b/modules/video_output/fb.c @@ -70,7 +70,7 @@ static void GfxMode ( int i_tty ); "for rendering (usually /dev/fb0).") vlc_module_begin(); - set_shortname( "FB" ); + set_shortname( "Framebuffer" ); set_category( CAT_VIDEO ); set_subcategory( SUBCAT_VIDEO_VOUT ); add_file( FB_DEV_VAR, "/dev/fb0", NULL, DEVICE_TEXT, DEVICE_LONGTEXT, diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c index a3091f2245..2e3a43c319 100644 --- a/modules/video_output/opengl.c +++ b/modules/video_output/opengl.c @@ -109,6 +109,9 @@ static char *ppsz_effects_text[] = { N_("None"), N_("Cube"), N_("Transparent Cube") }; vlc_module_begin(); + set_shortname( "OpenGL" ); + set_category( CAT_VIDEO ); + set_subcategory( SUBCAT_VIDEO_VOUT ); set_description( _("OpenGL video output") ); #ifdef SYS_DARWIN set_capability( "video output", 200 ); @@ -117,10 +120,10 @@ vlc_module_begin(); #endif add_shortcut( "opengl" ); add_float( "opengl-cube-speed", 2.0, NULL, SPEED_TEXT, - SPEED_LONGTEXT, VLC_FALSE ); + SPEED_LONGTEXT, VLC_TRUE ); set_callbacks( CreateVout, DestroyVout ); add_string( "opengl-effect", "none", NULL, EFFECT_TEXT, - EFFECT_LONGTEXT, VLC_TRUE ); + EFFECT_LONGTEXT, VLC_FALSE ); change_string_list( ppsz_effects, ppsz_effects_text, 0 ); vlc_module_end(); diff --git a/modules/video_output/sdl.c b/modules/video_output/sdl.c index 0ba2cbb989..c01c7020c2 100644 --- a/modules/video_output/sdl.c +++ b/modules/video_output/sdl.c @@ -101,6 +101,9 @@ static void SetPalette ( vout_thread_t *, * Module descriptor *****************************************************************************/ vlc_module_begin(); + set_shortname( "SDL" ); + set_category( CAT_VIDEO ); + set_subcategory( SUBCAT_VIDEO_VOUT ); set_description( _("Simple DirectMedia Layer video output") ); set_capability( "video output", 60 ); add_shortcut( "sdl" ); diff --git a/modules/video_output/svgalib.c b/modules/video_output/svgalib.c index 9a7ff09304..2941e12119 100644 --- a/modules/video_output/svgalib.c +++ b/modules/video_output/svgalib.c @@ -50,6 +50,9 @@ static void SetPalette( vout_thread_t *, uint16_t *, uint16_t *, uint16_t * ); * Module descriptor *****************************************************************************/ vlc_module_begin(); + set_shortname( "SVGAlib" ); + set_category( CAT_VIDEO ); + set_subcategory( SUBCAT_VIDEO_VOUT ); set_description( _("SVGAlib video output") ); set_capability( "video output", 0 ); set_callbacks( Create, Destroy ); diff --git a/modules/video_output/wingdi.c b/modules/video_output/wingdi.c index 8df2ec5abb..470bee7341 100644 --- a/modules/video_output/wingdi.c +++ b/modules/video_output/wingdi.c @@ -210,10 +210,14 @@ struct vout_sys_t * Module descriptor *****************************************************************************/ vlc_module_begin(); + set_category( CAT_VIDEO ); + set_subcategory( SUBCAT_VIDEO_VOUT ); #ifdef MODULE_NAME_IS_wingapi + set_shortname( _("Windows GAPI") ); set_description( _("Windows GAPI video output") ); set_capability( "video output", 20 ); #else + set_shortname( _("Windows GDI") ); set_description( _("Windows GDI video output") ); set_capability( "video output", 10 ); #endif diff --git a/src/libvlc.h b/src/libvlc.h index c941da5a25..763fa4d9bf 100644 --- a/src/libvlc.h +++ b/src/libvlc.h @@ -944,7 +944,7 @@ vlc_module_begin(); FULLSCREEN_LONGTEXT, VLC_FALSE ); change_short('f'); add_bool( "skip-frames", 1, NULL, SKIP_FRAMES_TEXT, - SKIP_FRAMES_LONGTEXT, VLC_TRUE ); + SKIP_FRAMES_LONGTEXT, VLC_FALSE ); add_bool( "quiet-synchro", 0, NULL, QUIET_SYNCHRO_TEXT, QUIET_SYNCHRO_LONGTEXT, VLC_TRUE ); #ifndef SYS_DARWIN @@ -957,7 +957,7 @@ vlc_module_begin(); add_directory( "snapshot-path", NULL, NULL, SNAP_PATH_TEXT, SNAP_PATH_LONGTEXT, VLC_FALSE ); add_string( "snapshot-format", "png", NULL, SNAP_FORMAT_TEXT, - SNAP_FORMAT_LONGTEXT, VLC_TRUE ); + SNAP_FORMAT_LONGTEXT, VLC_FALSE ); change_string_list( ppsz_snap_formats, NULL, 0 ); set_section( N_("Window properties" ), NULL ); @@ -966,7 +966,7 @@ vlc_module_begin(); add_integer( "video-x", -1, NULL, VIDEOX_TEXT, VIDEOX_LONGTEXT, VLC_TRUE ); add_integer( "video-y", -1, NULL, VIDEOY_TEXT, VIDEOY_LONGTEXT, VLC_TRUE ); add_string( "aspect-ratio", "", NULL, - ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, VLC_TRUE ); + ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, VLC_FALSE ); add_bool( "video-deco", 1, NULL, VIDEO_DECO_TEXT, VIDEO_DECO_LONGTEXT, VLC_TRUE ); add_string( "video-title", NULL, NULL, VIDEO_TITLE_TEXT, -- 2.39.2