* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include "libvlc_internal.h"
+
#include <vlc/libvlc.h>
+#include <vlc/libvlc_media.h>
+#include <vlc/libvlc_media_list.h>
+#include <vlc/libvlc_media_player.h>
+#include <vlc/libvlc_media_list_player.h>
+#include <vlc/libvlc_events.h>
+
+#include "libvlc_internal.h"
+
+#include "media_internal.h" // Abuse, could and should be removed
#include "media_list_path.h"
+//#define DEBUG_MEDIA_LIST_PLAYER
+
+struct libvlc_media_list_player_t
+{
+ libvlc_event_manager_t * p_event_manager;
+ libvlc_instance_t * p_libvlc_instance;
+ int i_refcount;
+ vlc_mutex_t object_lock;
+ libvlc_media_list_path_t current_playing_item_path;
+ libvlc_media_t * p_current_playing_item;
+ libvlc_media_list_t * p_mlist;
+ libvlc_media_player_t * p_mi;
+};
+
/*
* Private functions
*/
libvlc_media_list_path_t ret;
libvlc_media_list_t * p_parent_of_playing_item;
libvlc_media_list_t * p_sublist_of_playing_item;
+
+ if ( !p_mlp->current_playing_item_path )
+ {
+ if( !libvlc_media_list_count( p_mlp->p_mlist, NULL ) )
+ 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 );
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 )
+ int depth = libvlc_media_list_path_depth( p_mlp->current_playing_item_path );
+ if( depth < 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 ) )
+ ret[depth-1]++; // Play next element
+
+ /* If this goes beyong the end of the list */
+ while( ret[depth-1] >= libvlc_media_list_count( p_parent_of_playing_item, NULL ) )
{
- deepness--;
- if( deepness <= 0 )
+ depth--;
+ if( depth <= 0 )
{
free( ret );
libvlc_media_list_release( p_parent_of_playing_item );
return NULL;
}
- ret[deepness] = -1;
- ret[deepness-1]++;
+ ret[depth] = -1;
+ ret[depth-1]++;
p_parent_of_playing_item = libvlc_media_list_parentlist_at_path(
p_mlp->p_mlist,
ret );
}
/**************************************************************************
- * media_instance_reached_end (private) (Event Callback)
+ * media_player_reached_end (private) (Event Callback)
**************************************************************************/
static void
-media_instance_reached_end( const libvlc_event_t * p_event,
+media_player_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_descriptor_t *p_md, * p_current_md;
+ libvlc_media_player_t * p_mi = p_event->p_obj;
+ libvlc_media_t *p_md, * p_current_md;
- p_md = libvlc_media_instance_get_media_descriptor( p_mi, NULL );
+ p_md = libvlc_media_player_get_media( p_mi, NULL );
/* XXX: need if p_mlp->p_current_playing_index is beyond */
p_current_md = libvlc_media_list_item_at_path(
p_mlp->p_mlist,
{
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 );
+ libvlc_media_release( p_md );
+ libvlc_media_release( p_current_md );
return;
}
- libvlc_media_descriptor_release( p_md );
- libvlc_media_descriptor_release( p_current_md );
- libvlc_media_list_player_next( p_mlp, NULL );
+ libvlc_media_release( p_md );
+ libvlc_media_release( p_current_md );
+ libvlc_exception_t e;
+ libvlc_exception_init(&e);
+ libvlc_media_list_player_next(p_mlp, &e);
+ libvlc_exception_clear(&e); // Don't worry if there was an error
}
/**************************************************************************
static void
mlist_item_deleted( const libvlc_event_t * p_event, void * p_user_data )
{
- libvlc_media_descriptor_t * p_current_md;
+ libvlc_media_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 */
static void
uninstall_playlist_observer( libvlc_media_list_player_t * p_mlp )
{
+ if ( !p_mlp->p_mlist )
+ {
+ return;
+ }
+
libvlc_event_detach( libvlc_media_list_event_manager( p_mlp->p_mlist, NULL ),
libvlc_MediaListItemDeleted, mlist_item_deleted, p_mlp, NULL );
}
/**************************************************************************
- * install_media_instance_observer (private)
+ * install_media_player_observer (private)
**************************************************************************/
static void
-install_media_instance_observer( libvlc_media_list_player_t * p_mlp )
+install_media_player_observer( libvlc_media_list_player_t * p_mlp )
{
- libvlc_event_attach( libvlc_media_instance_event_manager( p_mlp->p_mi, NULL ),
- libvlc_MediaInstanceReachedEnd,
- media_instance_reached_end, p_mlp, NULL );
+ libvlc_event_attach_async( libvlc_media_player_event_manager( p_mlp->p_mi, NULL ),
+ libvlc_MediaPlayerEndReached,
+ media_player_reached_end, p_mlp, NULL );
}
/**************************************************************************
- * uninstall_media_instance_observer (private)
+ * uninstall_media_player_observer (private)
**************************************************************************/
static void
-uninstall_media_instance_observer( libvlc_media_list_player_t * p_mlp )
+uninstall_media_player_observer( libvlc_media_list_player_t * p_mlp )
{
- libvlc_event_detach( libvlc_media_instance_event_manager( p_mlp->p_mi, NULL ),
- libvlc_MediaInstanceReachedEnd,
- media_instance_reached_end, p_mlp, NULL );
+ if ( !p_mlp->p_mi )
+ return;
+
+ libvlc_event_detach( libvlc_media_player_event_manager( p_mlp->p_mi, NULL ),
+ libvlc_MediaPlayerEndReached,
+ media_player_reached_end, p_mlp, NULL );
}
/**************************************************************************
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 );
+ VLC_UNUSED(p_e);
+
+ libvlc_media_t * p_md;
+
+ p_md = libvlc_media_list_item_at_path( p_mlp->p_mlist, path );
vlc_mutex_lock( &p_mlp->object_lock );
-
- free( p_mlp->current_playing_item_path );
- p_mlp->current_playing_item_path = path;
+
+ if( p_mlp->current_playing_item_path != path )
+ {
+ free( p_mlp->current_playing_item_path );
+ p_mlp->current_playing_item_path = path;
+ }
if( !p_md )
{
return;
}
- /* We are not interested in getting media_descriptor stop event now */
- uninstall_media_instance_observer( p_mlp );
+ /* We are not interested in getting media stop event now */
+ uninstall_media_player_observer( p_mlp );
+
+ if ( !p_mlp->p_mi )
+ {
+ p_mlp->p_mi = libvlc_media_player_new_from_media(p_md, p_e);
+ }
+
if( p_md->p_subitems && libvlc_media_list_count( p_md->p_subitems, NULL ) > 0 )
{
- libvlc_media_descriptor_t * p_submd;
+ libvlc_media_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 );
+ libvlc_media_player_set_media( p_mlp->p_mi, p_submd, NULL );
+ libvlc_media_release( p_submd );
}
else
- libvlc_media_instance_set_media_descriptor( p_mlp->p_mi, p_md, NULL );
+ libvlc_media_player_set_media( p_mlp->p_mi, p_md, NULL );
// wait_playing_state(); /* If we want to be synchronous */
- install_media_instance_observer( p_mlp );
+ install_media_player_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 */
+ libvlc_media_release( p_md ); /* for libvlc_media_list_item_at_index */
}
/*
(void)p_e;
libvlc_media_list_player_t * p_mlp;
p_mlp = malloc(sizeof(libvlc_media_list_player_t));
+ if( !p_mlp )
+ return NULL;
+
+ libvlc_retain( p_instance );
+ p_mlp->p_libvlc_instance = p_instance;
+ p_mlp->i_refcount = 0;
+ vlc_mutex_init( &p_mlp->object_lock );
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 );
+ p_mlp->p_mi = NULL;
p_mlp->p_event_manager = libvlc_event_manager_new( p_mlp,
p_instance,
p_e );
**************************************************************************/
void libvlc_media_list_player_release( libvlc_media_list_player_t * p_mlp )
{
- free(p_mlp);
+ if( !p_mlp )
+ return;
+
+ vlc_mutex_lock( &p_mlp->object_lock );
+
+ p_mlp->i_refcount--;
+ if( p_mlp->i_refcount > 0 )
+ {
+ vlc_mutex_unlock( &p_mlp->object_lock );
+ return;
+ }
+ vlc_mutex_unlock( &p_mlp->object_lock );
+ vlc_mutex_destroy( &p_mlp->object_lock );
+
+ libvlc_event_manager_release( p_mlp->p_event_manager );
+ libvlc_media_player_release( p_mlp->p_mi );
+
+ if( p_mlp->p_mlist )
+ {
+ uninstall_playlist_observer( p_mlp );
+ libvlc_media_list_release( p_mlp->p_mlist );
+ }
+
+ free( p_mlp->current_playing_item_path );
+ libvlc_release( p_mlp->p_libvlc_instance );
+ free( p_mlp );
}
/**************************************************************************
- * set_media_instance (Public)
+ * set_media_player (Public)
**************************************************************************/
-void libvlc_media_list_player_set_media_instance(
+void libvlc_media_list_player_set_media_player(
libvlc_media_list_player_t * p_mlp,
- libvlc_media_instance_t * p_mi,
+ libvlc_media_player_t * p_mi,
libvlc_exception_t * p_e )
{
+ VLC_UNUSED(p_e);
+
vlc_mutex_lock( &p_mlp->object_lock );
if( p_mlp->p_mi )
{
- uninstall_media_instance_observer( p_mlp );
- libvlc_media_instance_release( p_mlp->p_mi );
+ uninstall_media_player_observer( p_mlp );
+ libvlc_media_player_release( p_mlp->p_mi );
}
- libvlc_media_instance_retain( p_mi );
+ libvlc_media_player_retain( p_mi );
p_mlp->p_mi = p_mi;
- install_media_instance_observer( p_mlp );
+ install_media_player_observer( p_mlp );
vlc_mutex_unlock( &p_mlp->object_lock );
}
libvlc_exception_t * p_e )
{
vlc_mutex_lock( &p_mlp->object_lock );
-
+
+ if(!p_mlist)
+ {
+ libvlc_exception_raise( p_e, "No media list provided");
+ return;
+ }
+
if( libvlc_media_list_player_is_playing( p_mlp, p_e ) )
{
- libvlc_media_instance_stop( p_mlp->p_mi, p_e );
+ libvlc_media_player_stop( p_mlp->p_mi, p_e );
/* Don't bother if there was an error. */
libvlc_exception_clear( p_e );
}
return; /* Will set to play */
}
- libvlc_media_instance_play( p_mlp->p_mi, p_e );
+ libvlc_media_player_play( p_mlp->p_mi, p_e );
}
{
if( !p_mlp->p_mi )
return;
- libvlc_media_instance_pause( p_mlp->p_mi, p_e );
+ libvlc_media_player_pause( p_mlp->p_mi, p_e );
}
/**************************************************************************
* is_playing (Public)
**************************************************************************/
-vlc_bool_t
+int
libvlc_media_list_player_is_playing( libvlc_media_list_player_t * p_mlp,
libvlc_exception_t * p_e )
{
- libvlc_state_t state = libvlc_media_instance_get_state( p_mlp->p_mi, p_e );
+ libvlc_state_t state = libvlc_media_player_get_state( p_mlp->p_mi, p_e );
return (state == libvlc_Opening) || (state == libvlc_Buffering) ||
(state == libvlc_Playing);
}
libvlc_exception_t * p_e )
{
if( !p_mlp->p_mi )
- return libvlc_Stopped;
- return libvlc_media_instance_get_state( p_mlp->p_mi, p_e );
+ return libvlc_Ended;
+ return libvlc_media_player_get_state( p_mlp->p_mi, p_e );
}
/**************************************************************************
event.type = libvlc_MediaListPlayerNextItemSet;
libvlc_event_send( p_mlp->p_event_manager, &event );
- libvlc_media_instance_play( p_mlp->p_mi, p_e );
+ libvlc_media_player_play( p_mlp->p_mi, p_e );
}
/**************************************************************************
**************************************************************************/
void libvlc_media_list_player_play_item(
libvlc_media_list_player_t * p_mlp,
- libvlc_media_descriptor_t * p_md,
+ libvlc_media_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( libvlc_exception_raised( p_e ) )
return;
- libvlc_media_instance_play( p_mlp->p_mi, p_e );
+ libvlc_media_player_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 );
+ 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 );
+ install_media_player_observer( p_mlp );
+ }
vlc_mutex_lock( &p_mlp->object_lock );
free( p_mlp->current_playing_item_path );
**************************************************************************/
void libvlc_media_list_player_next( libvlc_media_list_player_t * p_mlp,
libvlc_exception_t * p_e )
-{
+{
libvlc_media_list_path_t path;
-
+
+ if (! p_mlp->p_mlist )
+ {
+ libvlc_exception_raise( p_e, "No more element to play" );
+ return;
+ }
+
libvlc_media_list_lock( p_mlp->p_mlist );
path = get_next_path( p_mlp );
+#ifdef DEBUG_MEDIA_LIST_PLAYER
+ printf("Playing:");
+ libvlc_media_list_path_dump(path);
+#endif
+
if( !path )
{
libvlc_media_list_unlock( p_mlp->p_mlist );
}
set_current_playing_item( p_mlp, path, p_e );
-
- libvlc_media_instance_play( p_mlp->p_mi, p_e );
+
+ libvlc_media_player_play( p_mlp->p_mi, p_e );
libvlc_media_list_unlock( p_mlp->p_mlist );
projects / vlc / blobdiff