Changeset 0db5f2a07b883f92d95959221776423fcad85974

Timestamp:

04/26/08 09:08:52 (4 months ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1209193732 +0300

git-parent:

[250db7be17a8decdeed5b7b6c73053fc31527d00]

git-author:

Antoine Lejeune <phytos@videolan.org> 1208974813 +0200

Message:

Ability to save and load input item options in xspf playlist as it is possible in m3u playlist.

Signed-off-by: Rémi Denis-Courmont <rem@videolan.org>

Files:

• modules/demux/playlist/xspf.c (modified) (3 diffs)
• modules/demux/playlist/xspf.h (modified) (1 diff)
• modules/misc/playlist/xspf.c (modified) (2 diffs)

modules/demux/playlist/xspf.c

@@ -411 +411 @@
-          {"link",         SIMPLE_CONTENT,  {NULL} },
-          {"meta",         SIMPLE_CONTENT,  {NULL} },
-skip_element
+parse_extension_node
-          {NULL,           UNKNOWN_CONTENT, {NULL} }
-        };
@@ -661 +661 @@
-}
-
+/**
+ * \brief handles the <option> elements
+ */
+static bool set_option SIMPLE_INTERFACE
+{
+    /* exit if setting is impossible */
+    if( !psz_name || !psz_value || !p_input )
+        return false;
+
+    /* re-convert xml special characters inside psz_value */
+    resolve_xml_special_chars( psz_value );
+    
+    input_ItemAddOpt( p_input, psz_value, 0 );
+    
+    return true;
+}
-
-/**
@@ -678 +694 @@
-        { {"node",  COMPLEX_CONTENT, {.cmplx = parse_extension_node} },
-          {"item",  COMPLEX_CONTENT, {.cmplx = parse_extitem_node} },
+          {"option", SIMPLE_CONTENT, {.smpl = set_option} },
-          {NULL,    UNKNOWN_CONTENT, {NULL} }
-        };

modules/demux/playlist/xspf.h

@@ -48 +48 @@
-static bool parse_extitem_node COMPLEX_INTERFACE;
-static bool set_item_info SIMPLE_INTERFACE;
+static bool set_option SIMPLE_INTERFACE;
-static bool skip_element COMPLEX_INTERFACE;
-

modules/misc/playlist/xspf.c

@@ -116 +116 @@
-    char *psz;
-    char *psz_temp;
+    int i;
-    mtime_t i_duration;
-
@@ -225 +226 @@
-    }
-    free( psz );
+
+    /* export the input's options (bookmarks, ...) in <extension> */
+    fprintf( p_file, "\t\t\t<extension application=\"http://www.videolan.org/vlc/playlist/0\">\n" );
+    for( i = 0; i < p_item->p_input->i_options; i++ )
+    {
+        fprintf( p_file, "\t\t\t\t<option>%s</option>\n",
+                 p_item->p_input->ppsz_options[i][0] == ':' ?
+                 p_item->p_input->ppsz_options[i] + 1 :
+                 p_item->p_input->ppsz_options[i] );
+    }
+    fprintf( p_file, "\t\t\t</extension>\n" );
-
-xspfexportitem_end: