X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_objects.h;h=c6708750ee9cd68a9fce0246f019ad8aec80432b;hb=99f48b0e95b678780fb692108254016189d3fbe4;hp=71c1ab7d2a8fd33c0b5abf24cdf0d1c2dd32f70d;hpb=7720f981f852178fce00656126859d6b091055b1;p=vlc

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index 71c1ab7d2a..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 <sam@zoy.org>
  *
- * 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,17 +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 flags */
-#define OBJECT_FLAGS_NODBG       0x0001
 #define OBJECT_FLAGS_QUIET       0x0002
 #define OBJECT_FLAGS_NOINTERACT  0x0004
 
@@ -83,17 +73,7 @@ VLC_API char *vlc_object_get_name( const vlc_object_t * ) VLC_USED;
     vlc_list_children( VLC_OBJECT(a) )
 
 /* Objects and threading */
-VLC_API void vlc_object_kill( vlc_object_t * ) VLC_DEPRECATED;
-#define vlc_object_kill(a) \
-    vlc_object_kill( VLC_OBJECT(a) )
-
-VLC_USED
-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) )
 
 /** @} */