[vlc-commits] [Git][videolan/vlc][3.0.x] 5 commits: svg: fix option categorisation

[Jean-Baptiste Kempf]

Jean-Baptiste Kempf pushed to branch 3.0.x at VideoLAN / VLC


Commits:
d4d82f77 by Lyndon Brown at 2021-06-13T07:01:41+00:00
svg: fix option categorisation

fixes problem of option not being shown in GUI

(cherry picked from commit 73e00de604c85b82b0fd9d5e974572300ea4fb4b)

- - - - -
9e15d24c by Lyndon Brown at 2021-06-13T07:01:41+00:00
mosaic_bridge: fix options being hidden in GUI

not having a cat+subcat specified means that the options were ignored
when constructing the preferences tree in Qt (and possibly others).

(cherry picked from commit f9b5677ada19cff818737cbc4533f31376c4b90c)

- - - - -
b988f280 by Lyndon Brown at 2021-06-13T07:01:41+00:00
chromaprint: fix options being hidden in GUI

not having a cat+subcat specified means that the options were ignored
when constructing the preferences tree in Qt (and possibly others).

(cherry picked from commit 90e1fe40dad7317426ffe980e8a05c8590984ed7)

- - - - -
23a38bc0 by Lyndon Brown at 2021-06-13T07:01:41+00:00
meta/folder: fix options being hidden in GUI

not having a cat+subcat specified means that the options were ignored
when constructing the preferences tree in Qt (and possibly others).

(cherry picked from commit bc6700f7d1f5a483dc59f74fb42a1baacea716c1)

- - - - -
b3adcde0 by Lyndon Brown at 2021-06-13T07:01:41+00:00
dcp: fix options being hidden in GUI

options need to be specified after the cat+subcat declarations otherwise
they may be ignored when constructing the preferences tree in Qt (and
possibly others).

(cherry picked from commit 92654192d6c912a0448016d397d87be39aa95fdb)

- - - - -


5 changed files:

- modules/access/dcp/dcp.cpp
- modules/meta_engine/folder.c
- modules/stream_out/chromaprint.c
- modules/stream_out/mosaic_bridge.c
- modules/text_renderer/svg.c


Changes:

=====================================
modules/access/dcp/dcp.cpp
=====================================
@@ -76,11 +76,11 @@ static void Close( vlc_object_t * );
 vlc_module_begin()
     set_shortname( N_( "DCP" ) )
     add_shortcut( "dcp" )
-    add_loadfile( "kdm", "", KDM_HELP_TEXT, KDM_HELP_LONG_TEXT, false )
     set_description( N_( "Digital Cinema Package module" ) )
     set_capability( "access_demux", 0 )
     set_category( CAT_INPUT )
     set_subcategory( SUBCAT_INPUT_ACCESS )
+    add_loadfile( "kdm", "", KDM_HELP_TEXT, KDM_HELP_LONG_TEXT, false )
     set_callbacks( Open, Close )
 vlc_module_end()
 


=====================================
modules/meta_engine/folder.c
=====================================
@@ -69,6 +69,8 @@ static int FindMeta( vlc_object_t * );
 vlc_module_begin ()
     set_shortname( N_( "Folder" ) )
     set_description( N_("Folder meta data") )
+    set_category( CAT_PLAYLIST )
+    set_subcategory( SUBCAT_PLAYLIST_GENERAL )
     add_loadfile( "album-art-filename", NULL,
         N_("Album art filename"), N_("Filename to look for album art in current directory"), false );
     set_capability( "art finder", 90 )


=====================================
modules/stream_out/chromaprint.c
=====================================
@@ -61,6 +61,8 @@ vlc_module_begin ()
     set_description( N_("Chromaprint stream output") )
     set_capability( "sout stream", 0 )
     add_shortcut( "chromaprint" )
+    set_category( CAT_SOUT )
+    set_subcategory( SUBCAT_SOUT_STREAM )
     add_integer( "duration", 90, DURATION_TEXT, DURATION_LONGTEXT, true )
     set_callbacks( Open, Close )
 vlc_module_end ()


=====================================
modules/stream_out/mosaic_bridge.c
=====================================
@@ -141,6 +141,9 @@ vlc_module_begin ()
     set_capability( "sout stream", 0 )
     add_shortcut( "mosaic-bridge" )
 
+    set_category( CAT_SOUT )
+    set_subcategory( SUBCAT_SOUT_STREAM )
+
     add_string( CFG_PREFIX "id", "Id", ID_TEXT, ID_LONGTEXT,
                 false )
     add_integer( CFG_PREFIX "width", 0, WIDTH_TEXT,


=====================================
modules/text_renderer/svg.c
=====================================
@@ -73,7 +73,7 @@ struct filter_sys_t
 
 vlc_module_begin ()
     set_category( CAT_INPUT )
-    set_category( SUBCAT_INPUT_SCODEC )
+    set_subcategory( SUBCAT_INPUT_SCODEC )
     set_capability( "text renderer", 99 )
     add_shortcut( "svg" )
     add_string( "svg-template-file", "", TEMPLATE_TEXT, TEMPLATE_LONGTEXT, true )



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/8cdc61cb8fce58e57f9a934adc354b23f7ecd64f...b3adcde0dc6175382b3c268f4dc329bffd751c89

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/8cdc61cb8fce58e57f9a934adc354b23f7ecd64f...b3adcde0dc6175382b3c268f4dc329bffd751c89
You're receiving this email because of your account on code.videolan.org.