playlist/shoutcast: Remove shoutcast playlist handling
authorMarvin Scholz <epirat07@gmail.com>
Thu, 12 Apr 2018 00:37:58 +0000 (02:37 +0200)
committerMarvin Scholz <epirat07@gmail.com>
Wed, 18 Apr 2018 17:50:01 +0000 (19:50 +0200)
Removes the long unused Winamp/SHOUTcast directory stream filter for
playlist handling, which was mostly useful together with the service
discovery (modules/services_discovery/shout.c) which is not present
anymore.

modules/demux/Makefile.am
modules/demux/playlist/playlist.c
modules/demux/playlist/shoutcast.c [deleted file]
po/POTFILES.in

index 78c7a84..4df3dfc 100644 (file)
@@ -231,7 +231,6 @@ libplaylist_plugin_la_SOURCES = \
        demux/playlist/qtl.c \
        demux/playlist/ram.c \
        demux/playlist/sgimb.c \
-       demux/playlist/shoutcast.c \
        demux/playlist/wpl.c \
        demux/playlist/xspf.c \
        demux/playlist/playlist.c demux/playlist/playlist.h
index 78a3886..f15d27c 100644 (file)
@@ -96,13 +96,6 @@ vlc_module_begin ()
         set_capability( "stream_filter", 310 )
         set_callbacks( Import_xspf, Close_xspf )
     add_submodule ()
-        set_description( N_("New winamp 5.2 shoutcast import") )
-        add_shortcut( "shout-winamp" )
-        set_capability( "stream_filter", 0 )
-        set_callbacks( Import_Shoutcast, NULL )
-        add_bool( "shoutcast-show-adult", false,
-                   SHOW_ADULT_TEXT, SHOW_ADULT_LONGTEXT, false )
-    add_submodule ()
         set_description( N_("ASX playlist import") )
         set_capability( "stream_filter", 310 )
         set_callbacks( Import_ASX, NULL )
