X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_objects.h;h=c6708750ee9cd68a9fce0246f019ad8aec80432b;hb=8cf743d02869333c2b6e3040f1e0a878a3a17ee7;hp=cb435161dc0082b8d9874a5172f691bb7e13c66c;hpb=6cf6df7c3f51c67217e591df83f254b914cea36f;p=vlc diff --git a/include/vlc_objects.h b/include/vlc_objects.h index cb435161dc..c6708750ee 100644 --- a/include/vlc_objects.h +++ b/include/vlc_objects.h @@ -1,24 +1,24 @@ /***************************************************************************** * vlc_objects.h: vlc_object_t definition and manipulation methods ***************************************************************************** - * Copyright (C) 2002-2008 the VideoLAN team + * Copyright (C) 2002-2008 VLC authors and VideoLAN * $Id$ * * Authors: Samuel Hocevar * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /** @@ -31,33 +31,10 @@ * @{ */ -/* Object types */ -#define VLC_OBJECT_INTF (-4) -#define VLC_OBJECT_INPUT (-7) -#define VLC_OBJECT_DECODER (-8) -#define VLC_OBJECT_VOUT (-9) -#define VLC_OBJECT_AOUT (-10) -#define VLC_OBJECT_PACKETIZER (-13) -#define VLC_OBJECT_ENCODER (-14) -/* 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 :-) *****************************************************************************/ @@ -70,77 +47,33 @@ 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 ) ); -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 * ) ); - -/*}@*/ - -#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_detach(a) \ - __vlc_object_detach( VLC_OBJECT(a) ) +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_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_create(a,b) vlc_object_create( VLC_OBJECT(a), 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) ) + 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_lock, ( vlc_object_t * ) ); -#define vlc_object_lock( obj ) \ - __vlc_object_lock( VLC_OBJECT( obj ) ) - -VLC_EXPORT( void, __vlc_object_unlock, ( vlc_object_t * ) ); -#define vlc_object_unlock( obj ) \ - __vlc_object_unlock( VLC_OBJECT( obj ) ) - -VLC_EXPORT( void, __vlc_object_assert_locked, ( vlc_object_t * ) ); -#define vlc_object_assert_locked( obj ) \ - __vlc_object_assert_locked( VLC_OBJECT( obj ) ) - -#if defined (__GNUC__) && !defined __cplusplus -__attribute__((deprecated)) -#endif -VLC_EXPORT( void, __vlc_object_wait, ( vlc_object_t * ) ); -#define vlc_object_wait( obj ) \ - __vlc_object_wait( VLC_OBJECT( obj ) ) - -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 (const vlc_object_t *obj) -{ - barrier (); - return !obj->b_die; -} - +VLC_API VLC_USED VLC_DEPRECATED bool vlc_object_alive (vlc_object_t *); #define vlc_object_alive(a) vlc_object_alive( VLC_OBJECT(a) ) + +/** @} */