X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Fmedia_player.c;h=3789ddf90a03eda5d89525329010f704a6908c77;hb=292a24de34ead1c5222ccf5618bd76fc8ff73c3f;hp=cac7a2052ba512f0d24651639d8a11ff2cda2fd3;hpb=16114c73acf90695d2fdb6f0ee1e5e79b2dfa52b;p=vlc diff --git a/src/control/media_player.c b/src/control/media_player.c index cac7a2052b..3789ddf90a 100644 --- a/src/control/media_player.c +++ b/src/control/media_player.c @@ -34,6 +34,7 @@ #include #include #include +#include #include "libvlc.h" @@ -41,6 +42,22 @@ #include "media_internal.h" // libvlc_media_set_state() #include "media_player_internal.h" +/* + * mapping of libvlc_navigate_mode_t to vlc_key_t + */ +static const vlc_key_t libvlc_navigate_to_action[] = + { + ACTIONID_NAV_ACTIVATE, + ACTIONID_NAV_UP, + ACTIONID_NAV_DOWN, + ACTIONID_NAV_LEFT, + ACTIONID_NAV_RIGHT + }; + +static const uint32_t libvlc_navigate_to_action_size = \ + sizeof( libvlc_navigate_to_action ) / sizeof( libvlc_navigate_to_action[0] ); + + static int input_seekable_changed( vlc_object_t * p_this, char const * psz_cmd, vlc_value_t oldval, vlc_value_t newval, @@ -127,10 +144,6 @@ static void release_input_thread( libvlc_media_player_t *p_mi, bool b_input_abor assert( p_input_thread->b_dead ); - /* Store the input resource for future use. */ - assert( p_mi->input.p_resource == NULL ); - p_mi->input.p_resource = input_DetachResource( p_input_thread ); - p_mi->input.p_thread = NULL; vlc_object_release( p_input_thread ); } @@ -303,9 +316,15 @@ input_event_changed( vlc_object_t * p_this, char const * psz_cmd, from_mtime(var_GetTime( p_input, "length" )); libvlc_event_send( p_mi->p_event_manager, &event ); } + else if( newval.i_int == INPUT_EVENT_CACHE ) + { + event.type = libvlc_MediaPlayerBuffering; + event.u.media_player_buffering.new_cache = (int)(100 * + var_GetFloat( p_input, "cache" )); + libvlc_event_send( p_mi->p_event_manager, &event ); + } return VLC_SUCCESS; - } /************************************************************************** @@ -371,6 +390,16 @@ libvlc_media_player_new( libvlc_instance_t *instance ) var_Create (mp, "rate", VLC_VAR_FLOAT|VLC_VAR_DOINHERIT); /* Video */ + var_Create (mp, "vout", VLC_VAR_STRING|VLC_VAR_DOINHERIT); + var_Create (mp, "window", VLC_VAR_STRING); + var_Create (mp, "vmem-lock", VLC_VAR_ADDRESS); + var_Create (mp, "vmem-unlock", VLC_VAR_ADDRESS); + var_Create (mp, "vmem-display", VLC_VAR_ADDRESS); + var_Create (mp, "vmem-data", VLC_VAR_ADDRESS); + var_Create (mp, "vmem-chroma", VLC_VAR_STRING | VLC_VAR_DOINHERIT); + var_Create (mp, "vmem-width", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT); + var_Create (mp, "vmem-height", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT); + var_Create (mp, "vmem-pitch", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT); var_Create (mp, "drawable-xid", VLC_VAR_INTEGER); #ifdef WIN32 var_Create (mp, "drawable-hwnd", VLC_VAR_ADDRESS); @@ -415,6 +444,12 @@ libvlc_media_player_new( libvlc_instance_t *instance ) var_Create (mp, "logo-opacity", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT); var_Create (mp, "logo-position", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT); + var_Create (mp, "contrast", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT); + var_Create (mp, "brightness", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT); + var_Create (mp, "hue", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT); + var_Create (mp, "saturation", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT); + var_Create (mp, "gamma", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT); + /* Audio */ var_Create (mp, "aout", VLC_VAR_STRING | VLC_VAR_DOINHERIT); var_Create (mp, "volume-muted", VLC_VAR_BOOL); @@ -510,7 +545,8 @@ static void libvlc_media_player_destroy( libvlc_media_player_t *p_mi ) release_input_thread(p_mi, true); if( p_mi->input.p_resource ) { - input_resource_Delete( p_mi->input.p_resource ); + input_resource_Terminate( p_mi->input.p_resource ); + input_resource_Release( p_mi->input.p_resource ); p_mi->input.p_resource = NULL; } vlc_mutex_destroy( &p_mi->input.lock ); @@ -656,6 +692,8 @@ int libvlc_media_player_play( libvlc_media_player_t *p_mi ) return -1; } + if( !p_mi->input.p_resource ) + p_mi->input.p_resource = input_resource_New( VLC_OBJECT( p_mi ) ); p_input_thread = input_Create( p_mi, p_mi->p_md->p_input_item, NULL, p_mi->input.p_resource ); unlock(p_mi); @@ -666,8 +704,6 @@ int libvlc_media_player_play( libvlc_media_player_t *p_mi ) return -1; } - p_mi->input.p_resource = NULL; - var_AddCallback( p_input_thread, "can-seek", input_seekable_changed, p_mi ); var_AddCallback( p_input_thread, "can-pause", input_pausable_changed, p_mi ); var_AddCallback( p_input_thread, "intf-event", input_event_changed, p_mi ); @@ -687,10 +723,7 @@ int libvlc_media_player_play( libvlc_media_player_t *p_mi ) return 0; } -/************************************************************************** - * Pause. - **************************************************************************/ -void libvlc_media_player_pause( libvlc_media_player_t *p_mi ) +void libvlc_media_player_set_pause( libvlc_media_player_t *p_mi, int paused ) { input_thread_t * p_input_thread = libvlc_get_input_thread( p_mi ); if( !p_input_thread ) @@ -699,17 +732,34 @@ void libvlc_media_player_pause( libvlc_media_player_t *p_mi ) libvlc_state_t state = libvlc_media_player_get_state( p_mi ); if( state == libvlc_Playing || state == libvlc_Buffering ) { - if( libvlc_media_player_can_pause( p_mi ) ) - input_Control( p_input_thread, INPUT_SET_STATE, PAUSE_S ); - else - libvlc_media_player_stop( p_mi ); + if( paused ) + { + if( libvlc_media_player_can_pause( p_mi ) ) + input_Control( p_input_thread, INPUT_SET_STATE, PAUSE_S ); + else + libvlc_media_player_stop( p_mi ); + } } else - input_Control( p_input_thread, INPUT_SET_STATE, PLAYING_S ); + { + if( !paused ) + input_Control( p_input_thread, INPUT_SET_STATE, PLAYING_S ); + } vlc_object_release( p_input_thread ); } +/************************************************************************** + * Toggle pause. + **************************************************************************/ +void libvlc_media_player_pause( libvlc_media_player_t *p_mi ) +{ + libvlc_state_t state = libvlc_media_player_get_state( p_mi ); + bool playing = (state == libvlc_Playing || state == libvlc_Buffering); + + libvlc_media_player_set_pause( p_mi, playing ); +} + /************************************************************************** * Tells whether the media player is currently playing. * @@ -742,9 +792,35 @@ void libvlc_media_player_stop( libvlc_media_player_t *p_mi ) event.type = libvlc_MediaPlayerStopped; libvlc_event_send( p_mi->p_event_manager, &event ); } + + if( p_mi->input.p_resource != NULL ) + input_resource_TerminateVout( p_mi->input.p_resource ); unlock_input(p_mi); } + +void libvlc_video_set_callbacks( libvlc_media_player_t *mp, + void *(*lock_cb) (void *, void **), + void (*unlock_cb) (void *, void *, void *const *), + void (*display_cb) (void *, void *), + void *opaque ) +{ + var_SetAddress( mp, "vmem-lock", lock_cb ); + var_SetAddress( mp, "vmem-unlock", unlock_cb ); + var_SetAddress( mp, "vmem-display", display_cb ); + var_SetAddress( mp, "vmem-data", opaque ); + var_SetString( mp, "vout", "vmem" ); +} + +void libvlc_video_set_format( libvlc_media_player_t *mp, const char *chroma, + unsigned width, unsigned height, unsigned pitch ) +{ + var_SetString( mp, "vmem-chroma", chroma ); + var_SetInteger( mp, "vmem-width", width ); + var_SetInteger( mp, "vmem-height", height ); + var_SetInteger( mp, "vmem-pitch", pitch ); +} + /************************************************************************** * set_nsobject **************************************************************************/ @@ -805,6 +881,9 @@ void libvlc_media_player_set_xwindow( libvlc_media_player_t *p_mi, uint32_t drawable ) { assert (p_mi != NULL); + + var_SetString (p_mi, "vout", drawable ? "xid" : "any"); + var_SetString (p_mi, "window", drawable ? "embed-xid,any" : "any"); var_SetInteger (p_mi, "drawable-xid", drawable); } @@ -824,6 +903,8 @@ void libvlc_media_player_set_hwnd( libvlc_media_player_t *p_mi, { assert (p_mi != NULL); #ifdef WIN32 + var_SetString (p_mi, "window", + (drawable != NULL) ? "embed-hwnd,any" : ""); var_SetAddress (p_mi, "drawable-hwnd", drawable); #else (void) p_mi; (void) drawable; @@ -1136,6 +1217,24 @@ int libvlc_media_player_is_seekable( libvlc_media_player_t *p_mi ) return b_seekable; } +void libvlc_media_player_navigate( libvlc_media_player_t* p_mi, + unsigned navigate ) +{ + input_thread_t *p_input_thread; + + if ( navigate > libvlc_navigate_to_action_size) + return; + + p_input_thread = libvlc_get_input_thread ( p_mi ); + if ( !p_input_thread ) + return; + + var_SetInteger( p_mi->p_libvlc_instance->p_libvlc_int, + "key-action", libvlc_navigate_to_action[navigate] ); + + vlc_object_release( p_input_thread ); +} + /* internal function, used by audio, video */ libvlc_track_description_t * libvlc_get_track_description( libvlc_media_player_t *p_mi,