Commit bef9bb0b authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

Prefs: repair category system for some lost options.

set/(re)move a few cases of set_category and set_subcategory
(cherry picked from commit c18234129799ab96dec1b1d45373d3f0d5dd9bf3)
parent cdad57c5
...@@ -108,6 +108,10 @@ static const uint32_t pi_channels_out[] = ...@@ -108,6 +108,10 @@ static const uint32_t pi_channels_out[] =
vlc_module_begin () vlc_module_begin ()
set_description( N_("Audio filter for stereo to mono conversion") ) set_description( N_("Audio filter for stereo to mono conversion") )
set_capability( "audio filter2", 2 ) set_capability( "audio filter2", 2 )
set_category( CAT_AUDIO )
set_subcategory( SUBCAT_AUDIO_MISC )
set_callbacks( OpenFilter, CloseFilter )
set_shortname( "Mono" )
add_bool( MONO_CFG "downmix", true, NULL, MONO_DOWNMIX_TEXT, add_bool( MONO_CFG "downmix", true, NULL, MONO_DOWNMIX_TEXT,
MONO_DOWNMIX_LONGTEXT, false ) MONO_DOWNMIX_LONGTEXT, false )
...@@ -115,10 +119,6 @@ vlc_module_begin () ...@@ -115,10 +119,6 @@ vlc_module_begin ()
MONO_CHANNEL_LONGTEXT, false ) MONO_CHANNEL_LONGTEXT, false )
change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL ) change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL )
set_category( CAT_AUDIO )
set_subcategory( SUBCAT_AUDIO_MISC )
set_callbacks( OpenFilter, CloseFilter )
set_shortname( "Mono" )
vlc_module_end () vlc_module_end ()
/* Init() and ComputeChannelOperations() - /* Init() and ComputeChannelOperations() -
......
...@@ -104,6 +104,8 @@ vlc_module_begin () ...@@ -104,6 +104,8 @@ vlc_module_begin ()
set_description( N_("Hotkeys management interface") ) set_description( N_("Hotkeys management interface") )
set_capability( "interface", 0 ) set_capability( "interface", 0 )
set_callbacks( Open, Close ) set_callbacks( Open, Close )
set_category( CAT_INTERFACE )
set_subcategory( SUBCAT_INTERFACE_HOTKEYS )
add_integer( "hotkeys-mousewheel-mode", MOUSEWHEEL_VOLUME, NULL, add_integer( "hotkeys-mousewheel-mode", MOUSEWHEEL_VOLUME, NULL,
N_("MouseWheel x-axis Control"), N_("MouseWheel x-axis Control"),
......
...@@ -77,6 +77,7 @@ static int GetOrientation( intf_thread_t *p_intf ); ...@@ -77,6 +77,7 @@ static int GetOrientation( intf_thread_t *p_intf );
vlc_module_begin () vlc_module_begin ()
set_shortname( N_("motion")) set_shortname( N_("motion"))
set_category( CAT_INTERFACE ) set_category( CAT_INTERFACE )
set_subcategory( SUBCAT_INTERFACE_CONTROL )
set_description( N_("motion control interface") ) set_description( N_("motion control interface") )
set_help( N_("Use HDAPS, AMS, APPLESMC or UNIMOTION motion sensors " \ set_help( N_("Use HDAPS, AMS, APPLESMC or UNIMOTION motion sensors " \
"to rotate the video") ) "to rotate the video") )
......
...@@ -68,11 +68,15 @@ static int MouseEvent( vlc_object_t *, char const *, ...@@ -68,11 +68,15 @@ static int MouseEvent( vlc_object_t *, char const *,
vlc_module_begin () vlc_module_begin ()
set_shortname( "Showintf" ) set_shortname( "Showintf" )
add_integer( "showintf-threshold", 10, NULL, THRESHOLD_TEXT, THRESHOLD_LONGTEXT, true )
set_description( N_("Show interface with mouse") ) set_description( N_("Show interface with mouse") )
set_capability( "interface", 0 ) set_capability( "interface", 0 )
set_callbacks( Open, Close ) set_callbacks( Open, Close )
set_category( CAT_INTERFACE )
set_subcategory( SUBCAT_INTERFACE_CONTROL )
add_integer( "showintf-threshold", 10, NULL, THRESHOLD_TEXT, THRESHOLD_LONGTEXT, true )
vlc_module_end () vlc_module_end ()
/***************************************************************************** /*****************************************************************************
......
...@@ -82,6 +82,8 @@ vlc_module_begin () ...@@ -82,6 +82,8 @@ vlc_module_begin ()
set_description( N_("Dummy decoder function") ) set_description( N_("Dummy decoder function") )
set_capability( "decoder", 0 ) set_capability( "decoder", 0 )
set_callbacks( OpenDecoder, CloseDecoder ) set_callbacks( OpenDecoder, CloseDecoder )
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_SCODEC )
add_bool( "dummy-save-es", 0, NULL, SAVE_TEXT, SAVE_LONGTEXT, true ) add_bool( "dummy-save-es", 0, NULL, SAVE_TEXT, SAVE_LONGTEXT, true )
add_submodule () add_submodule ()
set_section( N_( "Dump decoder" ), NULL ) set_section( N_( "Dump decoder" ), NULL )
...@@ -102,6 +104,8 @@ vlc_module_begin () ...@@ -102,6 +104,8 @@ vlc_module_begin ()
set_section( N_( "Dummy Video output" ), NULL ) set_section( N_( "Dummy Video output" ), NULL )
set_capability( "video output", 1 ) set_capability( "video output", 1 )
set_callbacks( OpenVideo, NULL ) set_callbacks( OpenVideo, NULL )
set_category( CAT_VIDEO )
set_subcategory( SUBCAT_VIDEO_VOUT )
add_category_hint( N_("Video"), NULL, false ) add_category_hint( N_("Video"), NULL, false )
add_string( "dummy-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true ) add_string( "dummy-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true )
add_submodule () add_submodule ()
......
...@@ -47,9 +47,6 @@ static void osd_parser_Close( vlc_object_t *p_this ); ...@@ -47,9 +47,6 @@ static void osd_parser_Close( vlc_object_t *p_this );
*****************************************************************************/ *****************************************************************************/
vlc_module_begin () vlc_module_begin ()
set_category( CAT_OSD )
set_subcategory( SUBCAT_OSD_IMPORT )
add_submodule () add_submodule ()
set_description( N_("OSD configuration importer") ) set_description( N_("OSD configuration importer") )
add_shortcut( "import-osd" ) add_shortcut( "import-osd" )
......
...@@ -67,6 +67,9 @@ vlc_module_begin () ...@@ -67,6 +67,9 @@ vlc_module_begin ()
set_capability( "video filter2", 0 ) set_capability( "video filter2", 0 )
set_callbacks( Activate, Destroy ) set_callbacks( Activate, Destroy )
set_category( CAT_VIDEO )
set_subcategory( SUBCAT_VIDEO_VFILTER2 )
add_integer_with_range( CFG_PREFIX "width", 0, 0, INT_MAX, NULL, add_integer_with_range( CFG_PREFIX "width", 0, 0, INT_MAX, NULL,
WIDTH_TEXT, WIDTH_LONGTEXT, false ) WIDTH_TEXT, WIDTH_LONGTEXT, false )
add_integer_with_range( CFG_PREFIX "height", 0, 0, INT_MAX, NULL, add_integer_with_range( CFG_PREFIX "height", 0, 0, INT_MAX, NULL,
......
...@@ -79,6 +79,9 @@ vlc_module_begin () ...@@ -79,6 +79,9 @@ vlc_module_begin ()
set_capability( "video filter2", 0 ) set_capability( "video filter2", 0 )
set_callbacks( OpenFilter, CloseFilter ) set_callbacks( OpenFilter, CloseFilter )
set_category( CAT_VIDEO )
set_subcategory( SUBCAT_VIDEO_VFILTER2 );
set_section( N_("Crop"), NULL ) set_section( N_("Crop"), NULL )
add_integer_with_range( CFG_PREFIX "croptop", 0, 0, INT_MAX, NULL, add_integer_with_range( CFG_PREFIX "croptop", 0, 0, INT_MAX, NULL,
CROPTOP_TEXT, CROPTOP_LONGTEXT, false ) CROPTOP_TEXT, CROPTOP_LONGTEXT, false )
......
...@@ -113,6 +113,16 @@ static int MouseEvent( vlc_object_t *, char const *, ...@@ -113,6 +113,16 @@ static int MouseEvent( vlc_object_t *, char const *,
#define OSD_UPDATE_MAX 1000 #define OSD_UPDATE_MAX 1000
vlc_module_begin () vlc_module_begin ()
set_capability( "sub filter", 100 )
set_description( N_("On Screen Display menu") )
set_shortname( N_("OSD menu") )
add_shortcut( "osdmenu" )
set_category( CAT_VIDEO )
set_subcategory( SUBCAT_VIDEO_SUBPIC )
set_callbacks( CreateFilter, DestroyFilter )
add_integer( OSD_CFG "x", -1, NULL, POSX_TEXT, POSX_LONGTEXT, false ) add_integer( OSD_CFG "x", -1, NULL, POSX_TEXT, POSX_LONGTEXT, false )
add_integer( OSD_CFG "y", -1, NULL, POSY_TEXT, POSY_LONGTEXT, false ) add_integer( OSD_CFG "y", -1, NULL, POSY_TEXT, POSY_LONGTEXT, false )
add_integer( OSD_CFG "position", 8, NULL, POS_TEXT, POS_LONGTEXT, add_integer( OSD_CFG "position", 8, NULL, POS_TEXT, POS_LONGTEXT,
...@@ -130,15 +140,6 @@ vlc_module_begin () ...@@ -130,15 +140,6 @@ vlc_module_begin ()
add_integer_with_range( OSD_CFG "alpha", 255, 0, 255, NULL, add_integer_with_range( OSD_CFG "alpha", 255, 0, 255, NULL,
OSD_ALPHA_TEXT, OSD_ALPHA_LONGTEXT, true ) OSD_ALPHA_TEXT, OSD_ALPHA_LONGTEXT, true )
set_capability( "sub filter", 100 )
set_description( N_("On Screen Display menu") )
set_shortname( N_("OSD menu") )
add_shortcut( "osdmenu" )
set_category( CAT_VIDEO )
set_subcategory( SUBCAT_VIDEO_SUBPIC )
set_callbacks( CreateFilter, DestroyFilter )
vlc_module_end () vlc_module_end ()
/***************************************************************************** /*****************************************************************************
......
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