Freetype: fallback to arial.ttf on Win32

[vlc] / include / vlc_objects.h

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index 8ffe9ae7c1a7321b6a5fcb332dd0fdc3905b3e78..b59bbc07bb87c2a8b1892074fe4ef81c4345bf20 100644 (file)
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -31,30 +31,10 @@
  * @{
  */
 
-/* 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_PARENT         0x0001
-#define FIND_CHILD          0x0002
-#define FIND_ANYWHERE       0x0003
-
-#define FIND_STRICT         0x0010
-
 /* Object flags */
-#define OBJECT_FLAGS_NODBG       0x0001
 #define OBJECT_FLAGS_QUIET       0x0002
 #define OBJECT_FLAGS_NOINTERACT  0x0004
 
-/* Types */
-typedef void (*vlc_destructor_t)(struct vlc_object_t *);
-
 /*****************************************************************************
  * The vlc_object_t type. Yes, it's that simple :-)
  *****************************************************************************/
@@ -67,59 +47,37 @@ struct vlc_object_t
 /*****************************************************************************
  * Prototypes
  *****************************************************************************/
-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 * ) );
-#if defined (__GNUC__) && !defined __cplusplus
-__attribute__((deprecated))
-#endif
-VLC_EXPORT( void *, __vlc_object_find, ( vlc_object_t *, int, int ) );
-#if defined (__GNUC__) && !defined __cplusplus
-__attribute__((deprecated))
-#endif
-VLC_EXPORT( vlc_object_t *, vlc_object_find_name, ( vlc_object_t *, const char *, int ) );
-VLC_EXPORT( void *, __vlc_object_hold, ( vlc_object_t * ) );
-VLC_EXPORT( void, __vlc_object_release, ( vlc_object_t * ) );
-VLC_EXPORT( vlc_list_t *, __vlc_list_children, ( vlc_object_t * ) );
-VLC_EXPORT( void, vlc_list_release, ( vlc_list_t * ) );
-VLC_EXPORT( char *, vlc_object_get_name, ( const vlc_object_t * ) ) LIBVLC_USED;
+VLC_API void *vlc_object_create( vlc_object_t *, size_t ) VLC_MALLOC VLC_USED;
+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;
+VLC_API void vlc_list_release( vlc_list_t * );
+VLC_API char *vlc_object_get_name( const vlc_object_t * ) VLC_USED;
 #define vlc_object_get_name(o) vlc_object_get_name(VLC_OBJECT(o))
 
-/*}@*/
-
-#define vlc_object_create(a,b) \
-    __vlc_object_create( VLC_OBJECT(a), b )
+/**}@*/
 
-#define vlc_object_set_destructor(a,b) \
-    __vlc_object_set_destructor( VLC_OBJECT(a), b )
+#define vlc_object_create(a,b) vlc_object_create( VLC_OBJECT(a), b )
 
-#define vlc_object_detach(a) \
-    __vlc_object_detach( VLC_OBJECT(a) )
-
-#define vlc_object_attach(a,b) \
-    __vlc_object_attach( VLC_OBJECT(a), VLC_OBJECT(b) )
-
-#define vlc_object_find(a,b,c) \
-    __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)
+#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) )
+    vlc_object_hold( VLC_OBJECT(a) )
 
 #define vlc_object_release(a) \
-    __vlc_object_release( VLC_OBJECT(a) )
+    vlc_object_release( VLC_OBJECT(a) )
 
 #define vlc_list_children(a) \
-    __vlc_list_children( VLC_OBJECT(a) )
+    vlc_list_children( VLC_OBJECT(a) )
 
 /* Objects and threading */
-VLC_EXPORT( void, __vlc_object_kill, ( vlc_object_t * ) );
+VLC_API void vlc_object_kill( vlc_object_t * ) VLC_DEPRECATED;
 #define vlc_object_kill(a) \
-    __vlc_object_kill( VLC_OBJECT(a) )
+    vlc_object_kill( VLC_OBJECT(a) )
 
+VLC_USED VLC_DEPRECATED
 static inline bool vlc_object_alive (const vlc_object_t *obj)
 {
     barrier ();
@@ -127,3 +85,5 @@ static inline bool vlc_object_alive (const vlc_object_t *obj)
 }
 
 #define vlc_object_alive(a) vlc_object_alive( VLC_OBJECT(a) )
+
+/** @} */