[vlc-devel] commit: Removed es_out_Lock/Unlock. (Laurent Aimar )

[git version control]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Tue Nov 11 21:16:04 2008 +0100| [b558a0cc74be26a6181114ff1099461d156ff103] | committer: Laurent Aimar 

Removed es_out_Lock/Unlock.

 Demuxer running their own thread sending data to es_out will have to
properly handle es_out (reset).

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

 src/input/es_out.c |    8 --------
 src/input/es_out.h |   16 ----------------
 src/input/input.c  |    4 ----
 3 files changed, 0 insertions(+), 28 deletions(-)

diff --git a/src/input/es_out.c b/src/input/es_out.c
index f15c4be..67332cb 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -2364,14 +2364,6 @@ static int EsOutControlLocked( es_out_t *out, int i_query, va_list args )
             EsOutFrameNext( out );
             return VLC_SUCCESS;
 
-        case ES_OUT_LOCK:
-            vlc_mutex_lock( &p_sys->lock );
-            return VLC_SUCCESS;
-
-        case ES_OUT_UNLOCK:
-            vlc_mutex_unlock( &p_sys->lock );
-            return VLC_SUCCESS;
-
         default:
             msg_Err( p_sys->p_input, "unknown query in es_out_Control" );
             return VLC_EGENERIC;
diff --git a/src/input/es_out.h b/src/input/es_out.h
index 681cd8b..84812c1 100644
--- a/src/input/es_out.h
+++ b/src/input/es_out.h
@@ -64,12 +64,6 @@ enum es_out_query_private_e
 
     /* Set next frame */
     ES_OUT_SET_FRAME_NEXT,                          /*                          res=can fail */
-
-    /* Lock/Unlock es_out
-     * XXX es_out is safe without them, but they ensure coherency between
-     * calls if needed (if es_out is called outside of the main thread) */
-    ES_OUT_LOCK,                                    /*                          res=cannot fail */
-    ES_OUT_UNLOCK,                                  /*                          res=cannot fail */
 };
 
 static inline mtime_t es_out_GetWakeup( es_out_t *p_out )
@@ -120,16 +114,6 @@ static inline int es_out_SetFrameNext( es_out_t *p_out )
 {
     return es_out_Control( p_out, ES_OUT_SET_FRAME_NEXT );
 }
-static inline void es_out_Lock( es_out_t *p_out )
-{
-    int i_ret = es_out_Control( p_out, ES_OUT_LOCK );
-    assert( !i_ret );
-}
-static inline void es_out_Unlock( es_out_t *p_out )
-{
-    int i_ret = es_out_Control( p_out, ES_OUT_UNLOCK );
-    assert( !i_ret );
-}
 
 es_out_t  *input_EsOutNew( input_thread_t *, int i_rate );
 
diff --git a/src/input/input.c b/src/input/input.c
index 5a668ed..8864c2e 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -1560,8 +1560,6 @@ static bool Control( input_thread_t *p_input, int i_type,
     if( !p_input )
         return b_force_update;
 
-    es_out_Lock( p_input->p->p_es_out );
-
     switch( i_type )
     {
         case INPUT_CONTROL_SET_DIE:
@@ -2076,8 +2074,6 @@ static bool Control( input_thread_t *p_input, int i_type,
             break;
     }
 
-    es_out_Unlock( p_input->p->p_es_out );
-
     return b_force_update;
 }