Move intf_EJect() out of core

[vlc] / include / vlc_objects.h

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index f6ac4219a6c86ebe00562aa8b950ba9218386906..b59bbc07bb87c2a8b1892074fe4ef81c4345bf20 100644 (file)
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -31,21 +31,7 @@
  * @{
  */
 
-/* Object types */
-#define VLC_OBJECT_INPUT       (-7)
-#define VLC_OBJECT_DECODER     (-8)
-#define VLC_OBJECT_VOUT        (-9)
-#define VLC_OBJECT_AOUT        (-10)
-/* Please add new object types below -34 */
-/* Please do not add new object types anyway */
-#define VLC_OBJECT_GENERIC     (-666)
-
-/* Object search mode */
-#define FIND_CHILD          0x0002
-#define FIND_ANYWHERE       0x0003
-
 /* Object flags */
-#define OBJECT_FLAGS_NODBG       0x0001
 #define OBJECT_FLAGS_QUIET       0x0002
 #define OBJECT_FLAGS_NOINTERACT  0x0004
 
@@ -62,8 +48,7 @@ struct vlc_object_t
  * Prototypes
  *****************************************************************************/
 VLC_API void *vlc_object_create( vlc_object_t *, size_t ) VLC_MALLOC VLC_USED;
-VLC_API void vlc_object_attach( vlc_object_t *, vlc_object_t * );
-VLC_API vlc_object_t *vlc_object_find_name( vlc_object_t *, const char *, int ) VLC_USED VLC_DEPRECATED;
+VLC_API vlc_object_t *vlc_object_find_name( vlc_object_t *, const char * ) VLC_USED VLC_DEPRECATED;
 VLC_API void * vlc_object_hold( vlc_object_t * );
 VLC_API void vlc_object_release( vlc_object_t * );
 VLC_API vlc_list_t *vlc_list_children( vlc_object_t * ) VLC_USED;
@@ -75,11 +60,8 @@ VLC_API char *vlc_object_get_name( const vlc_object_t * ) VLC_USED;
 
 #define vlc_object_create(a,b) vlc_object_create( VLC_OBJECT(a), b )
 
-#define vlc_object_attach(a,b) \
-    vlc_object_attach( VLC_OBJECT(a), VLC_OBJECT(b) )
-
-#define vlc_object_find_name(a,b,c) \
-    vlc_object_find_name( VLC_OBJECT(a),b,c)
+#define vlc_object_find_name(a,b) \
+    vlc_object_find_name( VLC_OBJECT(a),b)
 
 #define vlc_object_hold(a) \
     vlc_object_hold( VLC_OBJECT(a) )
@@ -95,7 +77,7 @@ VLC_API void vlc_object_kill( vlc_object_t * ) VLC_DEPRECATED;
 #define vlc_object_kill(a) \
     vlc_object_kill( VLC_OBJECT(a) )
 
-VLC_USED
+VLC_USED VLC_DEPRECATED
 static inline bool vlc_object_alive (const vlc_object_t *obj)
 {
     barrier ();