Remove dead code (vlc_object_timedwait)

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index 67f26da1f7f8849e7a3a08cfbbb5a4c19f483d60..6e9b66a3ea049e510baed09e8036e1ce6c8f0558 100644 (file)
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -137,10 +137,6 @@ VLC_EXPORT( void, __vlc_object_wait, ( vlc_object_t * ) );
 #define vlc_object_wait( obj ) \
     __vlc_object_wait( VLC_OBJECT( obj ) )
 
-VLC_EXPORT( int, __vlc_object_timedwait, ( vlc_object_t *, mtime_t ) );
-#define vlc_object_timedwait( obj, d ) \
-    __vlc_object_timedwait( VLC_OBJECT( obj ), check_deadline(d) )
-
 VLC_EXPORT( void, __vlc_object_signal_unlocked, ( vlc_object_t * ) );
 #define vlc_object_signal_unlocked( obj ) \
     __vlc_object_signal_unlocked( VLC_OBJECT( obj ) )

diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 27e8df2083b8e0dfb094a6ab56d457fea209426d..c10802c4cc4f2227e83e5f779a119ea0a3a53d39 100644 (file)
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -482,7 +482,6 @@ __vlc_object_lock
 __vlc_object_release
 __vlc_object_set_destructor
 __vlc_object_signal_unlocked
-__vlc_object_timedwait
 __vlc_object_unlock
 __vlc_object_wait
 __vlc_object_waitpipe

diff --git a/src/misc/objects.c b/src/misc/objects.c
index 4a9f75ad943759986abc8ed10426cb096faed4d8..2db5941bd558295f38f1b1ad552be12c6e18d216 100644 (file)
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -481,22 +481,6 @@ void __vlc_object_wait( vlc_object_t *obj )
 }
 
 
-/**
- * Same as vlc_object_wait(), with an additional time-out.
- *
- * @param deadline <b>absolute</b> time-out (using the same clock as mdate())
- *
- * @return 0 if the object was signaled before the timer expiration, or
- * ETIMEDOUT if the timer expired without any signal.
- */
-int __vlc_object_timedwait( vlc_object_t *obj, mtime_t deadline )
-{
-    vlc_object_internals_t *priv = vlc_internals( obj );
-    vlc_assert_locked( &priv->lock);
-    return vlc_cond_timedwait( &priv->wait, &priv->lock, deadline );
-}
-
-
 /**
  * Wakes up one thread waiting on the object. If no thread are (yet) waiting,
  * nothing happens.