X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Fmedia_list_player.c;h=40b45dba0b70e8cec0662d770da64d24b3e1f080;hb=d253749f68a85d8c720e66e4a0f7ad9693ba84e3;hp=ce39292c82d89681f0822d6cd1867f8e0d2f70ff;hpb=6ee1e193fd896ab9a4729fde14f009d9ce629815;p=vlc diff --git a/src/control/media_list_player.c b/src/control/media_list_player.c index ce39292c82..40b45dba0b 100644 --- a/src/control/media_list_player.c +++ b/src/control/media_list_player.c @@ -40,6 +40,12 @@ get_next_path( libvlc_media_list_player_t * p_mlp ) 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 ) + { + p_mlp->current_playing_item_path = libvlc_media_list_path_empty(); + } + p_sublist_of_playing_item = libvlc_media_list_sublist_at_path( p_mlp->p_mlist, p_mlp->current_playing_item_path ); @@ -82,17 +88,17 @@ get_next_path( libvlc_media_list_player_t * p_mlp ) } /************************************************************************** - * 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, @@ -101,12 +107,12 @@ media_instance_reached_end( const libvlc_event_t * p_event, { 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_release( p_md ); + libvlc_media_release( p_current_md ); libvlc_media_list_player_next( p_mlp, NULL ); } @@ -116,7 +122,7 @@ media_instance_reached_end( const libvlc_event_t * p_event, 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 */ @@ -148,42 +154,41 @@ install_playlist_observer( libvlc_media_list_player_t * p_mlp ) 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( 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; + } -/************************************************************************** - * Stop (Public) - **************************************************************************/ -static vlc_bool_t -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 1; + libvlc_event_detach( libvlc_media_player_event_manager( p_mlp->p_mi, NULL ), + libvlc_MediaPlayerEndReached, + media_player_reached_end, p_mlp, NULL ); } /************************************************************************** @@ -196,40 +201,45 @@ 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; + VLC_UNUSED(p_e); + + libvlc_media_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; - } - + 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; - /* We are not interested in getting media_descriptor stop event now */ - uninstall_media_instance_observer( p_mlp ); + if( !p_md ) + { + vlc_mutex_unlock( &p_mlp->object_lock ); + return; + } + + /* 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 */ } /* @@ -249,14 +259,12 @@ libvlc_media_list_player_new( libvlc_instance_t * p_instance, 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 ); + vlc_mutex_init( &p_mlp->object_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_e ); return p_mlp; } @@ -270,24 +278,26 @@ void libvlc_media_list_player_release( libvlc_media_list_player_t * 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 ); } @@ -304,7 +314,7 @@ void libvlc_media_list_player_set_media_list( 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 ); } @@ -334,7 +344,44 @@ void libvlc_media_list_player_play( libvlc_media_list_player_t * p_mlp, 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 ); +} + + +/************************************************************************** + * Pause (Public) + **************************************************************************/ +void libvlc_media_list_player_pause( libvlc_media_list_player_t * p_mlp, + libvlc_exception_t * p_e ) +{ + if( !p_mlp->p_mi ) + return; + libvlc_media_player_pause( p_mlp->p_mi, p_e ); +} + +/************************************************************************** + * is_playing (Public) + **************************************************************************/ +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_player_get_state( p_mlp->p_mi, p_e ); + return (state == libvlc_Opening) || (state == libvlc_Buffering) || + (state == libvlc_Forward) || (state == libvlc_Backward) || + (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 ) +{ + if( !p_mlp->p_mi ) + return libvlc_Ended; + return libvlc_media_player_get_state( p_mlp->p_mi, p_e ); } /************************************************************************** @@ -355,7 +402,7 @@ void libvlc_media_list_player_play_item_at_index( 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 ); } /************************************************************************** @@ -363,7 +410,7 @@ void libvlc_media_list_player_play_item_at_index( **************************************************************************/ 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 ); @@ -377,7 +424,7 @@ void libvlc_media_list_player_play_item( 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 ); } /************************************************************************** @@ -386,9 +433,16 @@ void libvlc_media_list_player_play_item( 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 ); p_mlp->current_playing_item_path = NULL; vlc_mutex_unlock( &p_mlp->object_lock ); } @@ -398,9 +452,15 @@ void libvlc_media_list_player_stop( libvlc_media_list_player_t * p_mlp, **************************************************************************/ 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 ); @@ -414,8 +474,8 @@ void libvlc_media_list_player_next( libvlc_media_list_player_t * p_mlp, } 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 );