*****************************************************************************/
#include "libvlc_internal.h"
#include <vlc/libvlc.h>
+#include "media_list_path.h"
/*
* Private functions
*
* Simple next item fetcher.
**************************************************************************/
-static int get_next_index( libvlc_media_list_player_t * p_mlp )
+static libvlc_media_list_path_t
+get_next_path( libvlc_media_list_player_t * p_mlp )
{
- /* We are entered with libvlc_media_list_lock( p_mlp->p_list ) */
-
- int next = p_mlp->i_current_playing_index + 1;
-
- if( libvlc_media_list_count( p_mlp->p_mlist, NULL ) >= next )
- return -1; /* no more to play */
-
- return next;
+ /* We are entered with libvlc_media_list_lock( p_mlp->p_list ) */
+ libvlc_media_list_path_t ret;
+ libvlc_media_list_t * p_parent_of_playing_item;
+ libvlc_media_list_t * p_sublist_of_playing_item;
+ 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 )
+ {
+ libvlc_media_list_release( p_sublist_of_playing_item );
+ return libvlc_media_list_path_copy_by_appending( p_mlp->current_playing_item_path, 0 );
+ }
+
+ /* Try to catch next element */
+ p_parent_of_playing_item = libvlc_media_list_parentlist_at_path(
+ p_mlp->p_mlist,
+ p_mlp->current_playing_item_path );
+
+ int deepness = libvlc_media_list_path_deepness( p_mlp->current_playing_item_path );
+ if( deepness < 1 || !p_parent_of_playing_item )
+ return NULL;
+
+ ret = libvlc_media_list_path_copy( p_mlp->current_playing_item_path );
+
+ while( ret[deepness-1] >= libvlc_media_list_count( p_parent_of_playing_item, NULL ) )
+ {
+ deepness--;
+ if( deepness <= 0 )
+ {
+ free( ret );
+ libvlc_media_list_release( p_parent_of_playing_item );
+ return NULL;
+ }
+ ret[deepness] = -1;
+ ret[deepness-1]++;
+ p_parent_of_playing_item = libvlc_media_list_parentlist_at_path(
+ p_mlp->p_mlist,
+ ret );
+ }
+ libvlc_media_list_release( p_parent_of_playing_item );
+ return ret;
}
/**************************************************************************
* media_instance_reached_end (private) (Event Callback)
**************************************************************************/
-static void
+static void
media_instance_reached_end( const libvlc_event_t * p_event,
void * p_user_data )
{
- libvlc_media_list_player_t * p_mlp = p_user_data;
- libvlc_media_instance_t * p_mi = p_event->p_obj;
+ libvlc_media_list_player_t * p_mlp = p_user_data;
+ libvlc_media_instance_t * p_mi = p_event->p_obj;
libvlc_media_descriptor_t *p_md, * p_current_md;
+
p_md = libvlc_media_instance_get_media_descriptor( p_mi, NULL );
/* XXX: need if p_mlp->p_current_playing_index is beyond */
- p_current_md = libvlc_media_list_item_at_index(
+ p_current_md = libvlc_media_list_item_at_path(
p_mlp->p_mlist,
- p_mlp->i_current_playing_index,
- NULL );
- if( p_md != p_current_md )
- {
- msg_Warn( p_mlp->p_libvlc_instance->p_libvlc_int,
- "We are not sync-ed with the media instance" );
+ p_mlp->current_playing_item_path );
+ if( p_md != p_current_md )
+ {
+ msg_Warn( p_mlp->p_libvlc_instance->p_libvlc_int,
+ "We are not sync-ed with the media instance" );
libvlc_media_descriptor_release( p_md );
libvlc_media_descriptor_release( p_current_md );
- return;
- }
+ return;
+ }
libvlc_media_descriptor_release( p_md );
libvlc_media_descriptor_release( p_current_md );
- libvlc_media_list_player_next( p_mlp, NULL );
+ libvlc_media_list_player_next( p_mlp, NULL );
}
/**************************************************************************
* playlist_item_deleted (private) (Event Callback)
**************************************************************************/
-static void
+static void
mlist_item_deleted( const libvlc_event_t * p_event, void * p_user_data )
{
- libvlc_media_descriptor_t * p_current_md;
- libvlc_media_list_player_t * p_mlp = p_user_data;
- libvlc_media_list_t * p_emitting_mlist = p_event->p_obj;
+ libvlc_media_descriptor_t * p_current_md;
+ libvlc_media_list_player_t * p_mlp = p_user_data;
+ libvlc_media_list_t * p_emitting_mlist = p_event->p_obj;
/* XXX: need if p_mlp->p_current_playing_index is beyond */
- p_current_md = libvlc_media_list_item_at_index(
+ p_current_md = libvlc_media_list_item_at_path(
p_mlp->p_mlist,
- p_mlp->i_current_playing_index,
- NULL );
-
- if( p_event->u.media_list_item_deleted.item == p_current_md &&
- p_emitting_mlist == p_mlp->p_mlist )
- {
- /* We are playing this item, we choose to stop */
- libvlc_media_list_player_stop( p_mlp, NULL );
- }
+ 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, we choose to stop */
+ libvlc_media_list_player_stop( p_mlp, NULL );
+ }
}
/**************************************************************************
static void
install_playlist_observer( libvlc_media_list_player_t * p_mlp )
{
- libvlc_event_attach( libvlc_media_list_event_manager( p_mlp->p_mlist, NULL ),
+ libvlc_event_attach( libvlc_media_list_event_manager( p_mlp->p_mlist, NULL ),
libvlc_MediaListItemDeleted, mlist_item_deleted, p_mlp, NULL );
}
static void
install_media_instance_observer( libvlc_media_list_player_t * p_mlp )
{
- libvlc_event_attach( libvlc_media_instance_event_manager( p_mlp->p_mi, NULL ),
+ libvlc_event_attach( libvlc_media_instance_event_manager( p_mlp->p_mi, NULL ),
libvlc_MediaInstanceReachedEnd,
- media_instance_reached_end, p_mlp, NULL );
+ media_instance_reached_end, p_mlp, NULL );
}
static void
uninstall_media_instance_observer( libvlc_media_list_player_t * p_mlp )
{
- libvlc_event_detach( libvlc_media_instance_event_manager( p_mlp->p_mi, NULL ),
+ libvlc_event_detach( libvlc_media_instance_event_manager( p_mlp->p_mi, NULL ),
libvlc_MediaInstanceReachedEnd,
- media_instance_reached_end, p_mlp, NULL );
+ media_instance_reached_end, p_mlp, NULL );
}
+
/**************************************************************************
* Stop (Public)
**************************************************************************/
libvlc_media_list_player_is_playing( libvlc_media_list_player_t * p_mlp,
libvlc_exception_t * p_e )
{
- libvlc_exception_raise( p_e, "Unimplemented" );
- return 0;
+ //libvlc_exception_raise( p_e, "Unimplemented" );
+ return 1;
}
+/**************************************************************************
+ * set_current_playing_item (private)
+ *
+ * Playlist lock should be held
+ **************************************************************************/
+static void
+set_current_playing_item( libvlc_media_list_player_t * p_mlp,
+ libvlc_media_list_path_t path,
+ libvlc_exception_t * p_e )
+{
+ libvlc_media_descriptor_t * p_md;
+
+ p_md = libvlc_media_list_item_at_path( p_mlp->p_mlist, path );
+ if( !p_md )
+ {
+ if( !libvlc_exception_raised( p_e ) )
+ libvlc_exception_raise( p_e, "Can't obtain a media" );
+ return;
+ }
+
+ vlc_mutex_lock( &p_mlp->object_lock );
+
+ free( p_mlp->current_playing_item_path );
+ p_mlp->current_playing_item_path = path;
+
+ /* We are not interested in getting media_descriptor stop event now */
+ uninstall_media_instance_observer( p_mlp );
+ if( p_md->p_subitems && libvlc_media_list_count( p_md->p_subitems, NULL ) > 0 )
+ {
+ libvlc_media_descriptor_t * p_submd;
+ p_submd = libvlc_media_list_item_at_index( p_md->p_subitems, 0, NULL );
+ libvlc_media_instance_set_media_descriptor( p_mlp->p_mi, p_submd, NULL );
+ libvlc_media_descriptor_release( p_submd );
+ }
+ else
+ libvlc_media_instance_set_media_descriptor( p_mlp->p_mi, p_md, NULL );
+// wait_playing_state(); /* If we want to be synchronous */
+ install_media_instance_observer( p_mlp );
+
+ vlc_mutex_unlock( &p_mlp->object_lock );
+
+ libvlc_media_list_unlock( p_mlp->p_mlist );
+
+ libvlc_media_descriptor_release( p_md ); /* for libvlc_media_list_item_at_index */
+}
/*
* Public libvlc functions
*/
/**************************************************************************
- * libvlc_media_list_player_new (Public)
+ * new (Public)
**************************************************************************/
libvlc_media_list_player_t *
libvlc_media_list_player_new( libvlc_instance_t * p_instance,
(void)p_e;
libvlc_media_list_player_t * p_mlp;
p_mlp = malloc(sizeof(libvlc_media_list_player_t));
- p_mlp->i_current_playing_index = -1;
-
+ p_mlp->current_playing_item_path = NULL;
+ p_mlp->p_mi = NULL;
+ p_mlp->p_mlist = NULL;
vlc_mutex_init( p_instance->p_libvlc_int, &p_mlp->object_lock );
-
- return p_mlp;
+ 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_e );
+
+ return p_mlp;
}
/**************************************************************************
- * libvlc_media_list_player_release (Public)
+ * release (Public)
**************************************************************************/
void libvlc_media_list_player_release( libvlc_media_list_player_t * p_mlp )
{
}
/**************************************************************************
- * libvlc_media_list_player_set_media_instance (Public)
+ * set_media_instance (Public)
**************************************************************************/
void libvlc_media_list_player_set_media_instance(
libvlc_media_list_player_t * p_mlp,
{
vlc_mutex_lock( &p_mlp->object_lock );
- if( p_mlp->p_mi )
- {
- uninstall_playlist_observer( p_mlp );
- libvlc_media_instance_release( p_mlp->p_mi );
- }
- libvlc_media_instance_retain( p_mi );
- p_mlp->p_mi = p_mi;
+ if( p_mlp->p_mi )
+ {
+ uninstall_media_instance_observer( p_mlp );
+ libvlc_media_instance_release( p_mlp->p_mi );
+ }
+ libvlc_media_instance_retain( p_mi );
+ p_mlp->p_mi = p_mi;
install_media_instance_observer( p_mlp );
}
/**************************************************************************
- * Set a playlist (Public)
+ * set_media_list (Public)
**************************************************************************/
void libvlc_media_list_player_set_media_list(
libvlc_media_list_player_t * p_mlp,
libvlc_exception_t * p_e )
{
vlc_mutex_lock( &p_mlp->object_lock );
-
- if( libvlc_media_list_player_is_playing( p_mlp, p_e ) )
- libvlc_media_list_player_stop( p_mlp, p_e );
-
- if( p_mlp->p_mlist )
- {
- uninstall_playlist_observer( p_mlp );
- libvlc_media_list_release( p_mlp->p_mlist );
- }
- libvlc_media_list_retain( p_mlist );
- p_mlp->p_mlist = p_mlist;
-
- install_playlist_observer( p_mlp );
+
+ if( libvlc_media_list_player_is_playing( p_mlp, p_e ) )
+ {
+ libvlc_media_instance_stop( p_mlp->p_mi, p_e );
+ /* Don't bother if there was an error. */
+ libvlc_exception_clear( p_e );
+ }
+
+ if( p_mlp->p_mlist )
+ {
+ uninstall_playlist_observer( p_mlp );
+ libvlc_media_list_release( p_mlp->p_mlist );
+ }
+ libvlc_media_list_retain( p_mlist );
+ p_mlp->p_mlist = p_mlist;
+
+ install_playlist_observer( p_mlp );
vlc_mutex_unlock( &p_mlp->object_lock );
}
void libvlc_media_list_player_play( libvlc_media_list_player_t * p_mlp,
libvlc_exception_t * p_e )
{
- libvlc_media_list_player_next( p_mlp, p_e );
+ if( !p_mlp->current_playing_item_path )
+ {
+ libvlc_media_list_player_next( p_mlp, p_e );
+ return; /* Will set to play */
+ }
- if( libvlc_exception_raised( p_e ) )
- return;
+ libvlc_media_instance_play( p_mlp->p_mi, p_e );
+}
- libvlc_media_instance_play( p_mlp->p_mi, p_e );
+/**************************************************************************
+ * 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 )
+{
+ set_current_playing_item( p_mlp, libvlc_media_list_path_with_root_index(i_index), p_e );
+
+ if( libvlc_exception_raised( p_e ) )
+ return;
+
+ /* Send the next item event */
+ libvlc_event_t event;
+ event.type = libvlc_MediaListPlayerNextItemSet;
+ libvlc_event_send( p_mlp->p_event_manager, &event );
+
+ libvlc_media_instance_play( p_mlp->p_mi, p_e );
+}
+
+/**************************************************************************
+ * Play item (Public)
+ **************************************************************************/
+void libvlc_media_list_player_play_item(
+ libvlc_media_list_player_t * p_mlp,
+ libvlc_media_descriptor_t * p_md,
+ libvlc_exception_t * p_e )
+{
+ 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, "No such item in media list" );
+ return;
+ }
+ set_current_playing_item( p_mlp, path, p_e );
+
+ if( libvlc_exception_raised( p_e ) )
+ return;
+
+ libvlc_media_instance_play( p_mlp->p_mi, p_e );
}
/**************************************************************************
void libvlc_media_list_player_stop( libvlc_media_list_player_t * p_mlp,
libvlc_exception_t * p_e )
{
- libvlc_media_instance_stop( p_mlp->p_mi, p_e );
+ libvlc_media_instance_stop( p_mlp->p_mi, p_e );
vlc_mutex_lock( &p_mlp->object_lock );
- p_mlp->i_current_playing_index = -1;
+ p_mlp->current_playing_item_path = NULL;
vlc_mutex_unlock( &p_mlp->object_lock );
}
**************************************************************************/
void libvlc_media_list_player_next( libvlc_media_list_player_t * p_mlp,
libvlc_exception_t * p_e )
-{
- libvlc_media_descriptor_t * p_md;
-
- int index;
-
- libvlc_media_list_lock( p_mlp->p_mlist );
-
- index = get_next_index( p_mlp );
-
- if( index < 0 )
- {
- libvlc_media_list_unlock( p_mlp->p_mlist );
- libvlc_exception_raise( p_e, "No more element to play" );
- libvlc_media_list_player_stop( p_mlp, p_e );
- return;
- }
-
- p_md = libvlc_media_list_item_at_index( p_mlp->p_mlist, index, p_e );
- if( !p_md )
- {
- libvlc_media_list_unlock( p_mlp->p_mlist );
- if( !libvlc_exception_raised( p_e ) )
- libvlc_exception_raise( p_e, "Can't obtain a media" );
- return;
- }
+{
+ libvlc_media_list_path_t path;
+
+ libvlc_media_list_lock( p_mlp->p_mlist );
- vlc_mutex_lock( &p_mlp->object_lock );
-
- p_mlp->i_current_playing_index = index;
+ path = get_next_path( p_mlp );
- /* We are not interested in getting media_descriptor stop event now */
- uninstall_media_instance_observer( p_mlp );
- libvlc_media_instance_set_media_descriptor( p_mlp->p_mi, p_md, NULL );
-// wait_playing_state(); /* If we want to be synchronous */
- install_media_instance_observer( p_mlp );
+ if( !path )
+ {
+ libvlc_media_list_unlock( p_mlp->p_mlist );
+ libvlc_exception_raise( p_e, "No more element to play" );
+ libvlc_media_list_player_stop( p_mlp, p_e );
+ return;
+ }
- vlc_mutex_unlock( &p_mlp->object_lock );
+ set_current_playing_item( p_mlp, path, p_e );
+
+ libvlc_media_instance_play( p_mlp->p_mi, p_e );
- libvlc_media_list_unlock( p_mlp->p_mlist );
-
- libvlc_media_descriptor_release( p_md ); /* for libvlc_media_list_item_at_index */
-}
+ libvlc_media_list_unlock( p_mlp->p_mlist );
+ /* Send the next item event */
+ libvlc_event_t event;
+ event.type = libvlc_MediaListPlayerNextItemSet;
+ libvlc_event_send( p_mlp->p_event_manager, &event);
+}
projects / vlc / blobdiff