[vlc-commits] shoutcast: drop priority to zero

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Jun  3 22:39:07 2017 +0300| [06d64083aea9f390e3cfa048e87c06a878c736a2] | committer: Rémi Denis-Courmont

shoutcast: drop priority to zero

This demuxer will only run when forced. So don´t bother provbing it if
it was not forced.

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

 modules/demux/playlist/playlist.c  | 4 ++--
 modules/demux/playlist/shoutcast.c | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/demux/playlist/playlist.c b/modules/demux/playlist/playlist.c
index 42cad5e1d3..b7029be2b7 100644
--- a/modules/demux/playlist/playlist.c
+++ b/modules/demux/playlist/playlist.c
@@ -97,8 +97,8 @@ vlc_module_begin ()
         set_callbacks( Import_xspf, Close_xspf )
     add_submodule ()
         set_description( N_("New winamp 5.2 shoutcast import") )
-        add_shortcut( "playlist", "shout-winamp" )
-        set_capability( "demux", 10 )
+        add_shortcut( "shout-winamp" )
+        set_capability( "demux", 0 )
         set_callbacks( Import_Shoutcast, NULL )
         add_bool( "shoutcast-show-adult", false,
                    SHOW_ADULT_TEXT, SHOW_ADULT_LONGTEXT, false )
diff --git a/modules/demux/playlist/shoutcast.c b/modules/demux/playlist/shoutcast.c
index 2796bc75b0..cef0c8685d 100644
--- a/modules/demux/playlist/shoutcast.c
+++ b/modules/demux/playlist/shoutcast.c
@@ -60,8 +60,6 @@ int Import_Shoutcast( vlc_object_t *p_this )
     demux_t *p_demux = (demux_t *)p_this;
 
     CHECK_FILE(p_demux);
-    if( !demux_IsForced( p_demux, "shout-winamp" ) )
-        return VLC_EGENERIC;
 
     p_demux->pf_demux = Demux;
     p_demux->pf_control = Control;