* luaplaylist.c: Change demux2 capability from 0 to 9

* ps.c: Change demux2 capability from 9 to 8
* ty.c: Change demux2 capability from 8 to 6
* playlist/{Modules.am,playlist.c,videoportals.c}: remove video portals C version

modules/demux/playlist/Modules.am

@@ -14,7 +14,6 @@ SOURCES_playlist = \
 	qtl.c \
 	gvp.c \
 	ifo.c \
-	videoportals.c \
 	$(NULL)
 
 SOURCES_luaplaylist = luaplaylist.c

modules/demux/playlist/luaplaylist.c

@@ -60,7 +60,7 @@ vlc_module_begin();
 
     set_shortname( _("Lua Playlist") );
     set_description( _("Lua Playlist Parser Interface") );
-    set_capability( "demux2", 0 );
+    set_capability( "demux2", 9 );
     set_callbacks( E_(Import_LuaPlaylist), E_(Close_LuaPlaylist) );
 vlc_module_end();
 

modules/demux/playlist/playlist.c

@@ -116,11 +116,13 @@ vlc_module_begin();
         set_description( _("Dummy ifo demux") );
         set_capability( "demux2", 12 );
         set_callbacks( E_(Import_IFO), E_(Close_IFO) );
+#if 0
     add_submodule();
         set_description( _("Video portal url converter") );
         add_shortcut( "videoportal" );
         set_capability( "demux2", 10 );
         set_callbacks( E_(Import_VideoPortal), E_(Close_VideoPortal) );
+#endif
 vlc_module_end();
 
 

modules/demux/ps.c

@@ -61,7 +61,7 @@ vlc_module_begin();
 
     add_submodule();
     set_description( _("MPEG-PS demuxer") );
-    set_capability( "demux2", 9 );
+    set_capability( "demux2", 8 );
     set_callbacks( Open, Close );
 vlc_module_end();
 

modules/demux/ty.c

@@ -70,7 +70,7 @@ vlc_module_begin();
     set_description(_("TY Stream audio/video demux"));
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
-    set_capability("demux2", 8);
+    set_capability("demux2", 6);
     /* FIXME: there seems to be a segfault when using PVR access
      * and TY demux has a bigger priority than PS
      * Something must be wrong.