* Forward declaration
*/
-static void set_relative_playlist_position_and_play(
- libvlc_media_list_player_t * p_mlp,
- int i_relative_position,
- libvlc_exception_t * p_e);
+static
+int set_relative_playlist_position_and_play(libvlc_media_list_player_t *p_mlp,
+ int i_relative_position);
static void stop(libvlc_media_list_player_t * p_mlp);
/*
{
VLC_UNUSED(p_event);
libvlc_media_list_player_t * p_mlp = p_user_data;
- libvlc_exception_t e;
- libvlc_exception_init(&e);
vlc_mutex_lock(&p_mlp->mp_callback_lock);
if (!p_mlp->are_mp_callback_cancelled)
- set_relative_playlist_position_and_play(p_mlp, 1, &e);
+ set_relative_playlist_position_and_play(p_mlp, 1);
vlc_mutex_unlock(&p_mlp->mp_callback_lock);
-
- // There is no point in reporting an error from this callback
- libvlc_exception_clear(&e);
}
/**************************************************************************
/* Create a new media_player if there is none */
if (!p_mlp->p_mi)
- p_mlp->p_mi = libvlc_media_player_new_from_media(p_md, NULL);
+ p_mlp->p_mi = libvlc_media_player_new_from_media(p_md);
libvlc_media_player_set_media(p_mlp->p_mi, p_md);
* new (Public)
**************************************************************************/
libvlc_media_list_player_t *
-libvlc_media_list_player_new(libvlc_instance_t * p_instance, libvlc_exception_t * p_e)
+libvlc_media_list_player_new(libvlc_instance_t * p_instance)
{
- (void)p_e;
libvlc_media_list_player_t * p_mlp;
p_mlp = calloc( 1, sizeof(libvlc_media_list_player_t) );
if (unlikely(p_mlp == NULL))
/**************************************************************************
* Play (Public)
**************************************************************************/
-void libvlc_media_list_player_play(libvlc_media_list_player_t * p_mlp, libvlc_exception_t * p_e)
+void libvlc_media_list_player_play(libvlc_media_list_player_t * p_mlp)
{
lock(p_mlp);
if (!p_mlp->current_playing_item_path)
{
- set_relative_playlist_position_and_play(p_mlp, 1, p_e);
+ set_relative_playlist_position_and_play(p_mlp, 1);
unlock(p_mlp);
return; /* Will set to play */
}
- libvlc_media_player_play(p_mlp->p_mi, p_e);
+ libvlc_media_player_play(p_mlp->p_mi);
unlock(p_mlp);
}
/**************************************************************************
* Pause (Public)
**************************************************************************/
-void libvlc_media_list_player_pause(libvlc_media_list_player_t * p_mlp, libvlc_exception_t * p_e)
+void libvlc_media_list_player_pause(libvlc_media_list_player_t * p_mlp)
{
lock(p_mlp);
if (!p_mlp->p_mi)
unlock(p_mlp);
return;
}
- libvlc_media_player_pause(p_mlp->p_mi, p_e);
+ libvlc_media_player_pause(p_mlp->p_mi);
unlock(p_mlp);
}
int
libvlc_media_list_player_is_playing(libvlc_media_list_player_t * p_mlp)
{
+ if (!p_mlp->p_mi)
+ {
+ return libvlc_NothingSpecial;
+ }
libvlc_state_t state = libvlc_media_player_get_state(p_mlp->p_mi);
return (state == libvlc_Opening) || (state == libvlc_Buffering) ||
(state == libvlc_Playing);
/**************************************************************************
* Play item at index (Public)
**************************************************************************/
-void libvlc_media_list_player_play_item_at_index(libvlc_media_list_player_t * p_mlp, int i_index, libvlc_exception_t *p_e)
+int libvlc_media_list_player_play_item_at_index(libvlc_media_list_player_t * p_mlp, int i_index)
{
lock(p_mlp);
set_current_playing_item(p_mlp, libvlc_media_list_path_with_root_index(i_index));
- libvlc_media_player_play(p_mlp->p_mi, p_e);
+ libvlc_media_player_play(p_mlp->p_mi);
unlock(p_mlp);
/* Send the next item event */
libvlc_event_t event;
event.type = libvlc_MediaListPlayerNextItemSet;
libvlc_event_send(p_mlp->p_event_manager, &event);
+ return 0;
}
/**************************************************************************
* Play item (Public)
**************************************************************************/
-void libvlc_media_list_player_play_item(libvlc_media_list_player_t * p_mlp, libvlc_media_t * p_md, libvlc_exception_t * p_e)
+int libvlc_media_list_player_play_item(libvlc_media_list_player_t * p_mlp, libvlc_media_t * p_md)
{
lock(p_mlp);
libvlc_media_list_path_t path = libvlc_media_list_path_of_item(p_mlp->p_mlist, p_md);
if (!path)
{
- libvlc_exception_raise(p_e);
libvlc_printerr("Item not found in media list");
unlock(p_mlp);
- return;
+ return -1;
}
set_current_playing_item(p_mlp, path);
- libvlc_media_player_play(p_mlp->p_mi, p_e);
+ libvlc_media_player_play(p_mlp->p_mi);
unlock(p_mlp);
+ return 0;
}
/**************************************************************************
* (based on the currently playing item) and then begins the new item playback.
* Lock must be held.
**************************************************************************/
-static void set_relative_playlist_position_and_play(
+static int set_relative_playlist_position_and_play(
libvlc_media_list_player_t * p_mlp,
- int i_relative_position,
- libvlc_exception_t * p_e)
+ int i_relative_position)
{
assert_locked(p_mlp);
if (!p_mlp->p_mlist)
{
- libvlc_exception_raise(p_e);
libvlc_printerr("No media list");
- return;
+ return -1;
}
libvlc_media_list_lock(p_mlp->p_mlist);
if (!path)
{
libvlc_media_list_unlock(p_mlp->p_mlist);
- return;
+ return -1;
}
- libvlc_media_player_play(p_mlp->p_mi, p_e);
+ libvlc_media_player_play(p_mlp->p_mi);
libvlc_media_list_unlock(p_mlp->p_mlist);
event.u.media_list_player_next_item_set.item = p_md;
libvlc_event_send(p_mlp->p_event_manager, &event);
libvlc_media_release(p_md);
+ return 0;
}
/**************************************************************************
* Next (Public)
**************************************************************************/
-void libvlc_media_list_player_next(libvlc_media_list_player_t * p_mlp,
- libvlc_exception_t * p_e)
+int libvlc_media_list_player_next(libvlc_media_list_player_t * p_mlp)
{
lock(p_mlp);
- set_relative_playlist_position_and_play(p_mlp, 1, p_e);
+ int failure = set_relative_playlist_position_and_play(p_mlp, 1);
unlock(p_mlp);
+ return failure;
}
/**************************************************************************
* Previous (Public)
**************************************************************************/
-void libvlc_media_list_player_previous(libvlc_media_list_player_t * p_mlp,
- libvlc_exception_t * p_e)
+int libvlc_media_list_player_previous(libvlc_media_list_player_t * p_mlp)
{
lock(p_mlp);
- set_relative_playlist_position_and_play(p_mlp, -1, p_e);
+ int failure = set_relative_playlist_position_and_play(p_mlp, -1);
unlock(p_mlp);
+ return failure;
}
/**************************************************************************