codecleanup: Replace input_Item by input_item.

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

diff --git a/modules/demux/playlist/podcast.c b/modules/demux/playlist/podcast.c
index 11db8c4cbf73abc8af948611c3bd3f2cb624ab3d..20f8754fec8b3258fc6f9eb013a1502400ed85b4 100644 (file)
--- a/modules/demux/playlist/podcast.c
+++ b/modules/demux/playlist/podcast.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_demux.h>
 
 #include "playlist.h"
@@ -37,7 +37,6 @@
 struct demux_sys_t
 {
     char *psz_prefix;
-    playlist_t *p_playlist;
     xml_t *p_xml;
     xml_reader_t *p_xml_reader;
 };
@@ -51,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;
 
@@ -70,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;
 
     free( p_sys->psz_prefix );
-    if( p_sys->p_playlist ) vlc_object_release( p_sys->p_playlist );
     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 );
@@ -87,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;
@@ -159,11 +156,11 @@ static int Demux( demux_t *p_demux )
 
                 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
@@ -199,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 */
@@ -228,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 );
@@ -236,7 +233,7 @@ static int Demux( demux_t *p_demux )
 #define ADD_GINFO( info, name ) \
     else if( !b_item && !b_image && !strcmp( psz_elname, name ) ) \
     { \
-        input_ItemAddInfo( p_current_input, _("Podcast Info"), \
+        input_item_AddInfo( p_current_input, _("Podcast Info"), \
                                 _( info ), "%s", psz_text ); \
     }
                 ADD_GINFO( "Podcast Link", "link" )
@@ -245,11 +242,11 @@ 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 */
-                    input_ItemAddInfo( p_current_input,
+                    input_item_AddInfo( p_current_input,
                              _( "Podcast Info" ), _( "Podcast Summary" ),
                              "%s", psz_text );
                 }
@@ -270,11 +267,16 @@ 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_item_NewExt( p_demux, psz_item_mrl,
                                                 psz_item_name, 0, NULL, -1 );
                     if( p_input == NULL ) break;
 #define ADD_INFO( info, field ) \
-    if( field ) { input_ItemAddInfo( p_input, \
+    if( field ) { input_item_AddInfo( p_input, \
                             _( "Podcast Info" ),  _( info ), "%s", field ); }
                     ADD_INFO( "Podcast Publication Date", psz_item_date  );
                     ADD_INFO( "Podcast Author", psz_item_author );
@@ -286,13 +288,13 @@ static int Demux( demux_t *p_demux )
                     ADD_INFO( "Podcast Type", psz_item_type );
                     if( psz_item_size )
                     {
-                        input_ItemAddInfo( p_input,
+                        input_item_AddInfo( p_input,
                                                 _( "Podcast Info" ),
                                                 _( "Podcast Size" ),
                                                 "%s bytes",
                                                 psz_item_size );
                     }
-                    input_ItemAddSubItem( p_current_input, p_input );
+                    input_item_AddSubItem( p_current_input, p_input );
                     vlc_gc_decref( p_input );
                     FREENULL( psz_item_name );
                     FREENULL( psz_item_mrl );
@@ -305,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("");