modules/demux/playlist/*.c: Use the new playlist independant way to announce sub...

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

diff --git a/modules/demux/playlist/xspf.c b/modules/demux/playlist/xspf.c
index 7be83eb4614d51d36197fbfddaf9c6de5f3c9438..3921e7f42cb687d18c4d090bd74417ad8503a52c 100644 (file)
--- a/modules/demux/playlist/xspf.c
+++ b/modules/demux/playlist/xspf.c
@@ -27,8 +27,7 @@
  */
 
 #include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/intf.h>
+#include <vlc_demux.h>
 
 #include "playlist.h"
 #include "vlc_xml.h"
@@ -61,7 +60,8 @@ int E_(Import_xspf)( vlc_object_t *p_this )
 void E_(Close_xspf)( vlc_object_t *p_this )
 {
     demux_t *p_demux = (demux_t *)p_this;
-    FREENULL( p_demux->p_sys->psz_base);
+    FREENULL( p_demux->p_sys->pp_tracklist );
+    FREENULL( p_demux->p_sys->psz_base );
     free( p_demux->p_sys );
 }
 
@@ -75,10 +75,9 @@ int Demux( demux_t *p_demux )
     xml_reader_t *p_xml_reader = NULL;
     char *psz_name = NULL;
     INIT_PLAYLIST_STUFF;
-    p_demux->p_sys->p_item_in_category = p_item_in_category;
     p_demux->p_sys->pp_tracklist = NULL;
     p_demux->p_sys->i_tracklist_entries = 0;
-    p_demux->p_sys->i_identifier = -1;
+    p_demux->p_sys->i_identifier = 0;
     p_demux->p_sys->psz_base = NULL;
 
     /* create new xml parser from stream */
@@ -117,7 +116,7 @@ int Demux( demux_t *p_demux )
         FREE_NAME();
     }
 
