X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Fmedia_player.c;h=ce4cd0b1a8055760e8c2992e391dc17a45edf375;hb=78d87996ccb92d1dc91c9987685f976ed3be08a6;hp=c73809a6a2a599c30b622a32fe6b4091832a57ad;hpb=022240552aa0e21c88806de8e7fe5339b7fb4e93;p=vlc diff --git a/src/control/media_player.c b/src/control/media_player.c index c73809a6a2..ce4cd0b1a8 100644 --- a/src/control/media_player.c +++ b/src/control/media_player.c @@ -1,7 +1,7 @@ /***************************************************************************** * media_player.c: Libvlc API Media Instance management functions ***************************************************************************** - * Copyright (C) 2005 the VideoLAN team + * Copyright (C) 2005-2009 the VideoLAN team * $Id$ * * Authors: Clément Stenac @@ -78,24 +78,20 @@ static void release_input_thread( libvlc_media_player_t *p_mi, bool b_input_abor p_input_thread = p_mi->p_input_thread; - /* No one is tracking this input_thread apart from us. Destroy it. */ - if( p_mi->b_own_its_input_thread ) - { - var_DelCallback( p_input_thread, "can-seek", - input_seekable_changed, p_mi ); - var_DelCallback( p_input_thread, "can-pause", - input_pausable_changed, p_mi ); - var_DelCallback( p_input_thread, "intf-event", - input_event_changed, p_mi ); - - /* We owned this one */ - input_StopThread( p_input_thread, b_input_abort ); - vlc_thread_join( p_input_thread ); - - var_Destroy( p_input_thread, "drawable-hwnd" ); - var_Destroy( p_input_thread, "drawable-xid" ); - var_Destroy( p_input_thread, "drawable-agl" ); - } + var_DelCallback( p_input_thread, "can-seek", + input_seekable_changed, p_mi ); + var_DelCallback( p_input_thread, "can-pause", + input_pausable_changed, p_mi ); + var_DelCallback( p_input_thread, "intf-event", + input_event_changed, p_mi ); + + /* We owned this one */ + input_Stop( p_input_thread, b_input_abort ); + vlc_thread_join( p_input_thread ); + + var_Destroy( p_input_thread, "drawable-hwnd" ); + var_Destroy( p_input_thread, "drawable-xid" ); + var_Destroy( p_input_thread, "drawable-agl" ); vlc_object_release( p_input_thread ); @@ -219,7 +215,7 @@ input_event_changed( vlc_object_t * p_this, char const * psz_cmd, libvlc_media_set_state( p_mi->p_md, libvlc_state, NULL ); libvlc_event_send( p_mi->p_event_manager, &event ); } - else if( newval.i_int == INPUT_EVENT_TIMES ) + else if( newval.i_int == INPUT_EVENT_POSITION ) { if( var_GetInteger( p_input, "state" ) != PLAYING_S ) return VLC_SUCCESS; /* Don't send the position while stopped */ @@ -236,11 +232,19 @@ input_event_changed( vlc_object_t * p_this, char const * psz_cmd, var_GetTime( p_input, "time" ); libvlc_event_send( p_mi->p_event_manager, &event ); } + else if( newval.i_int == INPUT_EVENT_LENGTH ) + { + event.type = libvlc_MediaPlayerLengthChanged; + event.u.media_player_length_changed.new_length = + var_GetTime( p_input, "length" ); + libvlc_event_send( p_mi->p_event_manager, &event ); + } return VLC_SUCCESS; } +static void libvlc_media_player_destroy( libvlc_media_player_t * ); /************************************************************************** * Create a Media Instance object. @@ -281,12 +285,12 @@ libvlc_media_player_new( libvlc_instance_t * p_libvlc_instance, p_mi->p_libvlc_instance = p_libvlc_instance; p_mi->p_input_thread = NULL; p_mi->i_refcount = 1; - p_mi->b_own_its_input_thread = true; 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 ) ) { + vlc_mutex_destroy( &p_mi->object_lock ); free( p_mi ); return NULL; } @@ -316,7 +320,9 @@ libvlc_media_player_new( libvlc_instance_t * p_libvlc_instance, libvlc_MediaPlayerPositionChanged, p_e ); libvlc_event_manager_register_event_type( p_mi->p_event_manager, libvlc_MediaPlayerTimeChanged, p_e ); - libvlc_event_manager_register_event_type( p_mi->p_event_manager, + libvlc_event_manager_register_event_type( p_mi->p_event_manager, + libvlc_MediaPlayerLengthChanged, p_e ); + libvlc_event_manager_register_event_type( p_mi->p_event_manager, libvlc_MediaPlayerTitleChanged, p_e ); libvlc_event_manager_register_event_type( p_mi->p_event_manager, libvlc_MediaPlayerSeekableChanged, p_e ); @@ -326,6 +332,7 @@ libvlc_media_player_new( libvlc_instance_t * p_libvlc_instance, /* Snapshot initialization */ libvlc_event_manager_register_event_type( p_mi->p_event_manager, libvlc_MediaPlayerSnapshotTaken, p_e ); + /* Attach a var callback to the global object to provide the glue between vout_thread that generates the event and media_player that re-emits it with its own event manager @@ -347,8 +354,8 @@ libvlc_media_player_new_from_media( libvlc_exception_t *p_e ) { libvlc_media_player_t * p_mi; - p_mi = libvlc_media_player_new( p_md->p_libvlc_instance, p_e ); + p_mi = libvlc_media_player_new( p_md->p_libvlc_instance, p_e ); if( !p_mi ) return NULL; @@ -358,80 +365,34 @@ libvlc_media_player_new_from_media( return p_mi; } -/************************************************************************** - * Create a new media instance object from an input_thread (Libvlc Internal). - **************************************************************************/ -libvlc_media_player_t * libvlc_media_player_new_from_input_thread( - struct libvlc_instance_t *p_libvlc_instance, - input_thread_t *p_input, - libvlc_exception_t *p_e ) -{ - libvlc_media_player_t * p_mi; - - if( !p_input ) - { - libvlc_exception_raise( p_e, "invalid input thread" ); - return NULL; - } - - p_mi = libvlc_media_player_new( p_libvlc_instance, p_e ); - - if( !p_mi ) - return NULL; - - p_mi->p_md = libvlc_media_new_from_input_item( - p_libvlc_instance, - input_GetItem( p_input ), p_e ); - - if( !p_mi->p_md ) - { - libvlc_media_player_destroy( p_mi ); - return NULL; - } - - /* will be released in media_player_release() */ - vlc_object_hold( p_input ); - - p_mi->p_input_thread = p_input; - p_mi->b_own_its_input_thread = false; - - return p_mi; -} - /************************************************************************** * Destroy a Media Instance object (libvlc internal) * * Warning: No lock held here, but hey, this is internal. Caller must lock. **************************************************************************/ -void libvlc_media_player_destroy( libvlc_media_player_t *p_mi ) +static void libvlc_media_player_destroy( libvlc_media_player_t *p_mi ) { input_thread_t *p_input_thread; libvlc_exception_t p_e; - libvlc_exception_init( &p_e ); - - if( !p_mi ) - return; + assert( p_mi ); - /* Detach Callback from the main libvlc object */ + /* Detach Callback from the main libvlc object */ var_DelCallback( p_mi->p_libvlc_instance->p_libvlc_int, "vout-snapshottaken", SnapshotTakenCallback, p_mi ); + libvlc_exception_init( &p_e ); p_input_thread = libvlc_get_input_thread( p_mi, &p_e ); if( libvlc_exception_raised( &p_e ) ) - { - libvlc_event_manager_release( p_mi->p_event_manager ); + /* no need to worry about no input thread */ libvlc_exception_clear( &p_e ); - free( p_mi ); - return; /* no need to worry about no input thread */ - } - vlc_mutex_destroy( &p_mi->object_lock ); - - vlc_object_release( p_input_thread ); + else + release_input_thread( p_mi, true ); + libvlc_event_manager_release( p_mi->p_event_manager ); libvlc_media_release( p_mi->p_md ); - + vlc_mutex_destroy( &p_mi->object_lock ); free( p_mi ); } @@ -442,28 +403,15 @@ void libvlc_media_player_destroy( libvlc_media_player_t *p_mi ) **************************************************************************/ void libvlc_media_player_release( libvlc_media_player_t *p_mi ) { - if( !p_mi ) - return; + bool destroy; + assert( p_mi ); vlc_mutex_lock( &p_mi->object_lock ); - - p_mi->i_refcount--; - - if( p_mi->i_refcount > 0 ) - { - vlc_mutex_unlock( &p_mi->object_lock ); - return; - } + destroy = !--p_mi->i_refcount; vlc_mutex_unlock( &p_mi->object_lock ); - vlc_mutex_destroy( &p_mi->object_lock ); - - release_input_thread( p_mi, true ); - libvlc_event_manager_release( p_mi->p_event_manager ); - - libvlc_media_release( p_mi->p_md ); - - free( p_mi ); + if( destroy ) + libvlc_media_player_destroy( p_mi ); } /************************************************************************** @@ -473,10 +421,11 @@ void libvlc_media_player_release( libvlc_media_player_t *p_mi ) **************************************************************************/ void libvlc_media_player_retain( libvlc_media_player_t *p_mi ) { - if( !p_mi ) - return; + assert( p_mi ); + vlc_mutex_lock( &p_mi->object_lock ); p_mi->i_refcount++; + vlc_mutex_unlock( &p_mi->object_lock ); } /************************************************************************** @@ -606,8 +555,8 @@ void libvlc_media_player_play( libvlc_media_player_t *p_mi, return; } - p_mi->p_input_thread = input_CreateThread( - p_mi->p_libvlc_instance->p_libvlc_int, p_mi->p_md->p_input_item ); + p_mi->p_input_thread = input_Create( p_mi->p_libvlc_instance->p_libvlc_int, + p_mi->p_md->p_input_item, NULL, NULL ); if( !p_mi->p_input_thread ) { @@ -632,10 +581,23 @@ void libvlc_media_player_play( libvlc_media_player_t *p_mi, var_Set( p_input_thread, "drawable-hwnd", val ); } + var_Create( p_input_thread, "drawable-nsobject", VLC_VAR_ADDRESS ); + if( p_mi->drawable.nsobject != NULL ) + { + vlc_value_t val = { .p_address = p_mi->drawable.nsobject }; + var_Set( p_input_thread, "drawable-nsobject", val ); + } + 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 ); + if( input_Start( p_input_thread ) ) + { + vlc_object_release( p_input_thread ); + p_mi->p_input_thread = NULL; + } + vlc_mutex_unlock( &p_mi->object_lock ); } @@ -646,13 +608,11 @@ void libvlc_media_player_pause( 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 ); - if( !p_input_thread ) return; libvlc_state_t state = libvlc_media_player_get_state( p_mi, p_e ); - - if( state == libvlc_Playing ) + if( state == libvlc_Playing || state == libvlc_Buffering ) { if( libvlc_media_player_can_pause( p_mi, p_e ) ) input_Control( p_input_thread, INPUT_SET_STATE, PAUSE_S ); @@ -674,10 +634,9 @@ int libvlc_media_player_is_playing( libvlc_media_player_t *p_mi, libvlc_exception_t *p_e ) { libvlc_state_t state = libvlc_media_player_get_state( p_mi, p_e ); - return libvlc_Playing == state; + return (libvlc_Playing == state) || (libvlc_Buffering == state); } - /************************************************************************** * Stop playing. **************************************************************************/ @@ -686,10 +645,12 @@ void libvlc_media_player_stop( libvlc_media_player_t *p_mi, { libvlc_state_t state = libvlc_media_player_get_state( p_mi, p_e ); - if( state == libvlc_Playing || state == libvlc_Paused ) + if( state == libvlc_Playing || + state == libvlc_Paused || + state == libvlc_Buffering ) { - /* Send a stop notification event only if we are in playing or - * paused states */ + /* Send a stop notification event only if we are in playing, + * buffering or paused states */ libvlc_media_set_state( p_mi->p_md, libvlc_Ended, p_e ); /* Construct and send the event */ @@ -698,23 +659,28 @@ void libvlc_media_player_stop( libvlc_media_player_t *p_mi, libvlc_event_send( p_mi->p_event_manager, &event ); } - if( p_mi->b_own_its_input_thread ) - { - vlc_mutex_lock( &p_mi->object_lock ); - release_input_thread( p_mi, true ); /* This will stop the input thread */ - vlc_mutex_unlock( &p_mi->object_lock ); - } - else - { - input_thread_t * p_input_thread = libvlc_get_input_thread( p_mi, p_e ); + vlc_mutex_lock( &p_mi->object_lock ); + release_input_thread( p_mi, true ); /* This will stop the input thread */ + vlc_mutex_unlock( &p_mi->object_lock ); +} - if( !p_input_thread ) - return; +/************************************************************************** + * set_nsobject + **************************************************************************/ +void libvlc_media_player_set_nsobject( libvlc_media_player_t *p_mi, + void * drawable, + libvlc_exception_t *p_e ) +{ + (void) p_e; + p_mi->drawable.nsobject = drawable; +} - input_StopThread( p_input_thread, true ); - vlc_object_release( p_input_thread ); - p_mi->p_input_thread = NULL; - } +/************************************************************************** + * get_nsobject + **************************************************************************/ +uint32_t libvlc_media_player_get_nsobject( libvlc_media_player_t *p_mi ) +{ + return p_mi->drawable.nsobject; } /************************************************************************** @@ -858,14 +824,12 @@ void libvlc_media_player_set_time( libvlc_exception_t *p_e ) { input_thread_t *p_input_thread; - vlc_value_t value; p_input_thread = libvlc_get_input_thread ( p_mi, p_e ); if( !p_input_thread ) return; - value.i_time = time*1000LL; - var_Set( p_input_thread, "time", value ); + var_SetTime( p_input_thread, "time", time*1000LL ); vlc_object_release( p_input_thread ); } @@ -875,14 +839,12 @@ void libvlc_media_player_set_position( libvlc_exception_t *p_e ) { input_thread_t *p_input_thread; - vlc_value_t val; - val.f_float = position; p_input_thread = libvlc_get_input_thread ( p_mi, p_e); if( !p_input_thread ) return; - var_Set( p_input_thread, "position", val ); + var_SetFloat( p_input_thread, "position", position ); vlc_object_release( p_input_thread ); } @@ -909,14 +871,12 @@ void libvlc_media_player_set_chapter( libvlc_exception_t *p_e ) { input_thread_t *p_input_thread; - vlc_value_t val; - val.i_int = chapter; p_input_thread = libvlc_get_input_thread ( p_mi, p_e); if( !p_input_thread ) return; - var_Set( p_input_thread, "chapter", val ); + var_SetInteger( p_input_thread, "chapter", chapter ); vlc_object_release( p_input_thread ); } @@ -985,14 +945,12 @@ void libvlc_media_player_set_title( libvlc_exception_t *p_e ) { input_thread_t *p_input_thread; - vlc_value_t val; - val.i_int = i_title; p_input_thread = libvlc_get_input_thread ( p_mi, p_e); if( !p_input_thread ) return; - var_Set( p_input_thread, "title", val ); + var_SetInteger( p_input_thread, "title", i_title ); vlc_object_release( p_input_thread ); //send event @@ -1047,10 +1005,8 @@ void libvlc_media_player_next_chapter( return; int i_type = var_Type( p_input_thread, "next-chapter" ); - vlc_value_t val; - val.b_bool = true; - var_Set( p_input_thread, (i_type & VLC_VAR_TYPE) != 0 ? - "next-chapter":"next-title", val ); + var_SetBool( p_input_thread, (i_type & VLC_VAR_TYPE) != 0 ? + "next-chapter":"next-title", true ); vlc_object_release( p_input_thread ); } @@ -1066,10 +1022,8 @@ void libvlc_media_player_previous_chapter( return; int i_type = var_Type( p_input_thread, "next-chapter" ); - vlc_value_t val; - val.b_bool = true; - var_Set( p_input_thread, (i_type & VLC_VAR_TYPE) != 0 ? - "prev-chapter":"prev-title", val ); + var_SetBool( p_input_thread, (i_type & VLC_VAR_TYPE) != 0 ? + "prev-chapter":"prev-title", true ); vlc_object_release( p_input_thread ); } @@ -1113,7 +1067,6 @@ void libvlc_media_player_set_rate( libvlc_exception_t *p_e ) { input_thread_t *p_input_thread; - vlc_value_t val; bool b_can_rewind; p_input_thread = libvlc_get_input_thread ( p_mi, p_e ); @@ -1128,8 +1081,7 @@ void libvlc_media_player_set_rate( return; } - val.i_int = 1000.0f/rate; - var_Set( p_input_thread, "rate", val ); + var_SetInteger( p_input_thread, "rate", 1000.0f/rate ); vlc_object_release( p_input_thread ); } @@ -1223,15 +1175,18 @@ libvlc_track_description_t * var_Change( p_input, psz_variable, VLC_VAR_GETLIST, &val_list, &text_list); if( val_list.p_list->i_count <= 0 ) /* no tracks */ + { + var_FreeList( &val_list, &text_list); + vlc_object_release( p_input ); return NULL; + } libvlc_track_description_t *p_track_description, *p_actual, *p_previous; p_track_description = ( libvlc_track_description_t * ) malloc( sizeof( libvlc_track_description_t ) ); if ( !p_track_description ) { - var_Change( p_input, psz_variable, VLC_VAR_FREELIST, - &val_list, &text_list); + var_FreeList( &val_list, &text_list); vlc_object_release( p_input ); libvlc_exception_raise( p_e, "no enough memory" ); return NULL; @@ -1247,8 +1202,7 @@ libvlc_track_description_t * if ( !p_actual ) { libvlc_track_description_release( p_track_description ); - var_Change( p_input, psz_variable, VLC_VAR_FREELIST, - &val_list, &text_list); + var_FreeList( &val_list, &text_list); vlc_object_release( p_input ); libvlc_exception_raise( p_e, "no enough memory" ); return NULL; @@ -1262,7 +1216,7 @@ libvlc_track_description_t * p_previous = p_actual; p_actual = NULL; } - var_Change( p_input, psz_variable, VLC_VAR_FREELIST, &val_list, &text_list); + var_FreeList( &val_list, &text_list); vlc_object_release( p_input ); return p_track_description;