[vlc-commits] demux/playlist: convert back to demux

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Sep 27 12:27:34 2020 +0300| [2c24cfee169d960e77014e7b92d8ae41a3218c33] | committer: Rémi Denis-Courmont

demux/playlist: convert back to demux

This allows non-playlist demuxers to be probed before these (notably
adaptive).

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

 modules/demux/playlist/playlist.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/modules/demux/playlist/playlist.c b/modules/demux/playlist/playlist.c
index 5ae914ba8b..bcffb03b7a 100644
--- a/modules/demux/playlist/playlist.c
+++ b/modules/demux/playlist/playlist.c
@@ -66,71 +66,71 @@ vlc_module_begin ()
     add_submodule ()
         set_description( N_("M3U playlist import") )
         add_shortcut( "m3u", "m3u8" )
-        set_capability( "stream_filter", 310 )
+        set_capability( "demux", 10 )
         set_callback( Import_M3U )
         add_file_extension("m3u")
     add_submodule ()
         set_description( N_("RAM playlist import") )
-        set_capability( "stream_filter", 310 )
+        set_capability( "demux", 10 )
         set_callback( Import_RAM )
     add_submodule ()
         set_description( N_("PLS playlist import") )
-        set_capability( "stream_filter", 310 )
+        set_capability( "demux", 10 )
         set_callback( Import_PLS )
     add_submodule ()
         set_description( N_("B4S playlist import") )
         add_shortcut( "shout-b4s" )
-        set_capability( "stream_filter", 310 )
+        set_capability( "demux", 10 )
         set_callback( Import_B4S )
     add_submodule ()
         set_description( N_("DVB playlist import") )
         add_shortcut( "dvb" )
-        set_capability( "stream_filter", 310 )
+        set_capability( "demux", 10 )
         set_callback( Import_DVB )
     add_submodule ()
         set_description( N_("Podcast parser") )
         add_shortcut( "podcast" )
-        set_capability( "stream_filter", 310 )
+        set_capability( "demux", 10 )
         set_callback( Import_podcast )
     add_submodule ()
         set_description( N_("XSPF playlist import") )
-        set_capability( "stream_filter", 310 )
+        set_capability( "demux", 10 )
         set_callbacks( Import_xspf, Close_xspf )
     add_submodule ()
         set_description( N_("ASX playlist import") )
-        set_capability( "stream_filter", 310 )
+        set_capability( "demux", 10 )
         set_callback( Import_ASX )
     add_submodule ()
         set_description( N_("Kasenna MediaBase parser") )
         add_shortcut( "sgimb" )
-        set_capability( "stream_filter", 310 )
+        set_capability( "demux", 10 )
         set_callbacks( Import_SGIMB, Close_SGIMB )
     add_submodule ()
         set_description( N_("QuickTime Media Link importer") )
         add_shortcut( "qtl" )
-        set_capability( "stream_filter", 310 )
+        set_capability( "demux", 10 )
         set_callback( Import_QTL )
     add_submodule ()
         set_description( N_("Dummy IFO demux") )
-        set_capability( "stream_filter", 312 )
+        set_capability( "demux", 12 )
         set_callback( Import_IFO )
     add_submodule ()
         set_description( N_("Dummy BDMV demux") )
-        set_capability( "stream_filter", 312 )
+        set_capability( "demux", 12 )
         set_callback( Import_BDMV )
     add_submodule ()
         set_description( N_("iTunes Music Library importer") )
         add_shortcut( "itml" )
-        set_capability( "stream_filter", 310 )
+        set_capability( "demux", 10 )
         set_callback( Import_iTML )
     add_submodule()
         set_description(N_("Windows Media Server metafile import") )
-        set_capability("stream_filter", 310)
+        set_capability("demux", 10)
         set_callback(Import_WMS)
     add_submodule ()
         set_description( N_("WPL playlist import") )
         add_shortcut( "wpl" )
-        set_capability( "stream_filter", 310 )
+        set_capability( "demux", 10 )
         set_callbacks( Import_WPL, Close_WPL )
 vlc_module_end ()