X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Fmedia_player.c;h=a52fa0cbe69ca11f39561aa3ca0cf3e998ed8615;hb=76cd2393dca4b0b4022b5a0857800cc3e2b59434;hp=20faa24707355ad2e92b16b399ac893cb2d3fcc1;hpb=c25f5114ce35167be8cc4112dda08a189dfc24e9;p=vlc diff --git a/src/control/media_player.c b/src/control/media_player.c index 20faa24707..a52fa0cbe6 100644 --- a/src/control/media_player.c +++ b/src/control/media_player.c @@ -26,12 +26,12 @@ #include #include #include +#include #include "libvlc.h" -static int -input_state_changed( vlc_object_t * p_this, char const * psz_cmd, - vlc_value_t oldval, vlc_value_t newval, - void * p_userdata ); +static void +input_state_changed( const vlc_event_t * event, void * p_userdata ); + static int input_seekable_changed( vlc_object_t * p_this, char const * psz_cmd, vlc_value_t oldval, vlc_value_t newval, @@ -51,18 +51,22 @@ input_time_changed( vlc_object_t * p_this, char const * psz_cmd, static const libvlc_state_t vlc_to_libvlc_state_array[] = { - [INIT_S] = libvlc_Opening, + [INIT_S] = libvlc_NothingSpecial, [OPENING_S] = libvlc_Opening, - [BUFFERING_S] = libvlc_Buffering, - [PLAYING_S] = libvlc_Playing, - [PAUSE_S] = libvlc_Paused, - [END_S] = libvlc_Ended, - [ERROR_S] = libvlc_Error, + [BUFFERING_S] = libvlc_Buffering, + [PLAYING_S] = libvlc_Playing, + [PAUSE_S] = libvlc_Paused, + [STOP_S] = libvlc_Stopped, + [FORWARD_S] = libvlc_Forward, + [BACKWARD_S] = libvlc_Backward, + [END_S] = libvlc_Ended, + [ERROR_S] = libvlc_Error, }; + static inline libvlc_state_t vlc_to_libvlc_state( int vlc_state ) { if( vlc_state < 0 || vlc_state > 6 ) - return libvlc_Stopped; + return libvlc_Ended; return vlc_to_libvlc_state_array[vlc_state]; } @@ -84,7 +88,8 @@ static void release_input_thread( libvlc_media_player_t *p_mi ) /* No one is tracking this input_thread appart us. Destroy it */ if( p_mi->b_own_its_input_thread ) { - var_DelCallback( p_input_thread, "state", input_state_changed, p_mi ); + vlc_event_manager_t * p_em = input_get_event_manager( p_input_thread ); + vlc_event_detach( p_em, vlc_InputStateChanged, input_state_changed, p_mi ); var_DelCallback( p_input_thread, "seekable", input_seekable_changed, p_mi ); var_DelCallback( p_input_thread, "pausable", input_pausable_changed, p_mi ); var_DelCallback( p_input_thread, "intf-change", input_position_changed, p_mi ); @@ -113,7 +118,7 @@ input_thread_t *libvlc_get_input_thread( libvlc_media_player_t *p_mi, input_thread_t *p_input_thread; if( !p_mi ) RAISENULL( "Media Instance is NULL" ); - + vlc_mutex_lock( &p_mi->object_lock ); if( !p_mi->p_input_thread ) @@ -131,44 +136,63 @@ input_thread_t *libvlc_get_input_thread( libvlc_media_player_t *p_mi, } /* - * input_state_changed (Private) (input var "state" Callback) + * input_state_changed (Private) (vlc_InputStateChanged callback) */ -static int -input_state_changed( vlc_object_t * p_this, char const * psz_cmd, - vlc_value_t oldval, vlc_value_t newval, - void * p_userdata ) +static void +input_state_changed( const vlc_event_t * event, void * p_userdata ) { - VLC_UNUSED(oldval); - VLC_UNUSED(p_this); - VLC_UNUSED(psz_cmd); libvlc_media_player_t * p_mi = p_userdata; - libvlc_event_t event; - libvlc_event_type_t type = newval.i_int; + libvlc_event_t forwarded_event; + libvlc_event_type_t type = event->u.input_state_changed.new_state; switch ( type ) { - case END_S: + case INIT_S: libvlc_media_set_state( p_mi->p_md, libvlc_NothingSpecial, NULL); - event.type = libvlc_MediaPlayerEndReached; + forwarded_event.type = libvlc_MediaPlayerNothingSpecial; break; - case PAUSE_S: - libvlc_media_set_state( p_mi->p_md, libvlc_Playing, NULL); - event.type = libvlc_MediaPlayerPaused; + case OPENING_S: + libvlc_media_set_state( p_mi->p_md, libvlc_Opening, NULL); + forwarded_event.type = libvlc_MediaPlayerOpening; + break; + case BUFFERING_S: + libvlc_media_set_state( p_mi->p_md, libvlc_Buffering, NULL); + forwarded_event.type = libvlc_MediaPlayerBuffering; break; case PLAYING_S: libvlc_media_set_state( p_mi->p_md, libvlc_Playing, NULL); - event.type = libvlc_MediaPlayerPlayed; + forwarded_event.type = libvlc_MediaPlayerPlaying; + break; + case PAUSE_S: + libvlc_media_set_state( p_mi->p_md, libvlc_Paused, NULL); + forwarded_event.type = libvlc_MediaPlayerPaused; break; + case STOP_S: + libvlc_media_set_state( p_mi->p_md, libvlc_Stopped, NULL); + forwarded_event.type = libvlc_MediaPlayerStopped; + break; + case FORWARD_S: + libvlc_media_set_state( p_mi->p_md, libvlc_Forward, NULL); + forwarded_event.type = libvlc_MediaPlayerForward; + break; + case BACKWARD_S: + libvlc_media_set_state( p_mi->p_md, libvlc_Backward, NULL); + forwarded_event.type = libvlc_MediaPlayerBackward; + break; + case END_S: + libvlc_media_set_state( p_mi->p_md, libvlc_Ended, NULL); + forwarded_event.type = libvlc_MediaPlayerEndReached; case ERROR_S: libvlc_media_set_state( p_mi->p_md, libvlc_Error, NULL); - event.type = libvlc_MediaPlayerEncounteredError; + forwarded_event.type = libvlc_MediaPlayerEncounteredError; break; + default: - return VLC_SUCCESS; + return; } - libvlc_event_send( p_mi->p_event_manager, &event ); - return VLC_SUCCESS; + libvlc_event_send( p_mi->p_event_manager, &forwarded_event ); + return; } static int @@ -257,7 +281,7 @@ input_time_changed( vlc_object_t * p_this, char const * psz_cmd, if (!strncmp(psz_cmd, "intf", 4 /* "-change" no need to go further */)) { input_thread_t * p_input = (input_thread_t *)p_this; - + var_Get( p_input, "state", &val ); if( val.i_int != PLAYING_S ) return VLC_SUCCESS; /* Don't send the position while stopped */ @@ -290,6 +314,11 @@ libvlc_media_player_new( libvlc_instance_t * p_libvlc_instance, } p_mi = malloc( sizeof(libvlc_media_player_t) ); + if( !p_mi ) + { + libvlc_exception_raise( p_e, "Not enough memory" ); + return NULL; + } p_mi->p_md = NULL; p_mi->drawable = 0; p_mi->p_libvlc_instance = p_libvlc_instance; @@ -300,13 +329,12 @@ libvlc_media_player_new( libvlc_instance_t * p_libvlc_instance, * operation the refcount is 0, the object is destroyed. * - Accessor _retain increase the refcount by 1 (XXX: to implement) */ p_mi->i_refcount = 1; - p_mi->b_own_its_input_thread = VLC_TRUE; + p_mi->b_own_its_input_thread = true; /* object_lock strategy: * - No lock held in constructor * - Lock when accessing all variable this lock is held * - Lock when attempting to destroy the object the lock is also held */ - vlc_mutex_init( p_mi->p_libvlc_instance->p_libvlc_int, - &p_mi->object_lock ); + vlc_mutex_init( &p_mi->object_lock ); p_mi->p_event_manager = libvlc_event_manager_new( p_mi, p_libvlc_instance, p_e ); if( libvlc_exception_raised( p_e ) ) @@ -316,15 +344,26 @@ libvlc_media_player_new( libvlc_instance_t * p_libvlc_instance, } libvlc_event_manager_register_event_type( p_mi->p_event_manager, - libvlc_MediaPlayerEndReached, p_e ); + libvlc_MediaPlayerNothingSpecial, p_e ); libvlc_event_manager_register_event_type( p_mi->p_event_manager, - libvlc_MediaPlayerStopped, p_e ); + libvlc_MediaPlayerOpening, p_e ); libvlc_event_manager_register_event_type( p_mi->p_event_manager, - libvlc_MediaPlayerEncounteredError, p_e ); + libvlc_MediaPlayerBuffering, p_e ); + libvlc_event_manager_register_event_type( p_mi->p_event_manager, + libvlc_MediaPlayerPlaying, p_e ); libvlc_event_manager_register_event_type( p_mi->p_event_manager, libvlc_MediaPlayerPaused, p_e ); libvlc_event_manager_register_event_type( p_mi->p_event_manager, - libvlc_MediaPlayerPlayed, p_e ); + libvlc_MediaPlayerStopped, p_e ); + libvlc_event_manager_register_event_type( p_mi->p_event_manager, + libvlc_MediaPlayerForward, p_e ); + libvlc_event_manager_register_event_type( p_mi->p_event_manager, + libvlc_MediaPlayerBackward, p_e ); + libvlc_event_manager_register_event_type( p_mi->p_event_manager, + libvlc_MediaPlayerEndReached, p_e ); + libvlc_event_manager_register_event_type( p_mi->p_event_manager, + libvlc_MediaPlayerEncounteredError, p_e ); + libvlc_event_manager_register_event_type( p_mi->p_event_manager, libvlc_MediaPlayerPositionChanged, p_e ); libvlc_event_manager_register_event_type( p_mi->p_event_manager, @@ -392,7 +431,7 @@ libvlc_media_player_t * libvlc_media_player_new_from_input_thread( vlc_object_yield( p_input ); p_mi->p_input_thread = p_input; - p_mi->b_own_its_input_thread = VLC_FALSE; + p_mi->b_own_its_input_thread = false; return p_mi; } @@ -439,7 +478,7 @@ void libvlc_media_player_release( libvlc_media_player_t *p_mi ) return; vlc_mutex_lock( &p_mi->object_lock ); - + p_mi->i_refcount--; if( p_mi->i_refcount > 0 ) @@ -453,7 +492,7 @@ void libvlc_media_player_release( libvlc_media_player_t *p_mi ) release_input_thread( p_mi ); libvlc_event_manager_release( p_mi->p_event_manager ); - + libvlc_media_release( p_mi->p_md ); free( p_mi ); @@ -478,7 +517,7 @@ void libvlc_media_player_set_media( libvlc_media_t *p_md, libvlc_exception_t *p_e ) { - (void)p_e; + VLC_UNUSED(p_e); if( !p_mi ) return; @@ -488,7 +527,7 @@ void libvlc_media_player_set_media( release_input_thread( p_mi ); if( p_mi->p_md ) - libvlc_media_set_state( p_mi->p_md, libvlc_NothingSpecial, NULL ); + libvlc_media_set_state( p_mi->p_md, libvlc_NothingSpecial, p_e ); libvlc_media_release( p_mi->p_md ); @@ -501,7 +540,7 @@ void libvlc_media_player_set_media( libvlc_media_retain( p_md ); p_mi->p_md = p_md; - + /* The policy here is to ignore that we were created using a different * libvlc_instance, because we don't really care */ p_mi->p_libvlc_instance = p_md->p_libvlc_instance; @@ -517,7 +556,7 @@ libvlc_media_player_get_media( libvlc_media_player_t *p_mi, libvlc_exception_t *p_e ) { - (void)p_e; + VLC_UNUSED(p_e); if( !p_mi->p_md ) return NULL; @@ -534,7 +573,7 @@ libvlc_media_player_event_manager( libvlc_media_player_t *p_mi, libvlc_exception_t *p_e ) { - (void)p_e; + VLC_UNUSED(p_e); return p_mi->p_event_manager; } @@ -559,7 +598,7 @@ void libvlc_media_player_play( libvlc_media_player_t *p_mi, libvlc_exception_clear( p_e ); vlc_mutex_lock( &p_mi->object_lock ); - + if( !p_mi->p_md ) { libvlc_exception_raise( p_e, "no associated media descriptor" ); @@ -586,7 +625,10 @@ void libvlc_media_player_play( libvlc_media_player_t *p_mi, var_Create( p_input_thread, "drawable", VLC_VAR_DOINHERIT ); var_Set( p_input_thread, "drawable", val ); } - var_AddCallback( p_input_thread, "state", input_state_changed, p_mi ); + + vlc_event_manager_t * p_em = input_get_event_manager( p_input_thread ); + vlc_event_attach( p_em, vlc_InputStateChanged, input_state_changed, p_mi ); + var_AddCallback( p_input_thread, "seekable", input_seekable_changed, p_mi ); var_AddCallback( p_input_thread, "pausable", input_pausable_changed, p_mi ); var_AddCallback( p_input_thread, "intf-change", input_position_changed, p_mi ); @@ -606,9 +648,9 @@ void libvlc_media_player_pause( libvlc_media_player_t *p_mi, if( !p_input_thread ) return; - int state = var_GetInteger( p_input_thread, "state" ); + libvlc_state_t state = libvlc_media_player_get_state( p_mi, p_e ); - if( state == PLAYING_S ) + if( state == libvlc_Playing ) { if( libvlc_media_player_can_pause( p_mi, p_e ) ) input_Control( p_input_thread, INPUT_SET_STATE, PAUSE_S ); @@ -627,12 +669,18 @@ void libvlc_media_player_pause( libvlc_media_player_t *p_mi, void libvlc_media_player_stop( libvlc_media_player_t *p_mi, libvlc_exception_t *p_e ) { - input_thread_t * p_input_thread = libvlc_get_input_thread( p_mi, p_e ); + libvlc_state_t state = libvlc_media_player_get_state( p_mi, p_e ); - if( !p_input_thread ) - return; + if( state == libvlc_Playing || state == libvlc_Paused ) + { + /* Send a stop notification event only of we are in playing or paused states */ + libvlc_media_set_state( p_mi->p_md, libvlc_Ended, p_e ); - int state = var_GetInteger( p_input_thread, "state" ); + /* Construct and send the event */ + libvlc_event_t event; + event.type = libvlc_MediaPlayerEndReached; + libvlc_event_send( p_mi->p_event_manager, &event ); + } if( p_mi->b_own_its_input_thread ) { @@ -642,29 +690,46 @@ void libvlc_media_player_stop( libvlc_media_player_t *p_mi, } else { + input_thread_t * p_input_thread = libvlc_get_input_thread( p_mi, p_e ); + + if( !p_input_thread ) + return; + input_StopThread( p_input_thread ); vlc_object_release( p_input_thread ); } - - if( state == PLAYING_S || state == PAUSE_S ) - { - /* Send a stop notification event */ - libvlc_event_t event; - libvlc_media_set_state( p_mi->p_md, libvlc_Stopped, NULL ); - event.type = libvlc_MediaPlayerStopped; - libvlc_event_send( p_mi->p_event_manager, &event ); - } } /************************************************************************** * Set Drawable **************************************************************************/ void libvlc_media_player_set_drawable( libvlc_media_player_t *p_mi, - libvlc_drawable_t drawable, - libvlc_exception_t *p_e ) + libvlc_drawable_t drawable, + libvlc_exception_t *p_e ) { - (void)p_e; + input_thread_t *p_input_thread; + vout_thread_t *p_vout = NULL; + p_mi->drawable = drawable; + + /* Allow on the fly drawable changing. This is tricky has this may + * not be supported by every vout. We though can't disable it + * because of some creepy drawable type that are not flexible enough + * (Win32 HWND for instance) */ + p_input_thread = libvlc_get_input_thread( p_mi, p_e ); + if( !p_input_thread ) { + /* No input, nothing more to do, we are fine */ + libvlc_exception_clear( p_e ); + return; + } + + p_vout = vlc_object_find( p_input_thread, VLC_OBJECT_VOUT, FIND_CHILD ); + if( p_vout ) + { + vout_Control( p_vout , VOUT_REPARENT, drawable); + vlc_object_release( p_vout ); + } + vlc_object_release( p_input_thread ); } /************************************************************************** @@ -673,7 +738,7 @@ void libvlc_media_player_set_drawable( libvlc_media_player_t *p_mi, libvlc_drawable_t libvlc_media_player_get_drawable ( libvlc_media_player_t *p_mi, libvlc_exception_t *p_e ) { - (void)p_e; + VLC_UNUSED(p_e); return p_mi->drawable; } @@ -837,15 +902,15 @@ int libvlc_media_player_will_play( libvlc_media_player_t *p_mi, input_thread_t *p_input_thread = libvlc_get_input_thread ( p_mi, p_e); if ( !p_input_thread ) - return VLC_FALSE; + return false; if ( !p_input_thread->b_die && !p_input_thread->b_dead ) { vlc_object_release( p_input_thread ); - return VLC_TRUE; + return true; } vlc_object_release( p_input_thread ); - return VLC_FALSE; + return false; } void libvlc_media_player_set_rate( @@ -899,7 +964,7 @@ libvlc_state_t libvlc_media_player_get_state( /* We do return the right value, no need to throw an exception */ if( libvlc_exception_raised( p_e ) ) libvlc_exception_clear( p_e ); - return libvlc_Stopped; + return libvlc_Ended; } var_Get( p_input_thread, "state", &val ); @@ -920,7 +985,7 @@ int libvlc_media_player_is_seekable( libvlc_media_player_t *p_mi, /* We do return the right value, no need to throw an exception */ if( libvlc_exception_raised( p_e ) ) libvlc_exception_clear( p_e ); - return VLC_FALSE; + return false; } var_Get( p_input_thread, "seekable", &val ); vlc_object_release( p_input_thread ); @@ -940,7 +1005,7 @@ int libvlc_media_player_can_pause( libvlc_media_player_t *p_mi, /* We do return the right value, no need to throw an exception */ if( libvlc_exception_raised( p_e ) ) libvlc_exception_clear( p_e ); - return VLC_FALSE; + return false; } var_Get( p_input_thread, "can-pause", &val ); vlc_object_release( p_input_thread );