Invmem: fix a crash when allocating pictures memory, remove duplicate statement and...

[vlc] / modules / services_discovery / podcast.c

diff --git a/modules/services_discovery/podcast.c b/modules/services_discovery/podcast.c
index aa96ea5a4b5050a2032ccd7445b2096c7b86e533..021ca45fc4d1ffbd1e98c216fd3be43dbb27c313 100644 (file)
--- a/modules/services_discovery/podcast.c
+++ b/modules/services_discovery/podcast.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * podcast.c:  Podcast services discovery module
  *****************************************************************************
- * Copyright (C) 2005 the VideoLAN team
+ * Copyright (C) 2005-2009 the VideoLAN team
  * $Id$
  *
  * Authors: Antoine Cellerier <dionoea -at- videolan -dot- org>
@@ -69,7 +69,7 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_PLAYLIST_SD )
 
     add_string( "podcast-urls", NULL, NULL,
-                URLS_TEXT, URLS_LONGTEXT, false );
+                URLS_TEXT, URLS_LONGTEXT, false )
         change_autosave ()
 
     set_capability( "services_discovery", 0 )
@@ -132,6 +132,9 @@ static int Open( vlc_object_t *p_this )
 
     if (vlc_clone (&p_sys->thread, Run, p_sd, VLC_THREAD_PRIORITY_LOW))
     {
+        var_DelCallback( p_sd, "podcast-urls", UrlsChange, p_sys );
+        vlc_cond_destroy( &p_sys->wait );
+        vlc_mutex_destroy( &p_sys->lock );
         free (p_sys);
         return VLC_EGENERIC;
     }
@@ -158,7 +161,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_StopThread( p_sd->p_sys->pp_input[i], true );
             vlc_object_release( p_sd->p_sys->pp_input[i] );
             p_sd->p_sys->pp_input[i] = NULL;
         }
@@ -197,7 +200,7 @@ static void *Run( void *data )
             if( p_sd->p_sys->pp_input[i]->b_eof
                 || p_sd->p_sys->pp_input[i]->b_error )
             {
-                input_StopThread( p_sd->p_sys->pp_input[i] );
+                input_StopThread( p_sd->p_sys->pp_input[i], false );
                 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 );
@@ -245,9 +248,8 @@ static void ParseUrls( services_discovery_t *p_sd, char *psz_urls )
             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_item_NewExt( p_sd, psz_urls,
-                                        psz_urls, 0, NULL, -1 );
-            input_item_AddOption( p_input, "demux=podcast" );
+            p_input = input_item_New( p_sd, psz_urls, psz_urls );
+            input_item_AddOption( p_input, "demux=podcast", VLC_INPUT_OPTION_TRUSTED );
             services_discovery_AddItem( p_sd, p_input, NULL /* no cat */ );
             vlc_gc_decref( p_input );
             INSERT_ELEM( p_sys->pp_input, p_sys->i_input, p_sys->i_input,