Changeset 6df62cf5a6d007f180968eeba2e2f1922f4a0025

Timestamp:

02/09/07 23:24:02 (1 year ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

Antoine Cellerier <dionoea@videolan.org> 1188768242 +0000

git-parent:

[027b8eabd3d40ec522e0e19cb9db0e73b51ddd25]

git-author:

Antoine Cellerier <dionoea@videolan.org> 1188768242 +0000

Message:

Rewrite parts of the podcast service discovery module and make it handle additions to the url list at runtime. (deletions are not supported, without a module restart)

Files:

• modules/services_discovery/podcast.c (modified) (6 diffs)

modules/services_discovery/podcast.c

@@ -48 +48 @@
-
-/* Callbacks */
-    
-    
+
+
-
-#define URLS_TEXT N_("Podcast URLs list")
@@ -79 +79 @@
-    /* playlist node */
-    input_thread_t **pp_input;
+    int i_input;
-
-    char **ppsz_urls;
-    int i_urls;
+
+    vlc_bool_t b_update;
-};
-
@@ -87 +90 @@
- * Local prototypes
- *****************************************************************************/
-
-
-
+
+
+
+
-
-/*****************************************************************************
@@ -99 +103 @@
-    services_discovery_sys_t *p_sys  = malloc(
-                                    sizeof( services_discovery_sys_t ) );
-
+
-    p_sys->i_urls = 0;
-    p_sys->ppsz_urls = NULL;
+    p_sys->i_input = 0;
-    p_sys->pp_input = NULL;
-
+
+
-    p_sd->pf_run = Run;
-    p_sd->p_sys  = p_sys;
@@ -121 +127 @@
-    services_discovery_sys_t *p_sys  = p_sd->p_sys;
-    int i;
-urls
+input
-    {
-        if( p_sd->p_sys->pp_input[i] )
@@ -143 +149 @@
-    services_discovery_sys_t *p_sys  = p_sd->p_sys;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-    while( !p_sd->b_die )
-    {
-        int i;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-            {
-                input_StopThread( p_sd->p_sys->pp_input[i] );
-                input_DestroyThread( p_sd->p_sys->pp_input[i] );
-                p_sd->p_sys->pp_input[i] = NULL;
+                REMOVE_ELEM( p_sys->pp_input, p_sys->i_input, i );
+                i--;
-            }
-        }
-1000
+5
-    }
-}
+
+static int UrlsChange( vlc_object_t *p_this, char const *psz_var,
+                       vlc_value_t oldval, vlc_value_t newval,
+                       void *p_data )
+{
+    services_discovery_sys_t *p_sys  = (services_discovery_sys_t *)p_data;
+    p_sys->b_update = VLC_TRUE;
+    return VLC_SUCCESS;
+}
+
+static void ParseUrls( services_discovery_t *p_sd, char *psz_urls )
+{
+    services_discovery_sys_t *p_sys = p_sd->p_sys;
+    for( ;; )
+    {
+        int i;
+        char *psz_tok = strchr( psz_urls, '|' );
+        if( psz_tok ) *psz_tok = '\0';
+        for( i = 0; i < p_sys->i_urls; i++ )
+            if( !strcmp( psz_urls, p_sys->ppsz_urls[i] ) )
+                break;
+        if( i == p_sys->i_urls )
+        {
+            /* Only add new urls.
+             * FIXME: We don't delete urls which have been removed from
+             * the config since we don't have a way to know which inputs
+             * they spawned */
+            input_item_t *p_input;
+            INSERT_ELEM( p_sys->ppsz_urls, p_sys->i_urls, p_sys->i_urls,
+                         strdup( psz_urls ) );
+            p_input = input_ItemNewExt( p_sd, psz_urls,
+                                        psz_urls, 0, NULL, -1 );
+            input_ItemAddOption( p_input, "demux=podcast" );
+            services_discovery_AddItem( p_sd, p_input, NULL /* no cat */ );
+            INSERT_ELEM( p_sys->pp_input, p_sys->i_input, p_sys->i_input,
+                         input_CreateThread( p_sd, p_input ) );
+        }
+        if( psz_tok )  psz_urls = psz_tok+1;
+        else           return;
+    }
+}