[vlc-commits] input: remove input_Join() and input_Release()

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed May 20 22:53:31 2015 +0300| [c7734fccf4eeed529189a7432d111e98a7877e49] | committer: Rémi Denis-Courmont

input: remove input_Join() and input_Release()

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

 include/vlc_input.h |    2 --
 src/input/input.c   |   16 +++-------------
 src/input/vlm.c     |    8 ++------
 3 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/include/vlc_input.h b/include/vlc_input.h
index bb478e8..475a6d2 100644
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -508,8 +508,6 @@ VLC_API int input_vaControl( input_thread_t *, int i_query, va_list  );
 VLC_API int input_Control( input_thread_t *, int i_query, ...  );
 
 VLC_API void input_Close( input_thread_t * );
-void input_Join( input_thread_t * );
-void input_Release( input_thread_t * );
 
 /**
  * Get the input item for an input thread
diff --git a/src/input/input.c b/src/input/input.c
index bfebf30..a854d0d 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -248,17 +248,6 @@ void input_Stop( input_thread_t *p_input )
     input_ControlPush( p_input, INPUT_CONTROL_SET_DIE, NULL );
 }
 
-void input_Join( input_thread_t *p_input )
-{
-    if( p_input->p->is_running )
-        vlc_join( p_input->p->thread, NULL );
-}
-
-void input_Release( input_thread_t *p_input )
-{
-    vlc_object_release( p_input );
-}
-
 /**
  * Close an input
  *
@@ -266,8 +255,9 @@ void input_Release( input_thread_t *p_input )
  */
 void input_Close( input_thread_t *p_input )
 {
-    input_Join( p_input );
-    input_Release( p_input );
+    if( p_input->p->is_running )
+        vlc_join( p_input->p->thread, NULL );
+    vlc_object_release( p_input );
 }
 
 /**
diff --git a/src/input/vlm.c b/src/input/vlm.c
index 0f57768..da1e9d4 100644
--- a/src/input/vlm.c
+++ b/src/input/vlm.c
@@ -905,9 +905,7 @@ static void vlm_MediaInstanceDelete( vlm_t *p_vlm, int64_t id, vlm_media_instanc
     if( p_input )
     {
         input_Stop( p_input );
-        input_Join( p_input );
-        var_DelCallback( p_instance->p_input, "intf-event", InputEvent, p_media );
-        input_Release( p_input );
+        input_Close( p_input );
 
         vlm_SendEventMediaInstanceStopped( p_vlm, id, p_media->cfg.psz_name );
     }
@@ -997,9 +995,7 @@ static int vlm_ControlMediaInstanceStart( vlm_t *p_vlm, int64_t id, const char *
 
 
         input_Stop( p_input );
-        input_Join( p_input );
-        var_DelCallback( p_instance->p_input, "intf-event", InputEvent, p_media );
-        input_Release( p_input );
+        input_Close( p_input );
 
         if( !p_instance->b_sout_keep )
             input_resource_TerminateSout( p_instance->p_input_resource );