Fix XSPF (Closes:#651)

modules/demux/playlist/playlist.c

@@ -57,14 +57,6 @@ vlc_module_begin();
     add_shortcut( "old-open" );
     set_capability( "demux2", 10 );
     set_callbacks( E_(Import_Old), NULL );
-#if 0
-    add_submodule();
-        set_description( _("Native playlist import") );
-        add_shortcut( "playlist" );
-        add_shortcut( "native-open" );
-        set_capability( "demux2", 10 );
-        set_callbacks( E_(Import_Native), E_(Close_Native) );
-#endif
     add_submodule();
         set_description( _("M3U playlist import") );
         add_shortcut( "m3u-open" );

modules/demux/playlist/xspf.h

@@ -30,11 +30,13 @@
 #define COMPLEX_CONTENT 2
 
 #define SIMPLE_INTERFACE  (playlist_item_t *p_item,\
+                           input_item_t    *p_input,\
                            const char      *psz_name,\
                            char            *psz_value)
 #define COMPLEX_INTERFACE (demux_t         *p_demux,\
                            playlist_t      *p_playlist,\
                            playlist_item_t *p_item,\
+                           input_item_t    *p_input, \
                            xml_reader_t    *p_xml_reader,\
                            const char      *psz_element)