podcast: fix gettext parsing (cannot rely on CPP)

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

diff --git a/modules/demux/playlist/podcast.c b/modules/demux/playlist/podcast.c
index 93f26532188360fa1acdb7ab4fd894a28e8b8fcc..ba7c83a1b051aecd97ef01deac92375f26c6079d 100644 (file)
--- a/modules/demux/playlist/podcast.c
+++ b/modules/demux/playlist/podcast.c
@@ -73,8 +73,7 @@ static int Demux( demux_t *p_demux )
     bool b_image = false;
     int i_ret;
 
-    xml_t *p_xml;
-    xml_reader_t *p_xml_reader = NULL;
+    xml_reader_t *p_xml_reader;
     char *psz_elname = NULL;
     char *psz_item_mrl = NULL;
     char *psz_item_size = NULL;
@@ -94,11 +93,7 @@ static int Demux( demux_t *p_demux )
 
     input_item_t *p_current_input = GetCurrentItem(p_demux);
 
-    p_xml = xml_Create( p_demux );
-    if( !p_xml )
-        goto error;
-
-    p_xml_reader = xml_ReaderCreate( p_xml, p_demux->s );
+    p_xml_reader = xml_ReaderCreate( p_demux, p_demux->s );
     if( !p_xml_reader )
         goto error;
 
@@ -251,15 +246,13 @@ static int Demux( demux_t *p_demux )
                     }
 #define ADD_GINFO( info, name ) \
     else if( !strcmp( psz_elname, name ) ) \
-    { \
         input_item_AddInfo( p_current_input, _("Podcast Info"), \
-                                _( info ), "%s", psz_text ); \
-    }
-                    ADD_GINFO( "Podcast Link", "link" )
-                    ADD_GINFO( "Podcast Copyright", "copyright" )
-                    ADD_GINFO( "Podcast Category", "itunes:category" )
-                    ADD_GINFO( "Podcast Keywords", "itunes:keywords" )
-                    ADD_GINFO( "Podcast Subtitle", "itunes:subtitle" )
+                            info, "%s", psz_text );
+                    ADD_GINFO( _("Podcast Link"), "link" )
+                    ADD_GINFO( _("Podcast Copyright"), "copyright" )
+                    ADD_GINFO( _("Podcast Category"), "itunes:category" )
+                    ADD_GINFO( _("Podcast Keywords"), "itunes:keywords" )
+                    ADD_GINFO( _("Podcast Subtitle"), "itunes:subtitle" )
 #undef ADD_GINFO
                     else if( !strcmp( psz_elname, "itunes:summary" ) ||
                              !strcmp( psz_elname, "description" ) )
@@ -305,15 +298,15 @@ static int Demux( demux_t *p_demux )
                     if( p_input == NULL ) break;
 #define ADD_INFO( info, field ) \
     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 );
-                    ADD_INFO( "Podcast Subcategory", psz_item_category );
-                    ADD_INFO( "Podcast Duration", psz_item_duration );
-                    ADD_INFO( "Podcast Keywords", psz_item_keywords );
-                    ADD_INFO( "Podcast Subtitle", psz_item_subtitle );
-                    ADD_INFO( "Podcast Summary", psz_item_summary );
-                    ADD_INFO( "Podcast Type", psz_item_type );
+                            _( "Podcast Info" ),  info, "%s", field ); }
+                    ADD_INFO( _("Podcast Publication Date"), psz_item_date  );
+                    ADD_INFO( _("Podcast Author"), psz_item_author );
+                    ADD_INFO( _("Podcast Subcategory"), psz_item_category );
+                    ADD_INFO( _("Podcast Duration"), psz_item_duration );
+                    ADD_INFO( _("Podcast Keywords"), psz_item_keywords );
+                    ADD_INFO( _("Podcast Subtitle"), psz_item_subtitle );
+                    ADD_INFO( _("Podcast Summary"), psz_item_summary );
+                    ADD_INFO( _("Podcast Type"), psz_item_type );
 #undef ADD_INFO
 
                     /* Set the duration if available */
@@ -328,7 +321,7 @@ static int Demux( demux_t *p_demux )
                         input_item_AddInfo( p_input,
                                                 _( "Podcast Info" ),
                                                 _( "Podcast Size" ),
-                                                "%s bytes",
+                                                _("%s bytes"),
                                                 psz_item_size );
                     }
                     input_item_node_AppendItem( p_subitems, p_input );
@@ -366,7 +359,6 @@ static int Demux( demux_t *p_demux )
     free( psz_art_url );
     free( psz_elname );
     xml_ReaderDelete( p_xml_reader );
-    xml_Delete( p_xml );
 
     input_item_node_PostAndDelete( p_subitems );
     vlc_gc_decref(p_current_input);
@@ -389,8 +381,6 @@ error:
 
     if( p_xml_reader )
         xml_ReaderDelete( p_xml_reader );
-    if( p_xml )
-        xml_Delete( p_xml );
     if( p_subitems )
         input_item_node_Delete( p_subitems );