* Protect input item's meta through setters and getters. That allows tracking of...

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

diff --git a/modules/demux/playlist/xspf.c b/modules/demux/playlist/xspf.c
index 442294bf81fe976a5e6273d45a3a859fed2f8066..6d243b744bfd5b82c9fbb18cdf7f3829feb283ea 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"
@@ -39,10 +38,10 @@
 struct demux_sys_t
 {
     playlist_item_t *p_item_in_category;
-    int i_parent_id;
     input_item_t **pp_tracklist;
     int i_tracklist_entries;
     int i_identifier;
+    char * psz_base;
 };
 
 static int Control( demux_t *, int, va_list );
@@ -51,13 +50,21 @@ static int Demux( demux_t * );
 /**
  * \brief XSPF submodule initialization function
  */
-int E_(xspf_import_Activate)( vlc_object_t *p_this )
+int E_(Import_xspf)( vlc_object_t *p_this )
 {
-    DEMUX_BY_EXTENSION_OR_FORCED_MSG( ".xspf", "xspf-open", 
+    DEMUX_BY_EXTENSION_OR_FORCED_MSG( ".xspf", "xspf-open",
                                       "using XSPF playlist reader" );
     return VLC_SUCCESS;
 }
 
+void E_(Close_xspf)( vlc_object_t *p_this )
+{
+    demux_t *p_demux = (demux_t *)p_this;
+    FREENULL( p_demux->p_sys->pp_tracklist );
+    FREENULL( p_demux->p_sys->psz_base );
+    free( p_demux->p_sys );
+}
+
 /**
  * \brief demuxer function for XSPF parsing
  */
@@ -69,10 +76,10 @@ int Demux( demux_t *p_demux )
     char *psz_name = NULL;
     INIT_PLAYLIST_STUFF;
     p_demux->p_sys->p_item_in_category = p_item_in_category;
-    p_demux->p_sys->i_parent_id = i_parent_id;
     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 */
     p_xml = xml_Create( p_demux );
@@ -117,7 +124,7 @@ int Demux( demux_t *p_demux )
         xml_ReaderDelete( p_xml, p_xml_reader );
     if( p_xml )
         xml_Delete( p_xml );
-    return VLC_SUCCESS;
+    return -1; /* Needed for correct operation of go back */
 }
 
 /** \brief dummy function for demux callback interface */
@@ -146,7 +153,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} },
@@ -182,6 +189,10 @@ static vlc_bool_t parse_playlist_node COMPLEX_INTERFACE
         /* attribute: xmlns */
         else if( !strcmp( psz_name, "xmlns" ) )
             ;
+        else if( !strcmp( psz_name, "xml:base" ) )
+        {
+            p_demux->p_sys->psz_base = decode_URI_duplicate( psz_value );
+        }
         /* unknown attribute */
         else
             msg_Warn( p_demux, "invalid <playlist> attribute:\"%s\"", psz_name);
@@ -375,7 +386,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} },
@@ -468,11 +479,10 @@ static vlc_bool_t parse_track_node COMPLEX_INTERFACE
                 if( !strcmp( psz_name, psz_element ) )
                 {
                     FREE_ATT();
-                    /* Add it */
-                    playlist_AddWhereverNeeded( p_playlist, p_new_input,
-                              p_item, p_demux->p_sys->p_item_in_category,
-                              (p_demux->p_sys->i_parent_id >0 ) ? VLC_TRUE:
-                              VLC_FALSE, PLAYLIST_APPEND );
+                    playlist_BothAddInput( p_playlist, p_new_input,
+                                           p_demux->p_sys->p_item_in_category,
+                                           PLAYLIST_APPEND | PLAYLIST_SPREPARSE,
+                                           PLAYLIST_END, NULL, NULL, VLC_FALSE );
                     if( p_demux->p_sys->i_identifier <
                         p_demux->p_sys->i_tracklist_entries )
                     {
@@ -520,9 +530,24 @@ static vlc_bool_t parse_track_node COMPLEX_INTERFACE
 
                     if( psz_uri )
                     {
+                        if( p_demux->p_sys->psz_base &&
+                            !strstr( psz_uri, "://" ) )
+                        {
+                           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",
+                                    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 );
                         psz_uri = NULL;
@@ -594,22 +619,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;
 }