Forgiven in the previous commit (useless test)

[vlc] / modules / demux / playlist / shoutcast.c

diff --git a/modules/demux/playlist/shoutcast.c b/modules/demux/playlist/shoutcast.c
index 5487f1d3affcce53d547970a2bed3b0cfb33be00..00a3abf2adde0fc2e39482ea9b77d509f492705c 100644 (file)
--- a/modules/demux/playlist/shoutcast.c
+++ b/modules/demux/playlist/shoutcast.c
@@ -25,20 +25,21 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <ctype.h>                                              /* isspace() */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include <vlc/vlc.h>
 #include <vlc_demux.h>
 
-#include <errno.h>                                                 /* ENOMEM */
 #include "playlist.h"
 #include "vlc_xml.h"
 
 struct demux_sys_t
 {
     playlist_t *p_playlist;
-    playlist_item_t *p_current;
-    playlist_item_t *p_item_in_category;
+    input_item_t *p_current_input;
 
     xml_t *p_xml;
     xml_reader_t *p_xml_reader;
@@ -67,7 +68,7 @@ int E_(Import_Shoutcast)( vlc_object_t *p_this )
 {
     demux_t *p_demux = (demux_t *)p_this;
 
-    if( !isDemux( p_demux, "shout-winamp" ) )
+    if( !demux2_IsForced( p_demux, "shout-winamp" ) )
         return VLC_EGENERIC;
 
     STANDARD_DEMUX_INIT_MSG( "using shoutcast playlist reader" );
@@ -108,8 +109,7 @@ static int Demux( demux_t *p_demux )
     char *psz_eltname = NULL;
     INIT_PLAYLIST_STUFF;
     p_sys->p_playlist = p_playlist;
-    p_sys->p_current = p_current;
-    p_sys->p_item_in_category = p_item_in_category;
+    p_sys->p_current_input = p_current_input;
 
     p_xml = p_sys->p_xml = xml_Create( p_demux );
     if( !p_xml ) return -1;
@@ -132,7 +132,7 @@ static int Demux( demux_t *p_demux )
     {
         msg_Err( p_demux, "invalid root node %i, %s",
                  xml_ReaderNodeType( p_xml_reader ), psz_eltname );
-        if( psz_eltname ) free( psz_eltname );
+        free( psz_eltname );
         return -1;
     }
 
@@ -151,7 +151,7 @@ static int Demux( demux_t *p_demux )
 
     HANDLE_PLAY_AND_RELEASE;
     p_sys->p_playlist = NULL;
-    return -1; /* Needed for correct operation of go back */
+    return 0; /* Needed for correct operation of go back */
 }
 
 #define GET_VALUE( a ) \
@@ -236,13 +236,11 @@ static int DemuxGenre( demux_t *p_demux )
                              psz_name );
                     p_input = input_ItemNewExt( p_sys->p_playlist, psz_mrl,
                                                 psz_name, 0, NULL, -1 );
-                    input_ItemCopyOptions( p_sys->p_current->p_input,
+                    input_ItemCopyOptions( p_sys->p_current_input,
                                                 p_input );
                     free( psz_mrl );
-                    playlist_BothAddInput( p_sys->p_playlist, p_input,
-                                           p_sys->p_item_in_category,
-                                           PLAYLIST_APPEND | PLAYLIST_SPREPARSE,
-                                           PLAYLIST_END, NULL, NULL );
+                    input_ItemAddSubItem( p_sys->p_current_input, p_input );
+                    vlc_gc_decref( p_input );
                     FREENULL( psz_name );
                 }
                 FREENULL( psz_eltname );
@@ -414,7 +412,7 @@ static int DemuxStation( demux_t *p_demux )
                                                 psz_name , 0, NULL, -1 );
                     free( psz_mrl );
 
-                    input_ItemCopyOptions( p_sys->p_current->p_input,
+                    input_ItemCopyOptions( p_sys->p_current_input,
                                                 p_input );
 
 #define SADD_INFO( type, field ) if( field ) { input_ItemAddInfo( \
@@ -423,27 +421,22 @@ static int DemuxStation( demux_t *p_demux )
                     SADD_INFO( "Bitrate", psz_br );
                     SADD_INFO( "Listeners", psz_lc );
                     SADD_INFO( "Load", psz_load );
-                    p_input->p_meta = vlc_meta_New();
                     if( psz_genre )
-                        vlc_meta_SetGenre( p_input->p_meta, psz_genre );
+                        input_item_SetGenre( p_input, psz_genre );
                     if( psz_ct )
-                        vlc_meta_SetNowPlaying( p_input->p_meta, psz_ct );
+                        input_item_SetNowPlaying( p_input, psz_ct );
                     if( psz_rt )
-                        vlc_meta_SetRating( p_input->p_meta, psz_rt );
-
-                    playlist_BothAddInput( p_sys->p_playlist, p_input,
-                                           p_sys->p_item_in_category,
-                                           PLAYLIST_APPEND | PLAYLIST_SPREPARSE,
-                                           PLAYLIST_END, NULL, NULL );
-
+                        input_item_SetRating( p_input, psz_rt );
+                    input_ItemAddSubItem( p_sys->p_current_input, p_input );
+                    vlc_gc_decref( p_input );
                     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_mt );
+                    FREENULL( psz_id );
+                    FREENULL( psz_br );
+                    FREENULL( psz_genre );
+                    FREENULL( psz_ct );
+                    FREENULL( psz_lc );
+                    FREENULL( psz_rt );
                 }
                 free( psz_eltname );
                 break;
@@ -454,5 +447,6 @@ static int DemuxStation( demux_t *p_demux )
 
 static int Control( demux_t *p_demux, int i_query, va_list args )
 {
+    VLC_UNUSED(p_demux); VLC_UNUSED(i_query); VLC_UNUSED(args);
     return VLC_EGENERIC;
 }