[vlc-commits] stream filter: increase priorities

Rémi Denis-Courmont git at videolan.org
Mon Feb 26 21:38:54 CET 2018


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Feb 26 22:11:34 2018 +0200| [737e99f9608dedad9646005f188fe96d250278c6] | committer: Rémi Denis-Courmont

stream filter: increase priorities

This increases the priority of every stream filter with non-zero
priority by 300. The point is to make those priorities higher than any
existing demux priority (to merge the two capabilities later on).

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=737e99f9608dedad9646005f188fe96d250278c6
---

 modules/demux/playlist/playlist.c    | 26 +++++++++++++-------------
 modules/lua/vlc.c                    |  2 +-
 modules/stream_filter/accesstweaks.c |  2 +-
 modules/stream_filter/adf.c          |  2 +-
 modules/stream_filter/decomp.c       |  2 +-
 modules/stream_filter/hds/hds.c      |  2 +-
 modules/stream_filter/inflate.c      |  2 +-
 modules/stream_filter/skiptags.c     |  2 +-
 8 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/modules/demux/playlist/playlist.c b/modules/demux/playlist/playlist.c
index 449d5fd5b7..78a38864d1 100644
--- a/modules/demux/playlist/playlist.c
+++ b/modules/demux/playlist/playlist.c
@@ -66,34 +66,34 @@ vlc_module_begin ()
     add_submodule ()
         set_description( N_("M3U playlist import") )
         add_shortcut( "m3u", "m3u8" )
-        set_capability( "stream_filter", 10 )
+        set_capability( "stream_filter", 310 )
         set_callbacks( Import_M3U, NULL )
     add_submodule ()
         set_description( N_("RAM playlist import") )
-        set_capability( "stream_filter", 10 )
+        set_capability( "stream_filter", 310 )
         set_callbacks( Import_RAM, NULL )
     add_submodule ()
         set_description( N_("PLS playlist import") )
-        set_capability( "stream_filter", 10 )
+        set_capability( "stream_filter", 310 )
         set_callbacks( Import_PLS, NULL )
     add_submodule ()
         set_description( N_("B4S playlist import") )
         add_shortcut( "shout-b4s" )
-        set_capability( "stream_filter", 10 )
+        set_capability( "stream_filter", 310 )
         set_callbacks( Import_B4S, NULL )
     add_submodule ()
         set_description( N_("DVB playlist import") )
         add_shortcut( "dvb" )
-        set_capability( "stream_filter", 10 )
+        set_capability( "stream_filter", 310 )
         set_callbacks( Import_DVB, NULL )
     add_submodule ()
         set_description( N_("Podcast parser") )
         add_shortcut( "podcast" )
-        set_capability( "stream_filter", 10 )
+        set_capability( "stream_filter", 310 )
         set_callbacks( Import_podcast, NULL )
     add_submodule ()
         set_description( N_("XSPF playlist import") )
-        set_capability( "stream_filter", 10 )
+        set_capability( "stream_filter", 310 )
         set_callbacks( Import_xspf, Close_xspf )
     add_submodule ()
         set_description( N_("New winamp 5.2 shoutcast import") )
@@ -104,31 +104,31 @@ vlc_module_begin ()
                    SHOW_ADULT_TEXT, SHOW_ADULT_LONGTEXT, false )
     add_submodule ()
         set_description( N_("ASX playlist import") )
-        set_capability( "stream_filter", 10 )
+        set_capability( "stream_filter", 310 )
         set_callbacks( Import_ASX, NULL )
     add_submodule ()
         set_description( N_("Kasenna MediaBase parser") )
         add_shortcut( "sgimb" )
-        set_capability( "stream_filter", 10 )
+        set_capability( "stream_filter", 310 )
         set_callbacks( Import_SGIMB, Close_SGIMB )
     add_submodule ()
         set_description( N_("QuickTime Media Link importer") )
         add_shortcut( "qtl" )
-        set_capability( "stream_filter", 10 )
+        set_capability( "stream_filter", 310 )
         set_callbacks( Import_QTL, NULL )
     add_submodule ()
         set_description( N_("Dummy IFO demux") )
-        set_capability( "stream_filter", 12 )
+        set_capability( "stream_filter", 312 )
         set_callbacks( Import_IFO, NULL )
     add_submodule ()
         set_description( N_("iTunes Music Library importer") )
         add_shortcut( "itml" )
-        set_capability( "stream_filter", 10 )
+        set_capability( "stream_filter", 310 )
         set_callbacks( Import_iTML, NULL )
     add_submodule ()
         set_description( N_("WPL playlist import") )
         add_shortcut( "wpl" )
-        set_capability( "stream_filter", 10 )
+        set_capability( "stream_filter", 310 )
         set_callbacks( Import_WPL, Close_WPL )
 vlc_module_end ()
 
