* \file modules/misc/playlist/xspf.c
* \brief XSPF playlist export functions
*/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
#include <vlc_interface.h>
#include <vlc_playlist.h>
#include <vlc_input.h>
#include <vlc_charset.h>
#include "xspf.h"
+#include <assert.h>
+
/**
* \brief Prints the XSPF header to file, writes each item by xspf_export_item()
* and closes the open xml elements
* \param p_this the VLC playlist object
* \return VLC_SUCCESS if some memory is available, otherwise VLC_ENONMEM
*/
-int E_(xspf_export_playlist)( vlc_object_t *p_this )
+int xspf_export_playlist( vlc_object_t *p_this )
{
const playlist_t *p_playlist = (playlist_t *)p_this;
const playlist_export_t *p_export =
if( psz_temp && *psz_temp )
{
fprintf( p_export->p_file, "\t<location>%s</location>\n", psz_temp );
- free( psz_temp );
}
+ free( psz_temp );
/* export all items in a flat format */
fprintf( p_export->p_file, "\t<trackList>\n" );
{
char *psz;
char *psz_temp;
+ int i;
mtime_t i_duration;
if( !p_item ) return;
}
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:
/* -> the duration */
i_duration = input_item_GetDuration( p_item->p_input );
{
char *psz_ret = NULL; /**< the new result buffer to return */
char *psz_s = NULL, *psz_d = NULL; /**< src & dest pointers for URI conversion */
- vlc_bool_t b_uri_is_file = VLC_FALSE; /**< we do additional %-encoding if the URI is a file:// one */
+ bool b_uri_is_file = false; /**< we do additional %-encoding if the URI is a file:// one */
if( !psz_name || !*psz_name )
return NULL;
psz_d = psz_ret + i_delim;
if( !strncmp( psz_s, "file://", 7 ) )
- b_uri_is_file = VLC_TRUE;
+ b_uri_is_file = true;
psz_s += i_delim;
}
{
strcpy( psz_ret, "file://" );
psz_d = psz_ret + 7;
- b_uri_is_file = VLC_TRUE;
+ b_uri_is_file = true;
}
while( *psz_s )
*psz_s == '>' ||
*psz_s == '&' ||
*psz_s == ' ' ||
+ *psz_s == '+' ||
+ *psz_s == '%' ||
( b_uri_is_file && (
*psz_s == ':' ||
*psz_s == '"' ||
*psz_s == '#' ||
*psz_s == '[' ||
*psz_s == ']' ||
- *psz_s == '@' ||
- *psz_s == '+' ||
- *psz_s == '%' )
+ *psz_s == '@' )
)
)
{