macosx: Make sure the manageIntf: Timer is getting cancelled at exit.

[vlc] / modules / demux / playlist / podcast.c

diff --git a/modules/demux/playlist/podcast.c b/modules/demux/playlist/podcast.c
index d514764f666adf5f9380d6b6fc88ecab7fe5d9ec..31306f4f942fad9c375bf8871be3ba240f2eb3a2 100644 (file)
--- a/modules/demux/playlist/podcast.c
+++ b/modules/demux/playlist/podcast.c
@@ -24,7 +24,11 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
 #include <vlc_demux.h>
 
 #include "playlist.h"
@@ -33,7 +37,6 @@
 struct demux_sys_t
 {
     char *psz_prefix;
-    playlist_t *p_playlist;
     xml_t *p_xml;
     xml_reader_t *p_xml_reader;
 };
@@ -47,16 +50,15 @@ static int Control( demux_t *p_demux, int i_query, va_list args );
 /*****************************************************************************
  * Import_podcast: main import function
  *****************************************************************************/
-int E_(Import_podcast)( vlc_object_t *p_this )
+int Import_podcast( vlc_object_t *p_this )
 {
     demux_t *p_demux = (demux_t *)p_this;
 
-    if( !demux2_IsForced( p_demux, "podcast" ) )
+    if( !demux_IsForced( p_demux, "podcast" ) )
         return VLC_EGENERIC;
 
     STANDARD_DEMUX_INIT_MSG( "using podcast reader" );
-    p_demux->p_sys->psz_prefix = E_(FindPrefix)( p_demux );
-    p_demux->p_sys->p_playlist = NULL;
+    p_demux->p_sys->psz_prefix = FindPrefix( p_demux );
     p_demux->p_sys->p_xml = NULL;
     p_demux->p_sys->p_xml_reader = NULL;
 
@@ -66,13 +68,12 @@ int E_(Import_podcast)( vlc_object_t *p_this )
 /*****************************************************************************
  * Deactivate: frees unused data
  *****************************************************************************/
-void E_(Close_podcast)( vlc_object_t *p_this )
+void Close_podcast( vlc_object_t *p_this )
 {
     demux_t *p_demux = (demux_t *)p_this;
     demux_sys_t *p_sys = p_demux->p_sys;
 
-    if( p_sys->psz_prefix ) free( p_sys->psz_prefix );
-    if( p_sys->p_playlist ) vlc_object_release( p_sys->p_playlist );
+    free( p_sys->psz_prefix );
     if( p_sys->p_xml_reader ) xml_ReaderDelete( p_sys->p_xml, p_sys->p_xml_reader );
     if( p_sys->p_xml ) xml_Delete( p_sys->p_xml );
     free( p_sys );
@@ -83,8 +84,8 @@ static int Demux( demux_t *p_demux )
 {
     demux_sys_t *p_sys = p_demux->p_sys;
 
-    vlc_bool_t b_item = VLC_FALSE;
-    vlc_bool_t b_image = VLC_FALSE;
+    bool b_item = false;
+    bool b_image = false;
     int i_ret;
 
     xml_t *p_xml;
@@ -130,7 +131,7 @@ static int Demux( demux_t *p_demux )
     {
         msg_Err( p_demux, "invalid root node %i, %s",
                  xml_ReaderNodeType( p_xml_reader ), psz_elname );
-        if( psz_elname ) free( psz_elname );
+        free( psz_elname );
         return -1;
     }
     free( psz_elname ); psz_elname = NULL;
@@ -149,17 +150,17 @@ static int Demux( demux_t *p_demux )
             case XML_READER_STARTELEM:
             {
                 // Read the element name
-                if( psz_elname ) free( psz_elname );
+                free( psz_elname );
                 psz_elname = xml_ReaderName( p_xml_reader );
                 if( !psz_elname ) return -1;
 
                 if( !strcmp( psz_elname, "item" ) )
                 {
-                    b_item = VLC_TRUE;
+                    b_item = true;
                 }
                 else if( !strcmp( psz_elname, "image" ) )
                 {
-                    b_item = VLC_TRUE;
+                    b_item = true;
                 }
 
                 // Read the attributes
@@ -195,24 +196,24 @@ static int Demux( demux_t *p_demux )
             }
             case XML_READER_TEXT:
             {
-#define SET_DATA( field, name ) else if( b_item == VLC_TRUE \
+#define SET_DATA( field, name ) else if( b_item == true \
                 && !strcmp( psz_elname, name ) ) \
                 { \
                     field = strdup( psz_text ); \
                 }
                 char *psz_text = xml_ReaderValue( p_xml_reader );
                 /* item specific meta data */
-                if( b_item == VLC_TRUE && !strcmp( psz_elname, "title" ) )
+                if( b_item == true && !strcmp( psz_elname, "title" ) )
                 {
                     psz_item_name = strdup( psz_text );
                 }
-                else if( b_item == VLC_TRUE
+                else if( b_item == true
                          && ( !strcmp( psz_elname, "itunes:author" )
                             ||!strcmp( psz_elname, "author" ) ) )
                 { /* <author> isn't standard iTunes podcast stuff */
                     psz_item_author = strdup( psz_text );
                 }
-                else if( b_item == VLC_TRUE
+                else if( b_item == true
                          && ( !strcmp( psz_elname, "itunes:summary" )
                             ||!strcmp( psz_elname, "description" ) ) )
                 { /* <description> isn't standard iTunes podcast stuff */
@@ -224,7 +225,7 @@ static int Demux( demux_t *p_demux )
                 SET_DATA( psz_item_keywords, "itunes:keywords" )
                 SET_DATA( psz_item_subtitle, "itunes:subtitle" )
                 /* toplevel meta data */
-                else if( b_item == VLC_FALSE && b_image == VLC_FALSE
+                else if( b_item == false && b_image == false
                          && !strcmp( psz_elname, "title" ) )
                 {
                     input_item_SetName( p_current_input, psz_text );
@@ -241,7 +242,7 @@ static int Demux( demux_t *p_demux )
                 ADD_GINFO( "Podcast Keywords", "itunes:keywords" )
                 ADD_GINFO( "Podcast Subtitle", "itunes:subtitle" )
 #undef ADD_GINFO
-                else if( b_item == VLC_FALSE && b_image == VLC_FALSE
+                else if( b_item == false && b_image == false
                          && ( !strcmp( psz_elname, "itunes:summary" )
                             ||!strcmp( psz_elname, "description" ) ) )
                 { /* <description> isn't standard iTunes podcast stuff */
@@ -266,7 +267,12 @@ static int Demux( demux_t *p_demux )
                 if( !psz_elname ) return -1;
                 if( !strcmp( psz_elname, "item" ) )
                 {
-                    p_input = input_ItemNewExt( p_playlist, psz_item_mrl,
+                    if( psz_item_mrl == NULL )
+                    {
+                        msg_Err( p_demux, "invalid XML (no enclosure markup)" );
+                        return -1;
+                    }
+                    p_input = input_ItemNewExt( p_demux, psz_item_mrl,
                                                 psz_item_name, 0, NULL, -1 );
                     if( p_input == NULL ) break;
 #define ADD_INFO( info, field ) \
@@ -289,6 +295,7 @@ static int Demux( demux_t *p_demux )
                                                 psz_item_size );
                     }
                     input_ItemAddSubItem( p_current_input, p_input );
+                    vlc_gc_decref( p_input );
                     FREENULL( psz_item_name );
                     FREENULL( psz_item_mrl );
                     FREENULL( psz_item_size );
@@ -300,11 +307,11 @@ static int Demux( demux_t *p_demux )
                     FREENULL( psz_item_keywords );
                     FREENULL( psz_item_subtitle );
                     FREENULL( psz_item_summary );
-                    b_item = VLC_FALSE;
+                    b_item = false;
                 }
                 else if( !strcmp( psz_elname, "image" ) )
                 {
-                    b_image = VLC_FALSE;
+                    b_image = false;
                 }
                 free( psz_elname );
                 psz_elname = strdup("");
@@ -325,5 +332,6 @@ static int Demux( demux_t *p_demux )
 
 static int Control( demux_t *p_demux, int i_query, va_list args )
 {
+    VLC_UNUSED(p_demux); VLC_UNUSED(i_query); VLC_UNUSED(args);
     return VLC_EGENERIC;
 }