X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Fmedia_player.c;h=b2d096faf32007d64b696dcccac4428c75cdf3d7;hb=ab915f9988bd01e3b9d5ec25a19f9006d2040f8d;hp=461f6dc7282f86d4f01cf80dc81c8a4eafe2e93a;hpb=fb90e6be51d85758f6275f69fb923e0461b7a5e9;p=vlc diff --git a/src/control/media_player.c b/src/control/media_player.c index 461f6dc728..b2d096faf3 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,11 +51,14 @@ 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, + [STOP_S] = libvlc_Stopped, + [FORWARD_S] = libvlc_Forward, + [BACKWARD_S] = libvlc_Backward, [END_S] = libvlc_Ended, [ERROR_S] = libvlc_Error, }; @@ -63,7 +66,7 @@ static const libvlc_state_t vlc_to_libvlc_state_array[] = 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]; } @@ -85,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 ); @@ -132,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 @@ -321,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, @@ -591,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 ); @@ -637,12 +674,11 @@ void libvlc_media_player_stop( libvlc_media_player_t *p_mi, 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_Stopped, p_e ); + libvlc_media_set_state( p_mi->p_md, libvlc_Ended, p_e ); /* Construct and send the event */ libvlc_event_t event; - event.type = libvlc_MediaPlayerStopped; + event.type = libvlc_MediaPlayerEndReached; libvlc_event_send( p_mi->p_event_manager, &event ); } @@ -681,11 +717,15 @@ void libvlc_media_player_set_drawable( libvlc_media_player_t *p_mi, * 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 ) return; + 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 ) - libvlc_exception_raise( p_exception, "No active video output" ); + libvlc_exception_raise( p_e, "No active video output" ); else { vout_Control( p_vout , VOUT_REPARENT, drawable); @@ -926,7 +966,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 );