diff --git a/modules/lua/vlc.c b/modules/lua/vlc.c
index 103d8eb621..79efaf5400 100644
--- a/modules/lua/vlc.c
+++ b/modules/lua/vlc.c
@@ -147,7 +147,7 @@ vlc_module_begin ()
         add_shortcut( "luaplaylist" )
         set_shortname( N_("Lua Playlist") )
         set_description( N_("Lua Playlist Parser Interface") )
-        set_capability( "stream_filter", 2 )
+        set_capability( "stream_filter", 302 )
         set_callbacks( Import_LuaPlaylist, Close_LuaPlaylist )
 
     add_submodule ()
diff --git a/modules/stream_filter/accesstweaks.c b/modules/stream_filter/accesstweaks.c
index a64c8708c8..5def0742b5 100644
--- a/modules/stream_filter/accesstweaks.c
+++ b/modules/stream_filter/accesstweaks.c
@@ -36,7 +36,7 @@ vlc_module_begin ()
     set_shortname("accesstweaks")
     set_category (CAT_INPUT)
     set_subcategory (SUBCAT_INPUT_STREAM_FILTER)
-    set_capability ("stream_filter", 1)
+    set_capability ("stream_filter", 301)
     /* Developers only module, no translation please */
     set_description ("Access controls tweaking")
     set_callbacks(Open, NULL)
diff --git a/modules/stream_filter/adf.c b/modules/stream_filter/adf.c
index b02faf1a96..73172ea0dc 100644
--- a/modules/stream_filter/adf.c
+++ b/modules/stream_filter/adf.c
@@ -38,7 +38,7 @@ vlc_module_begin()
     set_shortname( "adf" )
     set_category( CAT_INPUT )
     set_subcategory( SUBCAT_INPUT_STREAM_FILTER )
-    set_capability( "stream_filter", 30 )
+    set_capability( "stream_filter", 330 )
     set_description( N_( "ADF stream filter" ) )
     set_callbacks( Open, NULL )
 vlc_module_end()
diff --git a/modules/stream_filter/decomp.c b/modules/stream_filter/decomp.c
index 514a0aca36..b23636dfee 100644
--- a/modules/stream_filter/decomp.c
+++ b/modules/stream_filter/decomp.c
@@ -57,7 +57,7 @@ static void Close (vlc_object_t *);
 vlc_module_begin ()
     set_category (CAT_INPUT)
     set_subcategory (SUBCAT_INPUT_STREAM_FILTER)
-    set_capability ("stream_filter", 20)
+    set_capability ("stream_filter", 320)
 
     set_description (N_("LZMA decompression"))
     set_callbacks (OpenXZ, Close)
diff --git a/modules/stream_filter/hds/hds.c b/modules/stream_filter/hds/hds.c
index 5dbd15a193..9cf1b0a3c4 100644
--- a/modules/stream_filter/hds/hds.c
+++ b/modules/stream_filter/hds/hds.c
@@ -207,7 +207,7 @@ vlc_module_begin()
     set_subcategory( SUBCAT_INPUT_STREAM_FILTER )
     set_description( N_("HTTP Dynamic Streaming") )
     set_shortname( "Dynamic Streaming")
-    set_capability( "stream_filter", 30 )
+    set_capability( "stream_filter", 330 )
     set_callbacks( Open, Close )
 vlc_module_end()
 
diff --git a/modules/stream_filter/inflate.c b/modules/stream_filter/inflate.c
index 0388851ee6..36fa8e09c2 100644
--- a/modules/stream_filter/inflate.c
+++ b/modules/stream_filter/inflate.c
@@ -196,7 +196,7 @@ static void Close (vlc_object_t *obj)
 vlc_module_begin()
     set_category(CAT_INPUT)
     set_subcategory(SUBCAT_INPUT_STREAM_FILTER)
-    set_capability("stream_filter", 30)
+    set_capability("stream_filter", 330)
 
     set_description(N_("Zlib decompression filter"))
     set_callbacks(Open, Close)
diff --git a/modules/stream_filter/skiptags.c b/modules/stream_filter/skiptags.c
index d59a341d9d..2cf749a36c 100644
--- a/modules/stream_filter/skiptags.c
+++ b/modules/stream_filter/skiptags.c
@@ -238,7 +238,7 @@ static void Close(vlc_object_t *obj)
 vlc_module_begin()
     set_category(CAT_INPUT)
     set_subcategory(SUBCAT_INPUT_STREAM_FILTER)
-    set_capability("stream_filter", 30)
+    set_capability("stream_filter", 330)
 
     set_description(N_("APE/ID3 tags-skipping filter"))
     set_callbacks(Open, Close)



More information about the vlc-commits mailing list