diff --git a/modules/demux/playlist/shoutcast.c b/modules/demux/playlist/shoutcast.c
deleted file mode 100644 (file)
index d2b33e3..0000000
+++ /dev/null
@@ -1,365 +0,0 @@
-/*****************************************************************************
- * shoutcast.c: Winamp >=5.2 shoutcast demuxer
- *****************************************************************************
- * Copyright (C) 2006 VLC authors and VideoLAN
- * $Id$
- *
- * Authors: Antoine Cellerier <dionoea -@t- videolan -Dot- org>
- *          based on b4s.c by Sigmund Augdal Helberg <dnumgis@videolan.org>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-/*****************************************************************************
- * Preamble
- *****************************************************************************/
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <vlc_common.h>
-#include <vlc_access.h>
-
-#include "playlist.h"
-#include <vlc_xml.h>
-#include <vlc_strings.h>
-
-/* duplicate from modules/services_discovery/shout.c */
-#define SHOUTCAST_BASE_URL "http://www.shoutcast.com/sbin/newxml.phtml"
-#define SHOUTCAST_TUNEIN_BASE_URL "http://www.shoutcast.com"
-#define SHOUTCAST_TV_TUNEIN_URL "http://www.shoutcast.com/sbin/tunein-tvstation.pls?id="
-
-/*****************************************************************************
- * Local prototypes
- *****************************************************************************/
-static int Demux( stream_t *, input_item_node_t * );
-
-static int DemuxGenre( stream_t *p_demux, xml_reader_t *p_xml_reader,
-                       input_item_node_t *p_input_node );
-static int DemuxStation( stream_t *p_demux, xml_reader_t *p_xml_reader,
-                         input_item_node_t *p_input_node, bool b_adult );
-
-/*****************************************************************************
- * Import_Shoutcast: main import function
- *****************************************************************************/
-int Import_Shoutcast( vlc_object_t *p_this )
-{
-    stream_t *p_demux = (stream_t *)p_this;
-
-    CHECK_FILE(p_demux);
-
-    p_demux->pf_readdir = Demux;
-    p_demux->pf_control = access_vaDirectoryControlHelper;
-    msg_Dbg( p_demux, "using shoutcast playlist reader" );
-
-    return VLC_SUCCESS;
-}
-
-static int Demux( stream_t *p_demux, input_item_node_t *p_input_node )
-{
-    xml_reader_t *p_xml_reader = NULL;
-    const char *node;
-    int i_ret = VLC_EGENERIC;
-
-    p_xml_reader = xml_ReaderCreate( p_demux, p_demux->s );
-    if( !p_xml_reader )
-        goto error;
-
-    /* check root node */
-    if( xml_ReaderNextNode( p_xml_reader, &node ) != XML_READER_STARTELEM )
-    {
-        msg_Err( p_demux, "invalid file (no root node)" );
-        goto error;
-    }
-
-    if( strcmp( node, "genrelist" ) && strcmp( node, "stationlist" ) )
-    {
-        msg_Err( p_demux, "invalid root node <%s>", node );
-        goto error;
-    }
-
-    if( !strcmp( node, "genrelist" ) )
-    {
-        /* we're reading a genre list */
-        if( DemuxGenre( p_demux, p_xml_reader, p_input_node ) )
-            goto error;
-    }
-    else
-    {
-        /* we're reading a station list */
-        if( DemuxStation( p_demux, p_xml_reader, p_input_node,
-                var_InheritBool( p_demux, "shoutcast-show-adult" ) ) )
-            goto error;
-    }
-
-    i_ret = VLC_SUCCESS;
-
-error:
-    if( p_xml_reader )
-        xml_ReaderDelete( p_xml_reader );
-    if( p_input_node ) input_item_node_Delete( p_input_node );
-    return i_ret;
-}
-
-/* <genrelist>
- *   <genre name="the name"></genre>
- *   ...
- * </genrelist>
- **/
-static int DemuxGenre( stream_t *p_demux, xml_reader_t *p_xml_reader,
-                       input_item_node_t *p_input_node )
-{
-    const char *node;
-    char *psz_name = NULL; /* genre name */
-    int type;
-
-    while( (type = xml_ReaderNextNode( p_xml_reader, &node )) > 0 )
-    {
-        switch( type )
-        {
-            case XML_READER_STARTELEM:
-            {
-                if( !strcmp( node, "genre" ) )
-                {
-                    // Read the attributes
-                    const char *name, *value;
-                    while( (name = xml_ReaderNextAttr( p_xml_reader, &value )) )
-                    {
-                        if( !strcmp( name, "name" ) )
-                        {
-                            free(psz_name);
-                            psz_name = strdup( value );
-                        }
-                        else
-                            msg_Warn( p_demux,
-                                      "unexpected attribute %s in <%s>",
-                                      name, node );
-                    }
-                }
-                break;
-            }
-
-            case XML_READER_ENDELEM:
-                if( !strcmp( node, "genre" ) && psz_name != NULL )
-                {
-                    char* psz_mrl;
-
-                    if( asprintf( &psz_mrl, SHOUTCAST_BASE_URL "?genre=%s",
-                                  psz_name ) != -1 )
-                    {
-                        input_item_t *p_input;
-                        vlc_xml_decode( psz_mrl );
-                        p_input = input_item_New( psz_mrl, psz_name );
-                        input_item_CopyOptions( p_input, p_input_node->p_item );
-                        input_item_AddOption( p_input, "stream-filter=shout-winamp", VLC_INPUT_OPTION_TRUSTED );
-                        free( psz_mrl );
-                        input_item_node_AppendItem( p_input_node, p_input );
-                        input_item_Release( p_input );
-                    }
-                    FREENULL( psz_name );
-                }
-                break;
-        }
-    }
-
-    free( psz_name );
-    return 0;
-}
-
-/* radio stations:
- * <stationlist>
- *   <tunein base="/sbin/tunein-station.pls"></tunein>
- *   <station name="the name"
- *            mt="mime type"
- *            id="the id"
- *            br="bit rate"
- *            genre="A big genre string"
- *            ct="current track name/author/..."
- *            lc="listener count"></station>
- * </stationlist>
- *
- * TV stations:
- * <stationlist>
- *   <tunein base="/sbin/tunein-station.pls"></tunein>
- *   <station name="the name"
- *            id="the id"
- *            br="bit rate"
- *            rt="rating"
- *            load="server load ?"
- *            ct="current track name/author/..."
- *            genre="A big genre string"
- *            lc="listener count"></station>
- * </stationlist>
- **/
-static int DemuxStation( stream_t *p_demux, xml_reader_t *p_xml_reader,
-                         input_item_node_t *p_input_node, bool b_adult )
-{
-    char *psz_base = NULL; /* */
-
-    char *psz_name = NULL; /* genre name */
-    char *psz_mt = NULL; /* mime type */
-    char *psz_id = NULL; /* id */
-    char *psz_br = NULL; /* bit rate */
-    char *psz_genre = NULL; /* genre */
-    char *psz_ct = NULL; /* current track */
-    char *psz_lc = NULL; /* listener count */
-
-    /* If these are set then it's *not* a radio but a TV */
-    char *psz_rt = NULL; /* rating for shoutcast TV */
-    char *psz_load = NULL; /* load for shoutcast TV */
-
-    const char *node; /* tag name */
-    int i_type;
-
-    while( (i_type = xml_ReaderNextNode( p_xml_reader, &node )) > 0 )
-    {
-        switch( i_type )
-        {
-            case XML_READER_STARTELEM:
-                // Read the attributes
-                if( !strcmp( node, "tunein" ) )
-                {
-                    const char *name, *value;
-                    while( (name = xml_ReaderNextAttr( p_xml_reader, &value )) )
-                    {
-                        if( !strcmp( name, "base" ) )
-                        {
-                            free( psz_base );
-                            psz_base = strdup( value );
-                        }
-                        else
-                            msg_Warn( p_demux,
-                                      "unexpected attribute %s in <%s>",
-                                      name, node );
-                    }
-                }
-                else if( !strcmp( node, "station" ) )
-                {
-                    const char *name, *value;
-                    while( (name = xml_ReaderNextAttr( p_xml_reader, &value )) )
-                    {
-                        char **p = NULL;
-                        if( !strcmp( name, "name" ) )
-                            p = &psz_name;
-                        else if ( !strcmp( name, "mt" ) )
-                            p = &psz_mt;
-                        else if ( !strcmp( name, "id" ) )
-                            p = &psz_id;
-                        else if ( !strcmp( name, "br" ) )
-                            p = &psz_br;
-                        else if ( !strcmp( name, "genre" ) )
-                            p = &psz_genre;
-                        else if ( !strcmp( name, "ct" ) )
-                            p = &psz_ct;
-                        else if ( !strcmp( name, "lc" ) )
-                            p = &psz_lc;
-                        else if ( !strcmp( name, "rt" ) )
-                            p = &psz_rt;
-                        else if ( !strcmp( name, "load" ) )
-                            p = &psz_load;
-                        if( p != NULL )
-                        {
-                            free( *p );
-                            *p = strdup( value );
-                        }
-                        else
-                            msg_Warn( p_demux,
-                                      "unexpected attribute %s in <%s>",
-                                      name, node );
-                    }
-                }
-                break;
-
-            // End element
-            case XML_READER_ENDELEM:
-                if( !strcmp( node, "station" ) &&
-                    ( psz_base || ( psz_rt && psz_load &&
-                    ( b_adult || strcmp( psz_rt, "NC17" ) ) ) ) )
-                {
-                    char *psz_mrl = NULL;
-                    if( psz_rt || psz_load )
-                    {
-                        /* tv */
-                        if( asprintf( &psz_mrl, SHOUTCAST_TV_TUNEIN_URL "%s",
-                                 psz_id ) == -1)
-                            psz_mrl = NULL;
-                    }
-                    else
-                    {
-                        /* radio */
-                        if( asprintf( &psz_mrl, SHOUTCAST_TUNEIN_BASE_URL "%s?id=%s",
-                             psz_base, psz_id ) == -1 )
-                            psz_mrl = NULL;
-                    }
-
-                    /* Create the item */
-                    input_item_t *p_input = NULL;
-
-                    if( likely(psz_mrl != NULL) )
-                    {
-                        vlc_xml_decode( psz_mrl );
-                        p_input = input_item_New( psz_mrl, psz_name );
-                        free( psz_mrl );
-                    }
-
-                    if( likely(p_input != NULL) )
-                    {
-                        input_item_CopyOptions( p_input, p_input_node->p_item );
-
-#define SADD_INFO( type, field ) \
-                    if( field ) \
-                        input_item_AddInfo( p_input, _("Shoutcast"), \
-                                            vlc_gettext(type), "%s", field )
-                        SADD_INFO( N_("Mime"), psz_mt );
-                        SADD_INFO( N_("Bitrate"), psz_br );
-                        SADD_INFO( N_("Listeners"), psz_lc );
-                        SADD_INFO( N_("Load"), psz_load );
-                        if( psz_genre )
-                            input_item_SetGenre( p_input, psz_genre );
-                        if( psz_ct )
-                            input_item_SetNowPlaying( p_input, psz_ct );
-                        if( psz_rt )
-                            input_item_SetRating( p_input, psz_rt );
-                        input_item_node_AppendItem( p_input_node, p_input );
-                        input_item_Release( p_input );
-                    }
-                    FREENULL( psz_base );
-                    FREENULL( psz_name );
-                    FREENULL( psz_mt );
-                    FREENULL( psz_id );
-                    FREENULL( psz_br );
-                    FREENULL( psz_genre );
-                    FREENULL( psz_ct );
-                    FREENULL( psz_lc );
-                    FREENULL( psz_rt );
-                    FREENULL( psz_load );
-                }
-                break;
-        }
-    }
-    /* Free all strings anyway, in case of missing end element */
-    FREENULL( psz_base );
-    FREENULL( psz_name );
-    FREENULL( psz_mt );
-    FREENULL( psz_id );
-    FREENULL( psz_br );
-    FREENULL( psz_genre );
-    FREENULL( psz_ct );
-    FREENULL( psz_lc );
-    FREENULL( psz_rt );
-    FREENULL( psz_load );
-    return 0;
-}
index 5c0f753..fb48d68 100644 (file)
@@ -430,7 +430,6 @@ modules/demux/playlist/podcast.c
 modules/demux/playlist/qtl.c
 modules/demux/playlist/ram.c
 modules/demux/playlist/sgimb.c
-modules/demux/playlist/shoutcast.c
 modules/demux/playlist/wpl.c
 modules/demux/playlist/xspf.c
 modules/demux/pva.c