[vlc-devel] commit: input: small code factorization ( Rémi Denis-Courmont )

git version control git at videolan.org
Mon Jan 12 20:21:06 CET 2009


vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Mon Jan 12 21:20:37 2009 +0200| [ea55389548eaef12e18b3972be82ed8b3966fb3e] | committer: Rémi Denis-Courmont 

input: small code factorization

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

 src/input/input.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/input/input.c b/src/input/input.c
index 9a0c5bc..cbd363a 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -519,9 +519,6 @@ static void *Run( vlc_object_t *p_this )
     {
         /* If we failed, wait before we are killed, and exit */
         WaitDie( p_input );
-
-        /* Tell we're dead */
-        input_SendEventDead( p_input );
         goto exit;
     }
 
@@ -535,6 +532,8 @@ static void *Run( vlc_object_t *p_this )
     End( p_input );
 
 exit:
+    /* Tell we're dead */
+    input_SendEventDead( p_input );
     vlc_restorecancel( canc );
     return NULL;
 }
@@ -1385,9 +1384,6 @@ static void End( input_thread_t * p_input )
     input_ressource_RequestSout( p_input->p->p_ressource,
                                  p_input->p->p_sout, NULL );
     input_ressource_SetInput( p_input->p->p_ressource, NULL );
-
-    /* Tell we're dead */
-    input_SendEventDead( p_input );
 }
 
 /*****************************************************************************




More information about the vlc-devel mailing list