* 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 void stop(libvlc_media_list_player_t * p_mlp, 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);
/*
* Private functions
{
// Obtain an access to this structure
vlc_mutex_lock(&p_mlp->object_lock);
-
+
// Make sure no callback will occurs at the same time
vlc_mutex_lock(&p_mlp->mp_callback_lock);
}
static inline libvlc_event_manager_t * mlist_em(libvlc_media_list_player_t * p_mlp)
{
assert_locked(p_mlp);
- return libvlc_media_list_event_manager(p_mlp->p_mlist, NULL);
+ return libvlc_media_list_event_manager(p_mlp->p_mlist);
}
static inline libvlc_event_manager_t * mplayer_em(libvlc_media_list_player_t * p_mlp)
{
assert_locked(p_mlp);
- return libvlc_media_player_event_manager(p_mlp->p_mi, NULL);
+ return libvlc_media_player_event_manager(p_mlp->p_mi);
}
/**************************************************************************
* get_next_path (private)
*
- * Returns the path to the next item in the list.
+ * Returns the path to the next item in the list.
* If looping is specified and the current item is the last list item in
* the list it will return the first item in the list.
**************************************************************************/
if (!p_mlp->current_playing_item_path)
{
- if (!libvlc_media_list_count(p_mlp->p_mlist, NULL))
+ if (!libvlc_media_list_count(p_mlp->p_mlist))
return NULL;
return libvlc_media_list_path_with_root_index(0);
}
-
+
p_sublist_of_playing_item = libvlc_media_list_sublist_at_path(
p_mlp->p_mlist,
p_mlp->current_playing_item_path);
-
+
/* If item just gained a sublist just play it */
if (p_sublist_of_playing_item)
{
ret[depth - 1]++; /* set to next element */
/* If this goes beyond the end of the list */
- while(ret[depth-1] >= libvlc_media_list_count(p_parent_of_playing_item, NULL))
+ while(ret[depth-1] >= libvlc_media_list_count(p_parent_of_playing_item))
{
depth--;
if (depth <= 0)
* Returns the path of the last descendant of a given item path.
* Note: Due to the recursive nature of the function and the need to free
* media list paths, paths passed in may be freed if they are replaced.
- Recommended usage is to set return value to the same path that was
+ Recommended usage is to set return value to the same path that was
passed to the function (i.e. item = find_last_item(list, item); )
**************************************************************************/
static libvlc_media_list_path_t
if(p_sublist)
{
- int i_count = libvlc_media_list_count(p_sublist, NULL);
+ int i_count = libvlc_media_list_count(p_sublist);
if(i_count > 0)
{
/* Add the last sublist item to the path. */
}
libvlc_media_list_release(p_sublist);
- }
+ }
return last_item_path;
}
/**************************************************************************
* get_previous_path (private)
*
- * Returns the path to the preceding item in the list.
+ * Returns the path to the preceding item in the list.
* If looping is specified and the current item is the first list item in
* the list it will return the last descendant of the last item in the list.
**************************************************************************/
if (!p_mlp->current_playing_item_path)
{
- if (!libvlc_media_list_count(p_mlp->p_mlist, NULL))
+ if (!libvlc_media_list_count(p_mlp->p_mlist))
return NULL;
return libvlc_media_list_path_with_root_index(0);
}
-
+
/* Try to catch parent element */
p_parent_of_playing_item = libvlc_media_list_parentlist_at_path(
p_mlp->p_mlist,
// Is looping enabled?
if(b_loop)
{
- int i_count = libvlc_media_list_count(p_parent_of_playing_item, NULL);
+ int i_count = libvlc_media_list_count(p_parent_of_playing_item);
/* Set current play item to the last element in the list */
ret[0] = i_count - 1;
{
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);
}
/**************************************************************************
static void
mlist_item_deleted(const libvlc_event_t * p_event, void * p_user_data)
{
- libvlc_media_list_player_t * p_mlp = p_user_data;
- libvlc_media_list_t * p_emitting_mlist = p_event->p_obj;
- libvlc_media_t * p_current_md = NULL;
-
- lock(p_mlp);
- if (p_mlp->current_playing_item_path)
- p_current_md = libvlc_media_list_item_at_path(p_mlp->p_mlist, p_mlp->current_playing_item_path);
-
- if (p_event->u.media_list_item_deleted.item == p_current_md &&
- p_emitting_mlist == p_mlp->p_mlist)
- {
- /* We are playing this item, let's stop */
- stop(p_mlp, NULL);
- }
- unlock(p_mlp);
+ // Nothing to do. For now.
+ (void)p_event; (void)p_user_data;
}
install_playlist_observer(libvlc_media_list_player_t * p_mlp)
{
assert_locked(p_mlp);
- libvlc_event_attach(mlist_em(p_mlp), libvlc_MediaListItemDeleted, mlist_item_deleted, p_mlp, NULL);
+ libvlc_event_attach(mlist_em(p_mlp), libvlc_MediaListItemDeleted, mlist_item_deleted, p_mlp);
}
/**************************************************************************
{
assert_locked(p_mlp);
if (!p_mlp->p_mlist) return;
- libvlc_event_detach(mlist_em(p_mlp), libvlc_MediaListItemDeleted, mlist_item_deleted, p_mlp, NULL);
+ libvlc_event_detach(mlist_em(p_mlp), libvlc_MediaListItemDeleted, mlist_item_deleted, p_mlp);
}
/**************************************************************************
install_media_player_observer(libvlc_media_list_player_t * p_mlp)
{
assert_locked(p_mlp);
- libvlc_event_attach_async(mplayer_em(p_mlp), libvlc_MediaPlayerEndReached, media_player_reached_end, p_mlp, NULL);
+ libvlc_event_attach_async(mplayer_em(p_mlp), libvlc_MediaPlayerEndReached, media_player_reached_end, p_mlp);
}
// Allow callbacks to run, because detach() will wait until all callbacks are processed.
// This is safe because only callbacks are allowed, and there execution will be cancelled.
vlc_mutex_unlock(&p_mlp->mp_callback_lock);
- libvlc_event_detach(mplayer_em(p_mlp), libvlc_MediaPlayerEndReached, media_player_reached_end, p_mlp, NULL);
+ libvlc_event_detach(mplayer_em(p_mlp), libvlc_MediaPlayerEndReached, media_player_reached_end, p_mlp);
// Now, lock back the callback lock. No more callback will be present from this point.
vlc_mutex_lock(&p_mlp->mp_callback_lock);
p_md = libvlc_media_list_item_at_path(p_mlp->p_mlist, path);
if (!p_md)
return;
-
+
/* Make sure media_player_reached_end() won't get called */
uninstall_media_player_observer(p_mlp);
/* 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, NULL);
+ libvlc_media_player_set_media(p_mlp->p_mi, p_md);
install_media_player_observer(p_mlp);
libvlc_media_release(p_md); /* for libvlc_media_list_item_at_index */
* 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 (!p_mlp)
+ if (unlikely(p_mlp == NULL))
+ {
+ libvlc_printerr("Not enough memory");
return NULL;
+ }
+
+ p_mlp->p_event_manager = libvlc_event_manager_new(p_mlp, p_instance);
+ if (unlikely(p_mlp->p_event_manager == NULL))
+ {
+ free (p_mlp);
+ return NULL;
+ }
libvlc_retain(p_instance);
p_mlp->p_libvlc_instance = p_instance;
p_mlp->i_refcount = 1;
vlc_mutex_init(&p_mlp->object_lock);
vlc_mutex_init(&p_mlp->mp_callback_lock);
- p_mlp->p_event_manager = libvlc_event_manager_new(p_mlp, p_instance, p_e);
- libvlc_event_manager_register_event_type(p_mlp->p_event_manager, libvlc_MediaListPlayerNextItemSet, p_e);
+ libvlc_event_manager_register_event_type(p_mlp->p_event_manager, libvlc_MediaListPlayerNextItemSet);
p_mlp->e_playback_mode = libvlc_playback_mode_default;
return p_mlp;
{
uninstall_media_player_observer(p_mlp);
libvlc_media_player_release(p_mlp->p_mi);
- }
+ }
if (p_mlp->p_mlist)
{
uninstall_playlist_observer(p_mlp);
vlc_mutex_destroy(&p_mlp->mp_callback_lock);
libvlc_event_manager_release(p_mlp->p_event_manager);
-
+
free(p_mlp->current_playing_item_path);
libvlc_release(p_mlp->p_libvlc_instance);
free(p_mlp);
/**************************************************************************
* set_media_player (Public)
**************************************************************************/
-void libvlc_media_list_player_set_media_player(libvlc_media_list_player_t * p_mlp, libvlc_media_player_t * p_mi, libvlc_exception_t * p_e)
+void libvlc_media_list_player_set_media_player(libvlc_media_list_player_t * p_mlp, libvlc_media_player_t * p_mi)
{
- VLC_UNUSED(p_e);
-
lock(p_mlp);
if (p_mlp->p_mi)
/**************************************************************************
* set_media_list (Public)
**************************************************************************/
-void libvlc_media_list_player_set_media_list(libvlc_media_list_player_t * p_mlp, libvlc_media_list_t * p_mlist, libvlc_exception_t * p_e)
+void libvlc_media_list_player_set_media_list(libvlc_media_list_player_t * p_mlp, libvlc_media_list_t * p_mlist)
{
assert (p_mlist);
}
libvlc_media_list_retain(p_mlist);
p_mlp->p_mlist = p_mlist;
-
+
install_playlist_observer(p_mlp);
unlock(p_mlp);
/**************************************************************************
* 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);
}
* is_playing (Public)
**************************************************************************/
int
-libvlc_media_list_player_is_playing(libvlc_media_list_player_t * p_mlp, libvlc_exception_t * p_e)
+libvlc_media_list_player_is_playing(libvlc_media_list_player_t * p_mlp)
{
- libvlc_state_t state = libvlc_media_player_get_state(p_mlp->p_mi, p_e);
+ 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);
}
* State (Public)
**************************************************************************/
libvlc_state_t
-libvlc_media_list_player_get_state(libvlc_media_list_player_t * p_mlp, libvlc_exception_t * p_e)
+libvlc_media_list_player_get_state(libvlc_media_list_player_t * p_mlp)
{
if (!p_mlp->p_mi)
return libvlc_Ended;
- return libvlc_media_player_get_state(p_mlp->p_mi, p_e);
+ return libvlc_media_player_get_state(p_mlp->p_mi);
}
/**************************************************************************
* 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)
{
- VLC_UNUSED(p_e);
-
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;
}
/**************************************************************************
*
* Lock must be held.
**************************************************************************/
-static void stop(libvlc_media_list_player_t * p_mlp, libvlc_exception_t * p_e)
+static void stop(libvlc_media_list_player_t * p_mlp)
{
assert_locked(p_mlp);
- if (p_mlp->p_mi && p_mlp->current_playing_item_path)
+ if (p_mlp->p_mi)
{
/* We are not interested in getting media stop event now */
uninstall_media_player_observer(p_mlp);
- libvlc_media_player_stop(p_mlp->p_mi, p_e);
+ libvlc_media_player_stop(p_mlp->p_mi);
install_media_player_observer(p_mlp);
}
/**************************************************************************
* Stop (Public)
**************************************************************************/
-void libvlc_media_list_player_stop(libvlc_media_list_player_t * p_mlp,
- libvlc_exception_t * p_e)
+void libvlc_media_list_player_stop(libvlc_media_list_player_t * p_mlp)
{
lock(p_mlp);
- stop(p_mlp, p_e);
+ stop(p_mlp);
unlock(p_mlp);
}
/**************************************************************************
* Set relative playlist position and play (Private)
*
- * Sets the currently played item to the given relative play item position
+ * Sets the currently played item to the given relative play item position
* (based on the currently playing item) and then begins the new item playback.
- * Lock must be held.
+ * Lock must be held.
**************************************************************************/
-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)
{
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(p_mlp->e_playback_mode != libvlc_playback_mode_repeat)
{
bool b_loop = (p_mlp->e_playback_mode == libvlc_playback_mode_loop);
-
+
if(i_relative_position > 0)
{
do
}
else if(i_relative_position < 0)
{
- do
+ do
{
path = get_previous_path(p_mlp, b_loop);
set_current_playing_item(p_mlp, path);
++i_relative_position;
- }
+ }
while (i_relative_position < 0);
}
}
if (!path)
{
libvlc_media_list_unlock(p_mlp->p_mlist);
- stop(p_mlp, p_e);
- 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;
}
/**************************************************************************
* Set Playback Mode (Public)
**************************************************************************/
-void libvlc_media_list_player_set_playback_mode(
+void libvlc_media_list_player_set_playback_mode(
libvlc_media_list_player_t * p_mlp,
- libvlc_playback_mode_t e_mode,
- libvlc_exception_t * p_e )
+ libvlc_playback_mode_t e_mode )
{
- VLC_UNUSED(p_e);
-
lock(p_mlp);
p_mlp->e_playback_mode = e_mode;
unlock(p_mlp);
projects / vlc / blobdiff