Changeset 359761887328403392fa85d36ef418aafc3eb00a

Timestamp:

14/06/08 16:59:47 (6 months ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1213455587 +0200

git-parent:

[89d24455d9c05be06de9ba8979806e0eb7647570]

git-author:

Pierre d'Herbemont <pdherbemont@videolan.org> 1213455587 +0200

Message:

xspf: Remove references to the playlist.

Files:

• modules/demux/playlist/xspf.c (modified) (11 diffs)
• modules/demux/playlist/xspf.h (modified) (1 diff)

modules/demux/playlist/xspf.c

@@ -34 +34 @@
-#include <vlc_demux.h>
-
+#include <vlc_xml.h>
+#include <vlc_strings.h>
+#include <vlc_url.h>
+#include "xspf.h"
-#include "playlist.h"
-#include "vlc_xml.h"
-#include "vlc_strings.h"
-#include "vlc_url.h"
-#include "xspf.h"
-
-struct demux_sys_t
-{
-    playlist_item_t *p_item_in_category;
-    input_item_t **pp_tracklist;
-    int i_tracklist_entries;
@@ -122 +121 @@
-
-    if( i_ret == 1 )
-playlist, p_
+
-                                     p_xml_reader, "playlist" ) ? 0 : -1;
-
@@ -153 +152 @@
- * \brief parse the root node of a XSPF playlist
- * \param p_demux demuxer instance
- * \param p_playlist playlist instance
- * \param p_input_item current input item
- * \param p_xml_reader xml reader instance
@@ -251 +249 @@
-                {
-                    if( p_handler->pf_handler.cmplx( p_demux,
-                                                     p_playlist,
-                                                     p_input_item,
-                                                     p_xml_reader,
@@ -357 +354 @@
-
-            /* parse the track data in a separate function */
-playlist, p_
+
-                                   p_xml_reader,"track" ) == true )
-                i_ntracks++;
@@ -455 +452 @@
-                    }
-                    if( p_handler->pf_handler.cmplx( p_demux,
-                                                     p_playlist,
-                                                     p_new_input,
-                                                     p_xml_reader,
@@ -559 +555 @@
-                           psz_uri = psz_tmp;
-                        }
-playlist
+demux
-                                                        NULL, 0, NULL, -1 );
-                        free( psz_uri );
@@ -735 +731 @@
-            return false;
-        }
-playlist
+demux
-                                psz_title, 0, NULL, -1, ITEM_TYPE_DIRECTORY );
-        if( p_new_input )
@@ -793 +789 @@
-                {
-                    if( p_handler->pf_handler.cmplx( p_demux,
-                                                     p_playlist,
-                                                     p_input_item,
-                                                     p_xml_reader,
@@ -871 +866 @@
-static bool parse_extitem_node COMPLEX_INTERFACE
-{
-_playlist); VLC_UNUSED(p
+
-    input_item_t *p_new_input = NULL;
-    char *psz_name = NULL;
@@ -933 +928 @@
-static bool skip_element COMPLEX_INTERFACE
-{
-playlist); VLC_UNUSED(p_
+
-    char *psz_endname;
-

modules/demux/playlist/xspf.h

@@ -36 +36 @@
-                           char            *psz_value)
-#define COMPLEX_INTERFACE (demux_t         *p_demux,\
-                           playlist_t      *p_playlist,\
-                           input_item_t    *p_input_item,\
-                           xml_reader_t    *p_xml_reader,\