Commit 0c8da599 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* Some changes to preferences categorization (This really needs a lot more work)

parent 1111338a
...@@ -62,8 +62,8 @@ struct filter_sys_t ...@@ -62,8 +62,8 @@ struct filter_sys_t
* Module descriptor * Module descriptor
*****************************************************************************/ *****************************************************************************/
vlc_module_begin(); vlc_module_begin();
set_category( CAT_AUDIO ); set_category( CAT_INPUT );
set_subcategory( SUBCAT_AUDIO_MISC ); set_subcategory( SUBCAT_INPUT_ACODEC );
set_description( _("MPEG audio decoder") ); set_description( _("MPEG audio decoder") );
set_capability( "audio filter", 100 ); set_capability( "audio filter", 100 );
set_callbacks( Create, Destroy ); set_callbacks( Create, Destroy );
......
...@@ -199,6 +199,8 @@ static struct ...@@ -199,6 +199,8 @@ static struct
*****************************************************************************/ *****************************************************************************/
vlc_module_begin(); vlc_module_begin();
set_description( _("audio filter for PCM format conversion") ); set_description( _("audio filter for PCM format conversion") );
set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_MISC );
set_capability( "audio filter2", 1 ); set_capability( "audio filter2", 1 );
set_callbacks( Open, NULL ); set_callbacks( Open, NULL );
vlc_module_end(); vlc_module_end();
......
...@@ -109,6 +109,8 @@ static int format_int[] = { VLC_FOURCC('u','8',' ',' '), ...@@ -109,6 +109,8 @@ static int format_int[] = { VLC_FOURCC('u','8',' ',' '),
vlc_module_begin(); vlc_module_begin();
set_description( N_("File audio output") ); set_description( N_("File audio output") );
set_shortname( _("File") ); set_shortname( _("File") );
set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_AOUT );
add_string( "audiofile-format", "s16", NULL, add_string( "audiofile-format", "s16", NULL,
FORMAT_TEXT, FORMAT_LONGTEXT, VLC_TRUE ); FORMAT_TEXT, FORMAT_LONGTEXT, VLC_TRUE );
......
...@@ -90,8 +90,6 @@ static block_t *GetSoutBuffer( decoder_t * ); ...@@ -90,8 +90,6 @@ static block_t *GetSoutBuffer( decoder_t * );
vlc_module_begin(); vlc_module_begin();
set_description( _("DTS parser") ); set_description( _("DTS parser") );
set_capability( "decoder", 100 ); set_capability( "decoder", 100 );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_ACODEC );
set_callbacks( OpenDecoder, CloseDecoder ); set_callbacks( OpenDecoder, CloseDecoder );
add_submodule(); add_submodule();
......
...@@ -76,6 +76,8 @@ vlc_module_begin(); ...@@ -76,6 +76,8 @@ vlc_module_begin();
add_submodule(); add_submodule();
set_description( _("Quartz video") ); set_description( _("Quartz video") );
set_capability( "video output", 100 ); set_capability( "video output", 100 );
set_category( CAT_VIDEO);
set_subcategory( SUBCAT_VIDEO_VOUT );
set_callbacks( E_(OpenVideoQT), E_(CloseVideoQT) ); set_callbacks( E_(OpenVideoQT), E_(CloseVideoQT) );
add_integer( "macosx-vdev", 0, NULL, VDEV_TEXT, VDEV_LONGTEXT, add_integer( "macosx-vdev", 0, NULL, VDEV_TEXT, VDEV_LONGTEXT,
VLC_FALSE ); VLC_FALSE );
...@@ -88,6 +90,8 @@ vlc_module_begin(); ...@@ -88,6 +90,8 @@ vlc_module_begin();
add_submodule(); add_submodule();
set_description( "Mac OS X OpenGL" ); set_description( "Mac OS X OpenGL" );
set_capability( "opengl provider", 100 ); set_capability( "opengl provider", 100 );
set_category( CAT_VIDEO);
set_subcategory( SUBCAT_VIDEO_VOUT );
set_callbacks( E_(OpenVideoGL), E_(CloseVideoGL) ); set_callbacks( E_(OpenVideoGL), E_(CloseVideoGL) );
vlc_module_end(); vlc_module_end();
...@@ -123,11 +123,11 @@ vlc_module_begin(); ...@@ -123,11 +123,11 @@ vlc_module_begin();
/* opacity valid on 0..255, with default 255 = fully opaque */ /* opacity valid on 0..255, with default 255 = fully opaque */
add_integer_with_range( "freetype-opacity", 255, 0, 255, NULL, 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 */ /* hook to the color values list, with default 0x00ffffff = white */
add_integer( "freetype-color", 0x00FFFFFF, NULL, COLOR_TEXT, 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 ); change_integer_list( pi_color_values, ppsz_color_descriptions, 0 );
add_integer( "freetype-rel-fontsize", 16, NULL, FONTSIZER_TEXT, add_integer( "freetype-rel-fontsize", 16, NULL, FONTSIZER_TEXT,
......
...@@ -100,6 +100,8 @@ static int NetOpen( vlc_object_t * ); ...@@ -100,6 +100,8 @@ static int NetOpen( vlc_object_t * );
vlc_module_begin(); vlc_module_begin();
set_description( _("IPv4 network abstraction layer") ); set_description( _("IPv4 network abstraction layer") );
set_capability( "network", 50 ); set_capability( "network", 50 );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_ADVANCED );
set_callbacks( NetOpen, NULL ); set_callbacks( NetOpen, NULL );
add_string( "miface-addr", NULL, NULL, MIFACE_TEXT, MIFACE_LONGTEXT, VLC_TRUE ); add_string( "miface-addr", NULL, NULL, MIFACE_TEXT, MIFACE_LONGTEXT, VLC_TRUE );
vlc_module_end(); vlc_module_end();
......
...@@ -58,6 +58,8 @@ static int RenderText( filter_t *p_filter, subpicture_region_t *p_region_out, ...@@ -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" ) #define TEMPLATE_LONGTEXT N_( "Location of a file holding a SVG template for automatic string conversion" )
vlc_module_begin(); vlc_module_begin();
set_category( CAT_INPUT);
set_category( SUBCAT_INPUT_SCODEC );
set_capability( "text renderer", 101 ); set_capability( "text renderer", 101 );
add_shortcut( "svg" ); add_shortcut( "svg" );
add_string( "svg-template-file", "", NULL, TEMPLATE_TEXT, TEMPLATE_LONGTEXT, VLC_TRUE ); add_string( "svg-template-file", "", NULL, TEMPLATE_TEXT, TEMPLATE_LONGTEXT, VLC_TRUE );
......
...@@ -124,6 +124,8 @@ static char *ppsz_align_descriptions[] = ...@@ -124,6 +124,8 @@ static char *ppsz_align_descriptions[] =
vlc_module_begin(); vlc_module_begin();
set_description( N_("Mosaic video sub filter") ); set_description( N_("Mosaic video sub filter") );
set_shortname( N_("Mosaic") ); set_shortname( N_("Mosaic") );
set_category( CAT_VIDEO );
set_subcategory( SUBCAT_VIDEO_SUBPIC);
set_capability( "sub filter", 0 ); set_capability( "sub filter", 0 );
set_callbacks( CreateFilter, DestroyFilter ); set_callbacks( CreateFilter, DestroyFilter );
......
...@@ -57,6 +57,8 @@ static int SendEvents( vlc_object_t *, char const *, ...@@ -57,6 +57,8 @@ static int SendEvents( vlc_object_t *, char const *,
vlc_module_begin(); vlc_module_begin();
set_description( _("Motion blur filter") ); set_description( _("Motion blur filter") );
set_capability( "video filter", 0 ); set_capability( "video filter", 0 );
set_category( CAT_VIDEO );
set_subcategory( SUBCAT_VIDEO_VFILTER );
add_integer_with_range( "blur-factor", 80, 1, 127, NULL, add_integer_with_range( "blur-factor", 80, 1, 127, NULL,
MODE_TEXT, MODE_LONGTEXT, VLC_FALSE ); MODE_TEXT, MODE_LONGTEXT, VLC_FALSE );
......
...@@ -59,6 +59,8 @@ static int SendEvents ( vlc_object_t *, char const *, ...@@ -59,6 +59,8 @@ static int SendEvents ( vlc_object_t *, char const *,
vlc_module_begin(); vlc_module_begin();
set_description( _("Motion detect video filter") ); set_description( _("Motion detect video filter") );
set_shortname( N_( "Motion detect" )); set_shortname( N_( "Motion detect" ));
set_category( CAT_VIDEO );
set_subcategory( SUBCAT_VIDEO_VFILTER );
set_capability( "video filter", 0 ); set_capability( "video filter", 0 );
add_integer( "motiondetect-history", 1, NULL, HISTORY_TEXT, add_integer( "motiondetect-history", 1, NULL, HISTORY_TEXT,
......
...@@ -73,6 +73,8 @@ static char *ppsz_mode_descriptions[] = ...@@ -73,6 +73,8 @@ static char *ppsz_mode_descriptions[] =
vlc_module_begin(); vlc_module_begin();
set_description( _("Video scaling filter") ); set_description( _("Video scaling filter") );
set_capability( "video filter2", 1000 ); set_capability( "video filter2", 1000 );
set_category( CAT_VIDEO );
set_subcategory( SUBCAT_VIDEO_VFILTER );
set_callbacks( OpenFilter, CloseFilter ); set_callbacks( OpenFilter, CloseFilter );
add_integer( "swscale-mode", 0, NULL, MODE_TEXT, MODE_LONGTEXT, VLC_TRUE ); add_integer( "swscale-mode", 0, NULL, MODE_TEXT, MODE_LONGTEXT, VLC_TRUE );
......
...@@ -70,7 +70,7 @@ static void GfxMode ( int i_tty ); ...@@ -70,7 +70,7 @@ static void GfxMode ( int i_tty );
"for rendering (usually /dev/fb0).") "for rendering (usually /dev/fb0).")
vlc_module_begin(); vlc_module_begin();
set_shortname( "FB" ); set_shortname( "Framebuffer" );
set_category( CAT_VIDEO ); set_category( CAT_VIDEO );
set_subcategory( SUBCAT_VIDEO_VOUT ); set_subcategory( SUBCAT_VIDEO_VOUT );
add_file( FB_DEV_VAR, "/dev/fb0", NULL, DEVICE_TEXT, DEVICE_LONGTEXT, add_file( FB_DEV_VAR, "/dev/fb0", NULL, DEVICE_TEXT, DEVICE_LONGTEXT,
......
...@@ -109,6 +109,9 @@ static char *ppsz_effects_text[] = { ...@@ -109,6 +109,9 @@ static char *ppsz_effects_text[] = {
N_("None"), N_("Cube"), N_("Transparent Cube") }; N_("None"), N_("Cube"), N_("Transparent Cube") };
vlc_module_begin(); vlc_module_begin();
set_shortname( "OpenGL" );
set_category( CAT_VIDEO );
set_subcategory( SUBCAT_VIDEO_VOUT );
set_description( _("OpenGL video output") ); set_description( _("OpenGL video output") );
#ifdef SYS_DARWIN #ifdef SYS_DARWIN
set_capability( "video output", 200 ); set_capability( "video output", 200 );
...@@ -117,10 +120,10 @@ vlc_module_begin(); ...@@ -117,10 +120,10 @@ vlc_module_begin();
#endif #endif
add_shortcut( "opengl" ); add_shortcut( "opengl" );
add_float( "opengl-cube-speed", 2.0, NULL, SPEED_TEXT, add_float( "opengl-cube-speed", 2.0, NULL, SPEED_TEXT,
SPEED_LONGTEXT, VLC_FALSE ); SPEED_LONGTEXT, VLC_TRUE );
set_callbacks( CreateVout, DestroyVout ); set_callbacks( CreateVout, DestroyVout );
add_string( "opengl-effect", "none", NULL, EFFECT_TEXT, 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 ); change_string_list( ppsz_effects, ppsz_effects_text, 0 );
vlc_module_end(); vlc_module_end();
......
...@@ -101,6 +101,9 @@ static void SetPalette ( vout_thread_t *, ...@@ -101,6 +101,9 @@ static void SetPalette ( vout_thread_t *,
* Module descriptor * Module descriptor
*****************************************************************************/ *****************************************************************************/
vlc_module_begin(); vlc_module_begin();
set_shortname( "SDL" );
set_category( CAT_VIDEO );
set_subcategory( SUBCAT_VIDEO_VOUT );
set_description( _("Simple DirectMedia Layer video output") ); set_description( _("Simple DirectMedia Layer video output") );
set_capability( "video output", 60 ); set_capability( "video output", 60 );
add_shortcut( "sdl" ); add_shortcut( "sdl" );
......
...@@ -50,6 +50,9 @@ static void SetPalette( vout_thread_t *, uint16_t *, uint16_t *, uint16_t * ); ...@@ -50,6 +50,9 @@ static void SetPalette( vout_thread_t *, uint16_t *, uint16_t *, uint16_t * );
* Module descriptor * Module descriptor
*****************************************************************************/ *****************************************************************************/
vlc_module_begin(); vlc_module_begin();
set_shortname( "SVGAlib" );
set_category( CAT_VIDEO );
set_subcategory( SUBCAT_VIDEO_VOUT );
set_description( _("SVGAlib video output") ); set_description( _("SVGAlib video output") );
set_capability( "video output", 0 ); set_capability( "video output", 0 );
set_callbacks( Create, Destroy ); set_callbacks( Create, Destroy );
......
...@@ -210,10 +210,14 @@ struct vout_sys_t ...@@ -210,10 +210,14 @@ struct vout_sys_t
* Module descriptor * Module descriptor
*****************************************************************************/ *****************************************************************************/
vlc_module_begin(); vlc_module_begin();
set_category( CAT_VIDEO );
set_subcategory( SUBCAT_VIDEO_VOUT );
#ifdef MODULE_NAME_IS_wingapi #ifdef MODULE_NAME_IS_wingapi
set_shortname( _("Windows GAPI") );
set_description( _("Windows GAPI video output") ); set_description( _("Windows GAPI video output") );
set_capability( "video output", 20 ); set_capability( "video output", 20 );
#else #else
set_shortname( _("Windows GDI") );
set_description( _("Windows GDI video output") ); set_description( _("Windows GDI video output") );
set_capability( "video output", 10 ); set_capability( "video output", 10 );
#endif #endif
......
...@@ -948,7 +948,7 @@ vlc_module_begin(); ...@@ -948,7 +948,7 @@ vlc_module_begin();
FULLSCREEN_LONGTEXT, VLC_FALSE ); FULLSCREEN_LONGTEXT, VLC_FALSE );
change_short('f'); change_short('f');
add_bool( "skip-frames", 1, NULL, SKIP_FRAMES_TEXT, 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, add_bool( "quiet-synchro", 0, NULL, QUIET_SYNCHRO_TEXT,
QUIET_SYNCHRO_LONGTEXT, VLC_TRUE ); QUIET_SYNCHRO_LONGTEXT, VLC_TRUE );
#ifndef SYS_DARWIN #ifndef SYS_DARWIN
...@@ -961,7 +961,7 @@ vlc_module_begin(); ...@@ -961,7 +961,7 @@ vlc_module_begin();
add_directory( "snapshot-path", NULL, NULL, SNAP_PATH_TEXT, add_directory( "snapshot-path", NULL, NULL, SNAP_PATH_TEXT,
SNAP_PATH_LONGTEXT, VLC_FALSE ); SNAP_PATH_LONGTEXT, VLC_FALSE );
add_string( "snapshot-format", "png", NULL, SNAP_FORMAT_TEXT, 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 ); change_string_list( ppsz_snap_formats, NULL, 0 );
set_section( N_("Window properties" ), NULL ); set_section( N_("Window properties" ), NULL );
...@@ -970,7 +970,7 @@ vlc_module_begin(); ...@@ -970,7 +970,7 @@ vlc_module_begin();
add_integer( "video-x", -1, NULL, VIDEOX_TEXT, VIDEOX_LONGTEXT, VLC_TRUE ); 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_integer( "video-y", -1, NULL, VIDEOY_TEXT, VIDEOY_LONGTEXT, VLC_TRUE );
add_string( "aspect-ratio", "", NULL, 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, add_bool( "video-deco", 1, NULL, VIDEO_DECO_TEXT,
VIDEO_DECO_LONGTEXT, VLC_TRUE ); VIDEO_DECO_LONGTEXT, VLC_TRUE );
add_string( "video-title", NULL, NULL, VIDEO_TITLE_TEXT, add_string( "video-title", NULL, NULL, VIDEO_TITLE_TEXT,
......
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