vlc | branch: master | Thomas Guillem <[email protected]> | Mon Apr 15 15:20:42 2019 +0200| [83a737dc204e2c52df56c156a8b495fb91f895d6] | committer: Thomas Guillem
resource: remove unused HasVout > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=83a737dc204e2c52df56c156a8b495fb91f895d6 --- src/input/input_interface.h | 7 ------- src/input/resource.c | 10 ---------- src/playlist_legacy/thread.c | 8 -------- 3 files changed, 25 deletions(-) diff --git a/src/input/input_interface.h b/src/input/input_interface.h index 475c7c4c0f..2d93fe55df 100644 --- a/src/input/input_interface.h +++ b/src/input/input_interface.h @@ -43,11 +43,4 @@ void input_item_SetEpgOffline( input_item_t * ); */ void input_resource_TerminateSout( input_resource_t *p_resource ); -/** - * This function return true if there is at least one vout in the resources. - * - * It can only be called on detached resources. - */ -bool input_resource_HasVout( input_resource_t *p_resource ); - #endif diff --git a/src/input/resource.c b/src/input/resource.c index abaf40d104..23ad7426eb 100644 --- a/src/input/resource.c +++ b/src/input/resource.c @@ -484,16 +484,6 @@ void input_resource_TerminateVout( input_resource_t *p_resource ) vlc_mutex_unlock(&p_resource->lock); } -bool input_resource_HasVout( input_resource_t *p_resource ) -{ - vlc_mutex_lock( &p_resource->lock ); - assert( !p_resource->p_input ); - const bool b_vout = p_resource->p_vout_free != NULL; - vlc_mutex_unlock( &p_resource->lock ); - - return b_vout; -} - /* */ sout_instance_t *input_resource_RequestSout( input_resource_t *p_resource, sout_instance_t *p_sout, const char *psz_sout ) { diff --git a/src/playlist_legacy/thread.c b/src/playlist_legacy/thread.c index 26b06307c1..6d4cf9ee80 100644 --- a/src/playlist_legacy/thread.c +++ b/src/playlist_legacy/thread.c @@ -517,14 +517,6 @@ static void *Thread ( void *data ) msg_Info( p_playlist, "end of playlist, exiting" ); libvlc_Quit( vlc_object_instance(p_playlist) ); } - - /* Destroy any video display now (XXX: ugly hack) */ - if( input_resource_HasVout( p_sys->p_input_resource ) ) - { - PL_UNLOCK; /* Mind: NO LOCKS while manipulating input resources! */ - input_resource_TerminateVout( p_sys->p_input_resource ); - PL_LOCK; - } } PL_UNLOCK; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
