]> git.sesse.net Git - vlc/blobdiff - modules/services_discovery/podcast.c
input: Remove input_DestroyThread() as it is now handled via vlc_object_release().
[vlc] / modules / services_discovery / podcast.c
index 9b77260f750daf2df19f5b073c2f1f7ce48202a3..f0b33c331ca6cf064f57d15ce24db0402c40723e 100644 (file)
  * Includes
  *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 #include <vlc_playlist.h>
 #include <vlc_network.h>
@@ -131,7 +135,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;
         }
     }
@@ -158,8 +162,9 @@ static void Run( services_discovery_t *p_sd )
         if( p_sys->b_update == VLC_TRUE )
         {
             msg_Dbg( p_sd, "Update required" );
-            psz_urls = var_GetString( p_sd, "podcast-urls" );
-            ParseUrls( p_sd, psz_urls );
+            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;
         }
@@ -170,7 +175,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--;
@@ -184,6 +189,8 @@ 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;
     return VLC_SUCCESS;