Fix [9589813471d0f5525789b7cf7165e48d177cbad6] by using var_Create (Pointed out by...

[vlc] / modules / services_discovery / podcast.c

diff --git a/modules/services_discovery/podcast.c b/modules/services_discovery/podcast.c
index 5710810ff8e07f4ea2f3a31a9671592edd6fcc0d..b64243e569b4aff8e05306262a451b85619b7a42 100644 (file)
--- a/modules/services_discovery/podcast.c
+++ b/modules/services_discovery/podcast.c
@@ -25,7 +25,12 @@
  * Includes
  *****************************************************************************/
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_playlist.h>
 #include <vlc_network.h>
 
@@ -56,14 +61,13 @@ static void Close( vlc_object_t * );
 
 vlc_module_begin();
     set_shortname( "Podcast");
-    set_description( _("Podcasts") );
+    set_description( N_("Podcasts") );
     set_category( CAT_PLAYLIST );
     set_subcategory( SUBCAT_PLAYLIST_SD );
 
     add_string( "podcast-urls", NULL, NULL,
-                URLS_TEXT, URLS_LONGTEXT, VLC_FALSE );
+                URLS_TEXT, URLS_LONGTEXT, false );
         change_autosave();
-        change_safe();
 
     set_capability( "services_discovery", 0 );
     set_callbacks( Open, Close );
@@ -84,7 +88,7 @@ struct services_discovery_sys_t
     char **ppsz_urls;
     int i_urls;
 
-    vlc_bool_t b_update;
+    bool b_update;
 };
 
 /*****************************************************************************
@@ -103,12 +107,14 @@ static int Open( vlc_object_t *p_this )
     services_discovery_t *p_sd = ( services_discovery_t* )p_this;
     services_discovery_sys_t *p_sys  = malloc(
                                     sizeof( services_discovery_sys_t ) );
+    if( !p_sys )
+        return VLC_ENOMEM;
 
     p_sys->i_urls = 0;
     p_sys->ppsz_urls = NULL;
     p_sys->i_input = 0;
     p_sys->pp_input = NULL;
-    p_sys->b_update = VLC_TRUE;
+    p_sys->b_update = true;
 
     p_sd->pf_run = Run;
     p_sd->p_sys  = p_sys;
@@ -132,7 +138,7 @@ static void Close( vlc_object_t *p_this )
         if( p_sd->p_sys->pp_input[i] )
         {
             input_StopThread( p_sd->p_sys->pp_input[i] );
-            input_DestroyThread( p_sd->p_sys->pp_input[i] );
+            vlc_object_release( p_sd->p_sys->pp_input[i] );
             p_sd->p_sys->pp_input[i] = NULL;
         }
     }
@@ -149,21 +155,21 @@ static void Run( services_discovery_t *p_sd )
 {
     services_discovery_sys_t *p_sys  = p_sd->p_sys;
 
-    char *psz_urls = var_CreateGetString( p_sd, "podcast-urls" );
-    free( psz_urls ); /* Gruik ? */
+    /* Launch the callback associated with this variable */
+    var_Create( p_sd, "podcast-urls", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
     var_AddCallback( p_sd, "podcast-urls", UrlsChange, p_sys );
 
-    while( !p_sd->b_die )
+    while( vlc_object_alive (p_sd) )
     {
         int i;
-        if( p_sys->b_update == VLC_TRUE )
+        if( p_sys->b_update == true )
         {
             msg_Dbg( p_sd, "Update required" );
-            psz_urls = var_GetNonEmptyString( p_sd, "podcast-urls" );
+            char* psz_urls = var_GetNonEmptyString( p_sd, "podcast-urls" );
             if( psz_urls != NULL )
                 ParseUrls( p_sd, psz_urls );
             free( psz_urls );
-            p_sys->b_update = VLC_FALSE;
+            p_sys->b_update = false;
         }
 
         for( i = 0; i < p_sd->p_sys->i_input; i++ )
@@ -172,7 +178,7 @@ static void Run( services_discovery_t *p_sd )
                 || p_sd->p_sys->pp_input[i]->b_error )
             {
                 input_StopThread( p_sd->p_sys->pp_input[i] );
-                input_DestroyThread( p_sd->p_sys->pp_input[i] );
+                vlc_object_release( 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--;
@@ -186,8 +192,10 @@ static int UrlsChange( vlc_object_t *p_this, char const *psz_var,
                        vlc_value_t oldval, vlc_value_t newval,
                        void *p_data )
 {
+    VLC_UNUSED(p_this); VLC_UNUSED(psz_var); VLC_UNUSED(oldval);
+    VLC_UNUSED(newval);
     services_discovery_sys_t *p_sys  = (services_discovery_sys_t *)p_data;
-    p_sys->b_update = VLC_TRUE;
+    p_sys->b_update = true;
     return VLC_SUCCESS;
 }