[vlc-devel] commit: Prefs: repair category system for some lost options. ( Derk-Jan Hartman )
git version control
git at videolan.org
Wed May 27 01:46:37 CEST 2009
vlc | branch: master | Derk-Jan Hartman <hartman at videolan.org> | Wed May 27 00:02:00 2009 +0200| [bef9bb0b6f296b2e2898920aee3256f739b0bc25] | committer: 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)
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=bef9bb0b6f296b2e2898920aee3256f739b0bc25
---
modules/audio_filter/channel_mixer/mono.c | 8 ++++----
modules/control/hotkeys.c | 2 ++
modules/control/motion.c | 1 +
modules/control/showintf.c | 6 +++++-
modules/misc/dummy/dummy.c | 4 ++++
modules/misc/osd/parser.c | 3 ---
modules/video_filter/canvas.c | 3 +++
modules/video_filter/croppadd.c | 3 +++
modules/video_filter/osdmenu.c | 19 ++++++++++---------
9 files changed, 32 insertions(+), 17 deletions(-)
diff --git a/modules/audio_filter/channel_mixer/mono.c b/modules/audio_filter/channel_mixer/mono.c
index 7e4af3d..5cf8cb7 100644
--- a/modules/audio_filter/channel_mixer/mono.c
+++ b/modules/audio_filter/channel_mixer/mono.c
@@ -108,6 +108,10 @@ static const uint32_t pi_channels_out[] =
vlc_module_begin ()
set_description( N_("Audio filter for stereo to mono conversion") )
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,
MONO_DOWNMIX_LONGTEXT, false )
@@ -115,10 +119,6 @@ vlc_module_begin ()
MONO_CHANNEL_LONGTEXT, false )
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 ()
/* Init() and ComputeChannelOperations() -
diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c
index 4447e17..39842a6 100644
--- a/modules/control/hotkeys.c
+++ b/modules/control/hotkeys.c
@@ -104,6 +104,8 @@ vlc_module_begin ()
set_description( N_("Hotkeys management interface") )
set_capability( "interface", 0 )
set_callbacks( Open, Close )
+ set_category( CAT_INTERFACE )
+ set_subcategory( SUBCAT_INTERFACE_HOTKEYS )
add_integer( "hotkeys-mousewheel-mode", MOUSEWHEEL_VOLUME, NULL,
N_("MouseWheel x-axis Control"),
diff --git a/modules/control/motion.c b/modules/control/motion.c
index a0555a7..03a0111 100644
--- a/modules/control/motion.c
+++ b/modules/control/motion.c
@@ -77,6 +77,7 @@ static int GetOrientation( intf_thread_t *p_intf );
vlc_module_begin ()
set_shortname( N_("motion"))
set_category( CAT_INTERFACE )
+ set_subcategory( SUBCAT_INTERFACE_CONTROL )
set_description( N_("motion control interface") )
set_help( N_("Use HDAPS, AMS, APPLESMC or UNIMOTION motion sensors " \
"to rotate the video") )
diff --git a/modules/control/showintf.c b/modules/control/showintf.c
index 4ec461b..2f1149b 100644
--- a/modules/control/showintf.c
+++ b/modules/control/showintf.c
@@ -68,11 +68,15 @@ static int MouseEvent( vlc_object_t *, char const *,
vlc_module_begin ()
set_shortname( "Showintf" )
- add_integer( "showintf-threshold", 10, NULL, THRESHOLD_TEXT, THRESHOLD_LONGTEXT, true )
set_description( N_("Show interface with mouse") )
set_capability( "interface", 0 )
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 ()
/*****************************************************************************
diff --git a/modules/misc/dummy/dummy.c b/modules/misc/dummy/dummy.c
index 22b7469..547c84b 100644
--- a/modules/misc/dummy/dummy.c
+++ b/modules/misc/dummy/dummy.c
@@ -82,6 +82,8 @@ vlc_module_begin ()
set_description( N_("Dummy decoder function") )
set_capability( "decoder", 0 )
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_submodule ()
set_section( N_( "Dump decoder" ), NULL )
@@ -102,6 +104,8 @@ vlc_module_begin ()
set_section( N_( "Dummy Video output" ), NULL )
set_capability( "video output", 1 )
set_callbacks( OpenVideo, NULL )
+ set_category( CAT_VIDEO )
+ set_subcategory( SUBCAT_VIDEO_VOUT )
add_category_hint( N_("Video"), NULL, false )
add_string( "dummy-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true )
add_submodule ()
diff --git a/modules/misc/osd/parser.c b/modules/misc/osd/parser.c
index 5978b1b..70f01be 100644
--- a/modules/misc/osd/parser.c
+++ b/modules/misc/osd/parser.c
@@ -47,9 +47,6 @@ static void osd_parser_Close( vlc_object_t *p_this );
*****************************************************************************/
vlc_module_begin ()
- set_category( CAT_OSD )
- set_subcategory( SUBCAT_OSD_IMPORT )
-
add_submodule ()
set_description( N_("OSD configuration importer") )
add_shortcut( "import-osd" )
diff --git a/modules/video_filter/canvas.c b/modules/video_filter/canvas.c
index 9f9bef4..f4ffe74 100644
--- a/modules/video_filter/canvas.c
+++ b/modules/video_filter/canvas.c
@@ -67,6 +67,9 @@ vlc_module_begin ()
set_capability( "video filter2", 0 )
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,
WIDTH_TEXT, WIDTH_LONGTEXT, false )
add_integer_with_range( CFG_PREFIX "height", 0, 0, INT_MAX, NULL,
diff --git a/modules/video_filter/croppadd.c b/modules/video_filter/croppadd.c
index d5c7730..fca6c69 100644
--- a/modules/video_filter/croppadd.c
+++ b/modules/video_filter/croppadd.c
@@ -79,6 +79,9 @@ vlc_module_begin ()
set_capability( "video filter2", 0 )
set_callbacks( OpenFilter, CloseFilter )
+ set_category( CAT_VIDEO )
+ set_subcategory( SUBCAT_VIDEO_VFILTER2 );
+
set_section( N_("Crop"), NULL )
add_integer_with_range( CFG_PREFIX "croptop", 0, 0, INT_MAX, NULL,
CROPTOP_TEXT, CROPTOP_LONGTEXT, false )
diff --git a/modules/video_filter/osdmenu.c b/modules/video_filter/osdmenu.c
index e287f39..4b2c13f 100644
--- a/modules/video_filter/osdmenu.c
+++ b/modules/video_filter/osdmenu.c
@@ -113,6 +113,16 @@ static int MouseEvent( vlc_object_t *, char const *,
#define OSD_UPDATE_MAX 1000
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 "y", -1, NULL, POSY_TEXT, POSY_LONGTEXT, false )
add_integer( OSD_CFG "position", 8, NULL, POS_TEXT, POS_LONGTEXT,
@@ -130,15 +140,6 @@ vlc_module_begin ()
add_integer_with_range( OSD_CFG "alpha", 255, 0, 255, NULL,
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 ()
/*****************************************************************************
More information about the vlc-devel
mailing list