Changeset 25368dcd565835166b736d19615bb66324696b0b

Timestamp:

14/12/05 19:10:27 (3 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1134583827 +0000

git-parent:

[eff1f159b6044e12f46aa11fdde69957e811c3d2]

git-author:

Clément Stenac <zorglub@videolan.org> 1134583827 +0000

Message:

Use input_Read in shoutcast and display a progress dialog

Files:

• modules/services_discovery/shout.c (modified) (7 diffs)

modules/services_discovery/shout.c

@@ -29 +29 @@
-#include <vlc/vlc.h>
-#include <vlc/intf.h>
+#include <vlc_interaction.h>
-
-#include <vlc/input.h>
@@ -86 +87 @@
-    /* playlist node */
-    playlist_item_t *p_node;
-
-
+
+
+
-};
-
@@ -111 +113 @@
-    playlist_item_t     *p_item;
-
-    int i_limit;
-    char *psz_shoutcast_url;
-    char *psz_shoutcast_title;
@@ -127 +128 @@
-    }
-
-
+p_sys->
-    #define SHOUTCAST_BASE_URL "http/shout-b4s://www.shoutcast.com/sbin/xmllister.phtml?service=vlc&no_compress=1&limit="
-    psz_shoutcast_url = (char *)malloc( strlen( SHOUTCAST_BASE_URL ) + 20 );
-    psz_shoutcast_title = (char *)malloc( 6 + 20 );
-
-
-
+p_sys->
+p_sys->
-
-    p_view = playlist_ViewFind( p_playlist, VIEW_CATEGORY );
@@ -150 +151 @@
-     * parent's ones */
-    playlist_CopyParents( p_sys->p_node, p_item );
-
-
-
-
+
+
-    p_sys->p_node->i_flags |= PLAYLIST_RO_FLAG;
-    val.b_bool = VLC_TRUE;
@@ -172 +171 @@
-    playlist_t *p_playlist =  (playlist_t *) vlc_object_find( p_sd,
-                                 VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
-    if( p_sd->p_sys->p_input )
-    {
-        input_StopThread( p_sd->p_sys->p_input );
-        input_DestroyThread( p_sd->p_sys->p_input );
-        vlc_object_detach( p_sd->p_sys->p_input );
-        vlc_object_destroy( p_sd->p_sys->p_input );
-        p_sd->p_sys->p_input = NULL;        
-    }
-    if( p_playlist )
-    {
@@ -193 +184 @@
-static void Run( services_discovery_t *p_sd )
-{
+    services_discovery_sys_t *p_sys  = p_sd->p_sys;
+    int i_id = input_Read( p_sd, &p_sys->p_item->input, VLC_FALSE );
+    int i_dialog_id;
+
+    i_dialog_id = intf_UserProgress( p_sd, "Shoutcast" , "Connecting...", 0.0 );
+
+    p_sys->b_dialog = VLC_TRUE;
-    while( !p_sd->b_die )
-    {
-
-
+
+
+
+
+
+
+
-        {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        msleep( 100000 );