[vlc-commits] plugin: add separate category for video splitters (fixes #9967)
Rémi Denis-Courmont
git at videolan.org
Sun Oct 25 21:29:40 CET 2015
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Oct 25 22:20:57 2015 +0200| [695a6ba58bc5a44c287e1a51a2b17a0627951f49] | committer: Rémi Denis-Courmont
plugin: add separate category for video splitters (fixes #9967)
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=695a6ba58bc5a44c287e1a51a2b17a0627951f49
---
include/vlc_config_cat.h | 5 +++++
include/vlc_plugin.h | 1 +
modules/video_splitter/clone.c | 2 +-
modules/video_splitter/panoramix.c | 2 +-
modules/video_splitter/wall.c | 2 +-
src/libvlc-module.c | 2 ++
6 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/include/vlc_config_cat.h b/include/vlc_config_cat.h
index 00d7352..e50304f 100644
--- a/include/vlc_config_cat.h
+++ b/include/vlc_config_cat.h
@@ -82,6 +82,10 @@
#define SUBPIC_TITLE N_( "Subtitles / OSD")
#define SUBPIC_HELP N_( "Settings related to On-Screen-Display,"\
" subtitles and \"overlay subpictures\"")
+
+#define SPLITTER_TITLE N_("Splitters")
+#define SPLITTER_HELP N_("Video splitters separate the stream into multiple videos.")
+
/*
#define TEXT_HELP N_( \
"Use the settings of the \"freetype\" module to choose the font you " \
@@ -202,6 +206,7 @@ static const struct config_category_t categories_array[] =
{ SUBCAT_VIDEO_VOUT, _VOUT_TITLE, VOUT_HELP },
{ SUBCAT_VIDEO_VFILTER, VFILTER_TITLE, VFILTER_HELP },
{ SUBCAT_VIDEO_SUBPIC, SUBPIC_TITLE, SUBPIC_HELP },
+ { SUBCAT_VIDEO_SPLITTER, SPLITTER_TITLE, SPLITTER_HELP },
{ CAT_INPUT, INPUT_TITLE, INPUT_HELP },
{ SUBCAT_INPUT_GENERAL, INPUT_TITLE, INPUT_HELP },
diff --git a/include/vlc_plugin.h b/include/vlc_plugin.h
index b07b51a..46abe4e 100644
--- a/include/vlc_plugin.h
+++ b/include/vlc_plugin.h
@@ -154,6 +154,7 @@ enum vlc_module_properties
#define SUBCAT_VIDEO_VOUT 302
#define SUBCAT_VIDEO_VFILTER 303
#define SUBCAT_VIDEO_SUBPIC 305
+#define SUBCAT_VIDEO_SPLITTER 306
#define CAT_INPUT 4
#define SUBCAT_INPUT_GENERAL 401
diff --git a/modules/video_splitter/clone.c b/modules/video_splitter/clone.c
index 284ff8a..58a45b3 100644
--- a/modules/video_splitter/clone.c
+++ b/modules/video_splitter/clone.c
@@ -57,7 +57,7 @@ vlc_module_begin ()
set_shortname( N_("Clone" ))
set_help(CLONE_HELP)
set_category( CAT_VIDEO )
- set_subcategory( SUBCAT_VIDEO_VFILTER )
+ set_subcategory( SUBCAT_VIDEO_SPLITTER )
add_integer( CFG_PREFIX "count", 2, COUNT_TEXT, COUNT_LONGTEXT, false )
add_module_list( CFG_PREFIX "vout-list", "vout display", NULL,
diff --git a/modules/video_splitter/panoramix.c b/modules/video_splitter/panoramix.c
index 9de7efa..26ff009 100644
--- a/modules/video_splitter/panoramix.c
+++ b/modules/video_splitter/panoramix.c
@@ -83,7 +83,7 @@ vlc_module_begin()
set_help(PANORAMIX_HELP)
set_capability( "video splitter", 0 )
set_category( CAT_VIDEO )
- set_subcategory( SUBCAT_VIDEO_VFILTER )
+ set_subcategory( SUBCAT_VIDEO_SPLITTER )
add_integer( CFG_PREFIX "cols", -1, COLS_TEXT, COLS_LONGTEXT, true )
change_integer_range( -1, COL_MAX )
diff --git a/modules/video_splitter/wall.c b/modules/video_splitter/wall.c
index 3810c17..3e95f91 100644
--- a/modules/video_splitter/wall.c
+++ b/modules/video_splitter/wall.c
@@ -69,7 +69,7 @@ vlc_module_begin()
set_shortname( N_("Image wall" ))
set_capability( "video splitter", 0 )
set_category( CAT_VIDEO )
- set_subcategory( SUBCAT_VIDEO_VFILTER )
+ set_subcategory( SUBCAT_VIDEO_SPLITTER )
add_integer( CFG_PREFIX "cols", 3, COLS_TEXT, COLS_LONGTEXT, false )
change_integer_range( 1, COL_MAX )
diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index a13093d..3556c98 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -1597,6 +1597,8 @@ vlc_module_begin ()
set_subcategory( SUBCAT_VIDEO_VFILTER )
add_module_list_cat( "video-filter", SUBCAT_VIDEO_VFILTER, NULL,
VIDEO_FILTER_TEXT, VIDEO_FILTER_LONGTEXT, false )
+
+ set_subcategory( SUBCAT_VIDEO_SPLITTER )
add_module_list( "video-splitter", "video splitter", NULL,
VIDEO_SPLITTER_TEXT, VIDEO_SPLITTER_LONGTEXT, false )
add_obsolete_string( "vout-filter" ) /* since 2.0.0 */
More information about the vlc-commits
mailing list