Changeset 555437f5819af1d783c9d05156da643672032184

Timestamp:

14/06/08 17:09:08 (4 months ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1213456148 +0200

git-parent:

[33c10298dba22b426c26aadf4e643a7f2765ca6d]

git-author:

Pierre d'Herbemont <pdherbemont@videolan.org> 1213456148 +0200

Message:

shoutcast: Don't use playlist code.

Files:

• modules/demux/playlist/shoutcast.c (modified) (7 diffs)

modules/demux/playlist/shoutcast.c

@@ -39 +39 @@
-struct demux_sys_t
-{
-    playlist_t *p_playlist;
-    input_item_t *p_current_input;
-
@@ -73 +72 @@
-
-    STANDARD_DEMUX_INIT_MSG( "using shoutcast playlist reader" );
-    p_demux->p_sys->p_playlist = NULL;
-    p_demux->p_sys->p_xml = NULL;
-    p_demux->p_sys->p_xml_reader = NULL;
@@ -93 +91 @@
-    demux_sys_t *p_sys = p_demux->p_sys;
-
-    if( p_sys->p_playlist )
-        vlc_object_release( p_sys->p_playlist );
-    if( p_sys->p_xml_reader )
-        xml_ReaderDelete( p_sys->p_xml, p_sys->p_xml_reader );
@@ -109 +105 @@
-    char *psz_eltname = NULL;
-    INIT_PLAYLIST_STUFF;
-    p_sys->p_playlist = p_playlist;
-    p_sys->p_current_input = p_current_input;
-
@@ -151 +146 @@
-
-    HANDLE_PLAY_AND_RELEASE;
-    p_sys->p_playlist = NULL;
-    return 0; /* Needed for correct operation of go back */
-}
@@ -235 +229 @@
-                    sprintf( psz_mrl, SHOUTCAST_BASE_URL "?genre=%s",
-                             psz_name );
-sys->p_playlist
+demux
-                                                psz_name, 0, NULL, -1 );
-                    input_ItemCopyOptions( p_sys->p_current_input,
@@ -409 +403 @@
-                             psz_base, psz_id );
-                    }
-sys->p_playlist
+demux
-                                                psz_name , 0, NULL, -1 );
-                    free( psz_mrl );