-    i_ret = parse_playlist_node( p_demux, p_playlist, p_current, NULL,
+    i_ret = parse_playlist_node( p_demux, p_playlist, p_current_input,
                                  p_xml_reader, "playlist" );
     HANDLE_PLAY_AND_RELEASE;
     if( p_xml_reader )
@@ -137,8 +136,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
  * \brief parse the root node of a XSPF playlist
  * \param p_demux demuxer instance
  * \param p_playlist playlist instance
- * \param p_item current playlist item
- * \param p_input current input item
+ * \param p_input_item current input item
  * \param p_xml_reader xml reader instance
  * \param psz_element name of element to parse
  */
@@ -153,7 +151,7 @@ static vlc_bool_t parse_playlist_node COMPLEX_INTERFACE
     xml_elem_hnd_t pl_elements[] =
         { {"title",        SIMPLE_CONTENT,  {.smpl = set_item_info} },
           {"creator",      SIMPLE_CONTENT,  {.smpl = set_item_info} },
-          {"annotation",   SIMPLE_CONTENT,  {NULL} },
+          {"annotation",   SIMPLE_CONTENT,  {.smpl = set_item_info} },
           {"info",         SIMPLE_CONTENT,  {NULL} },
           {"location",     SIMPLE_CONTENT,  {NULL} },
           {"identifier",   SIMPLE_CONTENT,  {NULL} },
@@ -236,7 +234,7 @@ static vlc_bool_t parse_playlist_node COMPLEX_INTERFACE
                 {
                     if( p_handler->pf_handler.cmplx( p_demux,
                                                      p_playlist,
-                                                     p_item,NULL,
+                                                     p_input_item,
                                                      p_xml_reader,
                                                      p_handler->name ) )
                     {
@@ -290,7 +288,7 @@ static vlc_bool_t parse_playlist_node COMPLEX_INTERFACE
 
                 if( p_handler->pf_handler.smpl )
                 {
-                    p_handler->pf_handler.smpl( p_item, NULL, p_handler->name,
+                    p_handler->pf_handler.smpl( p_input_item, p_handler->name,
                                                 psz_value );
                 }
                 FREE_ATT();
@@ -340,7 +338,7 @@ static vlc_bool_t parse_tracklist_node COMPLEX_INTERFACE
             FREE_NAME();
 
             /* parse the track data in a separate function */
-            if( parse_track_node( p_demux, p_playlist, p_item, NULL,
+            if( parse_track_node( p_demux, p_playlist, p_input_item,
                                    p_xml_reader,"track" ) == VLC_TRUE )
                 i_ntracks++;
         }
@@ -386,7 +384,7 @@ static vlc_bool_t parse_track_node COMPLEX_INTERFACE
           {"identifier",   SIMPLE_CONTENT,  {NULL} },
           {"title",        SIMPLE_CONTENT,  {.smpl = set_item_info} },
           {"creator",      SIMPLE_CONTENT,  {.smpl = set_item_info} },
-          {"annotation",   SIMPLE_CONTENT,  {NULL} },
+          {"annotation",   SIMPLE_CONTENT,  {.smpl = set_item_info} },
           {"info",         SIMPLE_CONTENT,  {NULL} },
           {"image",        SIMPLE_CONTENT,  {NULL} },
           {"album",        SIMPLE_CONTENT,  {.smpl = set_item_info} },
@@ -439,7 +437,7 @@ static vlc_bool_t parse_track_node COMPLEX_INTERFACE
                     }
                     if( p_handler->pf_handler.cmplx( p_demux,
                                                      p_playlist,
-                                                     NULL, p_new_input,
+                                                     p_new_input,
                                                      p_xml_reader,
                                                      p_handler->name ) )
                     {
@@ -479,10 +477,7 @@ static vlc_bool_t parse_track_node COMPLEX_INTERFACE
                 if( !strcmp( psz_name, psz_element ) )
                 {
                     FREE_ATT();
-                    playlist_BothAddInput( p_playlist, p_new_input,
-                                           p_demux->p_sys->p_item_in_category,
-                                           PLAYLIST_APPEND | PLAYLIST_SPREPARSE,
-                                           PLAYLIST_END );
+                    input_ItemAddSubItem( p_input_item, p_new_input );
                     if( p_demux->p_sys->i_identifier <
                         p_demux->p_sys->i_tracklist_entries )
                     {
@@ -530,27 +525,26 @@ static vlc_bool_t parse_track_node COMPLEX_INTERFACE
 
                     if( psz_uri )
                     {
-                        if( p_demux->p_sys->psz_base && 
+                        if( p_demux->p_sys->psz_base &&
                             !strstr( psz_uri, "://" ) )
                         {
-                           char* psz_tmp = malloc( 
-                                   strlen(p_demux->p_sys->psz_base) + 
+                           char* psz_tmp = malloc(
+                                   strlen(p_demux->p_sys->psz_base) +
                                    strlen(psz_uri) +1 );
                            if( !psz_tmp )
                            {
                                msg_Err( p_demux, "out of memory");
                                return VLC_FALSE;
                            }
-                           sprintf( psz_tmp, "%s%s", 
+                           sprintf( psz_tmp, "%s%s",
                                     p_demux->p_sys->psz_base, psz_uri );
                            free( psz_uri );
                            psz_uri = psz_tmp;
                         }
                         p_new_input = input_ItemNewExt( p_playlist, psz_uri,
                                                         NULL, 0, NULL, -1 );
-                        p_new_input->p_meta = vlc_meta_New();
                         free( psz_uri );
-                        input_ItemCopyOptions( p_item->p_input, p_new_input );
+                        input_ItemCopyOptions( p_input_item, p_new_input );
                         psz_uri = NULL;
                         FREE_ATT();
                         p_handler = NULL;
@@ -577,7 +571,7 @@ static vlc_bool_t parse_track_node COMPLEX_INTERFACE
                     }
                     if( p_handler->pf_handler.smpl )
                     {
-                        p_handler->pf_handler.smpl( NULL, p_new_input,
+                        p_handler->pf_handler.smpl( p_new_input,
                                                     p_handler->name,
                                                     psz_value );
                         FREE_ATT();
@@ -620,22 +614,26 @@ static vlc_bool_t set_item_info SIMPLE_INTERFACE
     }
     else if( !strcmp( psz_name, "creator" ) )
     {
-        vlc_meta_SetArtist( p_input->p_meta, psz_value );
+        input_item_SetArtist( p_input, psz_value );
     }
     else if( !strcmp( psz_name, "album" ) )
     {
-        vlc_meta_SetAlbum( p_input->p_meta, psz_value );
+        input_item_SetAlbum( p_input, psz_value );
 
     }
     else if( !strcmp( psz_name, "trackNum" ) )
     {
-        vlc_meta_SetTracknum( p_input->p_meta, psz_value );
+        input_item_SetTrackNum( p_input, psz_value );
     }
     else if( !strcmp( psz_name, "duration" ) )
     {
         long i_num = atol( psz_value );
         p_input->i_duration = i_num*1000;
     }
+    else if( !strcmp( psz_name, "annotation" ) )
+    {
+        input_item_SetDescription( p_input, psz_value );
+    }
     return VLC_TRUE;
 }
 
@@ -721,7 +719,7 @@ static vlc_bool_t parse_extension_node COMPLEX_INTERFACE
                 {
                     if( p_handler->pf_handler.cmplx( p_demux,
                                                      p_playlist,
-                                                     p_item, NULL,
+                                                     p_input_item,
                                                      p_xml_reader,
                                                      p_handler->name ) )
                     {
@@ -775,7 +773,7 @@ static vlc_bool_t parse_extension_node COMPLEX_INTERFACE
 
                 if( p_handler->pf_handler.smpl )
                 {
-                    p_handler->pf_handler.smpl( p_item, NULL, p_handler->name,
+                    p_handler->pf_handler.smpl( p_input_item, p_handler->name,
                                                 psz_value );
                 }
                 FREE_ATT();