From: Rémi Denis-Courmont Date: Wed, 13 May 2009 15:52:30 +0000 (+0300) Subject: Merge branch 1.0-bugfix X-Git-Tag: 1.1.0-ff~6006 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=b65308f0b9f038e8f56aebbee784d128be7b0f7e;hp=-c;p=vlc Merge branch 1.0-bugfix --- b65308f0b9f038e8f56aebbee784d128be7b0f7e diff --combined src/control/media_player.c index a5f1d68d60,98ca4b38ba..41845add07 --- a/src/control/media_player.c +++ b/src/control/media_player.c @@@ -78,20 -78,24 +78,20 @@@ static void release_input_thread( libvl 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_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" ); - } + 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 ); @@@ -215,7 -219,7 +215,7 @@@ input_event_changed( vlc_object_t * p_t 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 */ @@@ -237,8 -241,6 +237,8 @@@ } +static void libvlc_media_player_destroy( libvlc_media_player_t * ); + /************************************************************************** * Create a Media Instance object. * @@@ -278,6 -280,7 +278,6 @@@ libvlc_media_player_new( libvlc_instanc 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 ); @@@ -323,7 -326,6 +323,7 @@@ /* 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 @@@ -345,8 -347,8 +345,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; @@@ -356,35 -358,80 +356,35 @@@ 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 ); - - libvlc_media_release( p_mi->p_md ); + else + release_input_thread( p_mi, true ); + libvlc_event_manager_release( p_mi->p_event_manager ); + if( p_mi->p_md ) + libvlc_media_release( p_mi->p_md ); + vlc_mutex_destroy( &p_mi->object_lock ); free( p_mi ); } @@@ -395,15 -442,28 +395,15 @@@ **************************************************************************/ 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 ); } /************************************************************************** @@@ -413,10 -473,11 +413,11 @@@ **************************************************************************/ 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 ); } /************************************************************************** @@@ -650,17 -711,31 +651,17 @@@ void libvlc_media_player_stop( libvlc_m 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 ); - - if( !p_input_thread ) - return; - - input_Stop( p_input_thread, true ); - vlc_object_release( p_input_thread ); - p_mi->p_input_thread = NULL; - } + 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 ); } /************************************************************************** * set_nsobject **************************************************************************/ void libvlc_media_player_set_nsobject( libvlc_media_player_t *p_mi, - void * drawable, - libvlc_exception_t *p_e ) + void * drawable, + libvlc_exception_t *p_e ) { (void) p_e; p_mi->drawable.nsobject = drawable;