]> git.sesse.net Git - vlc/commitdiff
VLM : move input event callback deletion. In order to receive all inputs events it...
authorSébastien Escudier <sebastien-devel@celeos.eu>
Mon, 17 Aug 2009 14:38:56 +0000 (16:38 +0200)
committerRémi Denis-Courmont <remi@remlab.net>
Mon, 24 Aug 2009 19:05:05 +0000 (22:05 +0300)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
src/input/vlm.c

index 42fbe5ba326a27a0d6bcaa0b910b59f5a03e7f81..716bc7d0831a9fe22c63b6852c83080488b2d0aa 100644 (file)
@@ -805,11 +805,11 @@ static void vlm_MediaInstanceDelete( vlm_t *p_vlm, int64_t id, vlm_media_instanc
 
         input_Stop( p_input, true );
         vlc_thread_join( p_input );
-        var_DelCallback( p_instance->p_input, "intf-event", InputEvent, p_media );
 
         p_resource = input_DetachResource( p_input );
         input_resource_Delete( p_resource );
 
+        var_DelCallback( p_instance->p_input, "intf-event", InputEvent, p_media );
         vlc_object_release( p_input );
 
         vlm_SendEventMediaInstanceStopped( p_vlm, id, p_media->cfg.psz_name );
@@ -889,10 +889,10 @@ static int vlm_ControlMediaInstanceStart( vlm_t *p_vlm, int64_t id, const char *
 
         input_Stop( p_input, !p_input->b_eof && !p_input->b_error );
         vlc_thread_join( p_input );
-        var_DelCallback( p_instance->p_input, "intf-event", InputEvent, p_media );
 
         p_instance->p_input_resource = input_DetachResource( p_input );
 
+        var_DelCallback( p_instance->p_input, "intf-event", InputEvent, p_media );
         vlc_object_release( p_input );
 
         if( !p_instance->b_sout_keep )