vlc_object_lock_and_wait: broken by design, remove

The only user is LUA, inlined there. The return value seems suspicious
by the way.

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index c31436c1176c092ea3ac81ee25528e88417ee0c9..a75a9b0d1f3f71b921a5763581d525f8c595f612 100644 (file)
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -177,26 +177,3 @@ static inline bool __vlc_object_alive (const vlc_object_t *obj)
 VLC_EXPORT( int, __vlc_object_waitpipe, ( vlc_object_t *obj ));
 #define vlc_object_waitpipe(a) \
     __vlc_object_waitpipe( VLC_OBJECT(a) )
-
-/* NOTE: this function is a *temporary* convenience.
- * See the vlc_object_alive() documentation for a better alternative.
- */
-static inline
-bool __vlc_object_lock_and_wait( vlc_object_t *obj )
-{
-    bool b;
-
-    vlc_object_lock( obj );
-    b = vlc_object_alive( obj );
-    if( b )
-    {
-        vlc_object_wait( obj );
-        b = vlc_object_alive( obj );
-    }
-    vlc_object_unlock( obj );
-    return b;
-}
-#define vlc_object_lock_and_wait( obj ) \
-    __vlc_object_lock_and_wait( VLC_OBJECT(obj) )
-
-

diff --git a/modules/misc/lua/libs/misc.c b/modules/misc/lua/libs/misc.c
index 6efec4aa5e1743d664cee3fc24225cd835963fac..08804a17d33afab50db57100f3e1e80c9ba32712 100644 (file)
--- a/modules/misc/lua/libs/misc.c
+++ b/modules/misc/lua/libs/misc.c
@@ -171,7 +171,15 @@ static int vlclua_datadir_list( lua_State *L )
 static int vlclua_lock_and_wait( lua_State *L )
 {
     vlc_object_t *p_this = vlclua_get_this( L );
-    int b_quit = vlc_object_lock_and_wait( p_this );
+    int b_quit;
+
+    vlc_object_lock( p_this );
+    b_quit = vlc_object_alive( p_this );
+    if( b_quit )
+    {
+        vlc_object_wait( p_this );
+        b_quit = vlc_object_alive( p_this );
+    }
     lua_pushboolean( L, b_quit );
     return 1;
 }