Inline vlc_object_signal

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index 46103b16e257611c79ac5f0a5e20ffd1cc8e5911..16b48ae7b626773d43541e2481686d05d34d8461 100644 (file)
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -174,7 +174,12 @@ VLC_EXPORT( void, __vlc_object_signal_unlocked, ( vlc_object_t * ) );
 #define vlc_object_signal_unlocked( obj ) \
     __vlc_object_signal_unlocked( VLC_OBJECT( obj ) )
 
-VLC_EXPORT( void, __vlc_object_signal, ( vlc_object_t * ) );
+static inline void __vlc_object_signal( vlc_object_t *obj )
+{
+    vlc_oject_lock( obj );
+    vlc_object_signal_unlocked( obj );
+    vlc_object_unlock( obj );
+}
 #define vlc_object_signal( obj ) \
     __vlc_object_signal( VLC_OBJECT( obj ) )
 

diff --git a/src/misc/objects.c b/src/misc/objects.c
index b1d27d0b3bd2bea32d5ae4d861bb52d8931fb994..6b06f868995a30fbdd2ff29d3ede653390f24a1f 100644 (file)
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -506,17 +506,6 @@ void __vlc_object_signal_unlocked( vlc_object_t *obj )
 }
 
 
-/**
- * Signals an object for which the lock is NOT held.
- */
-void __vlc_object_signal( vlc_object_t *obj )
-{
-    vlc_mutex_lock( &obj->object_lock );
-    vlc_object_signal_unlocked( obj );
-    vlc_mutex_unlock( &obj->object_lock );
-}
-
-
 /**
  * Requests termination of an object.
  * If the object is LibVLC, also request to terminate all its children.