Commit f77b039a authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Add libvlc_playlist_add_extended_untrusted()

Based on 059a3399 by Laurent Aimar
parent 4409e905
...@@ -215,6 +215,22 @@ VLC_DEPRECATED_API int libvlc_playlist_add_extended( libvlc_instance_t *, const ...@@ -215,6 +215,22 @@ VLC_DEPRECATED_API int libvlc_playlist_add_extended( libvlc_instance_t *, const
const char *, int, const char **, const char *, int, const char **,
libvlc_exception_t * ); libvlc_exception_t * );
/**
* Append an item to the playlist. The item is added at the end, with
* additional input options from an untrusted source.
*
* \param p_instance the playlist instance
* \param psz_uri the URI to open, using VLC format
* \param psz_name a name that you might want to give or NULL
* \param i_options the number of options to add
* \param ppsz_options strings representing the options to add
* \param p_e an initialized exception pointer
* \return the identifier of the new item
*/
VLC_DEPRECATED_API int libvlc_playlist_add_extended_untrusted( libvlc_instance_t *, const char *,
const char *, int, const char **,
libvlc_exception_t * );
/** /**
* Delete the playlist item with the given ID. * Delete the playlist item with the given ID.
* *
......
...@@ -158,10 +158,11 @@ int libvlc_playlist_add( libvlc_instance_t *p_instance, const char *psz_uri, ...@@ -158,10 +158,11 @@ int libvlc_playlist_add( libvlc_instance_t *p_instance, const char *psz_uri,
0, NULL, p_e ); 0, NULL, p_e );
} }
int libvlc_playlist_add_extended( libvlc_instance_t *p_instance, static int PlaylistAddExtended( libvlc_instance_t *p_instance,
const char *psz_uri, const char *psz_name, const char *psz_uri, const char *psz_name,
int i_options, const char **ppsz_options, int i_options, const char **ppsz_options,
libvlc_exception_t *p_e ) unsigned i_option_flags,
libvlc_exception_t *p_e )
{ {
assert( PL ); assert( PL );
if( playlist_was_locked( p_instance ) ) if( playlist_was_locked( p_instance ) )
...@@ -170,11 +171,28 @@ int libvlc_playlist_add_extended( libvlc_instance_t *p_instance, ...@@ -170,11 +171,28 @@ int libvlc_playlist_add_extended( libvlc_instance_t *p_instance,
"calling libvlc_playlist_add" ); "calling libvlc_playlist_add" );
return VLC_EGENERIC; return VLC_EGENERIC;
} }
return playlist_AddExt( PL, psz_uri, psz_name, return playlist_AddExtOpt( PL, psz_uri, psz_name, PLAYLIST_INSERT,
PLAYLIST_INSERT, PLAYLIST_END, -1, ppsz_options, PLAYLIST_END, -1, ppsz_options, i_options,
i_options, 1, pl_Unlocked ); i_option_flags, true, pl_Unlocked );
}
int libvlc_playlist_add_extended( libvlc_instance_t *p_instance,
const char *psz_uri, const char *psz_name,
int i_options, const char **ppsz_options,
libvlc_exception_t *p_e )
{
return PlaylistAddExtended( p_instance, psz_uri, psz_name,
i_options, ppsz_options, VLC_INPUT_OPTION_TRUSTED,
p_e );
}
int libvlc_playlist_add_extended_untrusted( libvlc_instance_t *p_instance,
const char *psz_uri, const char *psz_name,
int i_options, const char **ppsz_options,
libvlc_exception_t *p_e )
{
return PlaylistAddExtended( p_instance, psz_uri, psz_name,
i_options, ppsz_options, 0,
p_e );
} }
int libvlc_playlist_delete_item( libvlc_instance_t *p_instance, int i_id, int libvlc_playlist_delete_item( libvlc_instance_t *p_instance, int i_id,
libvlc_exception_t *p_e ) libvlc_exception_t *p_e )
......
...@@ -144,6 +144,7 @@ libvlc_media_subitems ...@@ -144,6 +144,7 @@ libvlc_media_subitems
libvlc_new libvlc_new
libvlc_playlist_add libvlc_playlist_add
libvlc_playlist_add_extended libvlc_playlist_add_extended
libvlc_playlist_add_extended_untrusted
libvlc_playlist_clear libvlc_playlist_clear
libvlc_playlist_delete_item libvlc_playlist_delete_item
libvlc_playlist_get_media_player libvlc_playlist_get_media_player
......
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