vlc_object_find_name: return vlc_object_t *

[vlc] / include / vlc_objects.h

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index c3b207880a3c55a6c0fb9f0b4d167592ed388515..bf568ed474f89312c76c9f10544bbe30c1e358fa 100644 (file)
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -80,18 +80,18 @@ VLC_EXPORT( void *, __vlc_object_create, ( vlc_object_t *, int ) );
 VLC_EXPORT( void, __vlc_object_set_destructor, ( vlc_object_t *, vlc_destructor_t ) );
 VLC_EXPORT( void, __vlc_object_attach, ( vlc_object_t *, vlc_object_t * ) );
 VLC_EXPORT( void, __vlc_object_detach, ( vlc_object_t * ) );
-VLC_EXPORT( void *, vlc_object_get, ( int ) );
+#if defined (__GNUC__) && !defined __cplusplus
+__attribute__((deprecated))
+#endif
+VLC_EXPORT( void *, vlc_object_get, ( libvlc_int_t *, int ) );
 VLC_EXPORT( void *, __vlc_object_find, ( vlc_object_t *, int, int ) );
-VLC_EXPORT( void *, __vlc_object_find_name, ( vlc_object_t *, const char *, int ) );
+VLC_EXPORT( vlc_object_t *, vlc_object_find_name, ( vlc_object_t *, const char *, int ) );
 VLC_EXPORT( void, __vlc_object_yield, ( vlc_object_t * ) );
 VLC_EXPORT( void, __vlc_object_release, ( vlc_object_t * ) );
 VLC_EXPORT( vlc_list_t *, __vlc_list_find, ( vlc_object_t *, int, int ) );
 VLC_EXPORT( vlc_list_t *, __vlc_list_children, ( vlc_object_t * ) );
 VLC_EXPORT( void, vlc_list_release, ( vlc_list_t * ) );
 
-/* __vlc_object_dump */
-VLC_EXPORT( void, __vlc_object_dump, ( vlc_object_t *p_this ) );
-
 /*}@*/
 
 #define vlc_object_create(a,b) \
@@ -110,7 +110,7 @@ VLC_EXPORT( void, __vlc_object_dump, ( vlc_object_t *p_this ) );
     __vlc_object_find( VLC_OBJECT(a),b,c)
 
 #define vlc_object_find_name(a,b,c) \
-    __vlc_object_find_name( VLC_OBJECT(a),b,c)
+    vlc_object_find_name( VLC_OBJECT(a),b,c)
 
 #define vlc_object_yield(a) \
     __vlc_object_yield( VLC_OBJECT(a) )
@@ -124,10 +124,6 @@ VLC_EXPORT( void, __vlc_object_dump, ( vlc_object_t *p_this ) );
 #define vlc_list_children(a) \
     __vlc_list_children( VLC_OBJECT(a) )
 
-#define vlc_object_dump(a) \
-    __vlc_object_dump( VLC_OBJECT(a))
-
-
 /* Objects and threading */
 VLC_EXPORT( void, __vlc_object_lock, ( vlc_object_t * ) );
 #define vlc_object_lock( obj ) \
@@ -162,7 +158,7 @@ VLC_EXPORT( void, __vlc_object_kill, ( vlc_object_t * ) );
 #define vlc_object_kill(a) \
     __vlc_object_kill( VLC_OBJECT(a) )
 
-static inline bool __vlc_object_alive (vlc_object_t *obj)
+static inline bool __vlc_object_alive (const vlc_object_t *obj)
 {
     barrier ();
     return !obj->b_die;
@@ -174,26 +170,3 @@ static inline bool __vlc_object_alive (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) )
-
-