Skip to content

V
vlc-2-2
Commit 7c4a54f9 authored by Clément Stenac's avatar Clément Stenac
Browse files
Options

Fix XSPF (Closes:#651)

parent 19607df8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 131 deletions
modules/demux/playlist/playlist.c
View file @ 7c4a54f9
...@@ -57,14 +57,6 @@ vlc_module_begin(); ...@@ -57,14 +57,6 @@ vlc_module_begin();
add_shortcut( "old-open" ); add_shortcut( "old-open" );
set_capability( "demux2", 10 ); set_capability( "demux2", 10 );
set_callbacks( E_(Import_Old), NULL ); 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(); add_submodule();
set_description( _("M3U playlist import") ); set_description( _("M3U playlist import") );
add_shortcut( "m3u-open" ); add_shortcut( "m3u-open" );
......
modules/demux/playlist/xspf.c
View file @ 7c4a54f9
This diff is collapsed.
modules/demux/playlist/xspf.h
View file @ 7c4a54f9
...@@ -30,11 +30,13 @@ ...@@ -30,11 +30,13 @@
#define COMPLEX_CONTENT 2 #define COMPLEX_CONTENT 2
#define SIMPLE_INTERFACE (playlist_item_t *p_item,\ #define SIMPLE_INTERFACE (playlist_item_t *p_item,\
input_item_t *p_input,\
const char *psz_name,\ const char *psz_name,\
char *psz_value) char *psz_value)
#define COMPLEX_INTERFACE (demux_t *p_demux,\ #define COMPLEX_INTERFACE (demux_t *p_demux,\
playlist_t *p_playlist,\ playlist_t *p_playlist,\
playlist_item_t *p_item,\ playlist_item_t *p_item,\
input_item_t *p_input, \
xml_reader_t *p_xml_reader,\ xml_reader_t *p_xml_reader,\
const char *psz_element) const char *psz_element)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment