[vlc-devel] commit: Revert "libvlc: Wait for input end." (Pierre d'Herbemont )

git version control git at videolan.org
Sun Mar 30 01:36:37 CET 2008


vlc | branch: master | Pierre d'Herbemont <pdherbemont at free.fr> | Sun Mar 30 01:36:26 2008 +0100| [cef623b97391ad3387938bbb297e2c16d2c2fbf4]

Revert "libvlc: Wait for input end."

This reverts commit 1dfd50c2ad27eba42ab4d39b84f9d04e6fc4d259.
This is no needed of such a hack if there is no circular dependency between input and vout and if the input are properly released.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cef623b97391ad3387938bbb297e2c16d2c2fbf4
---

 src/libvlc-common.c |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)

diff --git a/src/libvlc-common.c b/src/libvlc-common.c
index c3e9f01..7df76f7 100644
--- a/src/libvlc-common.c
+++ b/src/libvlc-common.c
@@ -931,7 +931,6 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
 {
     intf_thread_t      * p_intf = NULL;
     vout_thread_t      * p_vout = NULL;
-    input_thread_t     * p_input = NULL;
     aout_instance_t    * p_aout = NULL;
     announce_handler_t * p_announce = NULL;
 
@@ -950,15 +949,6 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
     msg_Dbg( p_libvlc, "removing playlist" );
     playlist_ThreadDestroy( p_libvlc->p_playlist );
 
-    /* Free input */
-    msg_Dbg( p_libvlc, "waiting all input end" );
-    while( (p_input = vlc_object_find( p_libvlc, VLC_OBJECT_INPUT, FIND_CHILD )) )
-    {
-        vlc_object_kill( p_input );
-        vlc_thread_join( p_input );
-        vlc_object_release( p_input );
-    }
-
     /* Free video outputs */
     msg_Dbg( p_libvlc, "removing all video outputs" );
     while( (p_vout = vlc_object_find( p_libvlc, VLC_OBJECT_VOUT, FIND_CHILD )) )




More information about the vlc-devel mailing list