X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_objects.h;h=bc48112f9f535b75e11a851cf2691ac8c642b695;hb=90665d70ab2119bc58a12117b3763cbca049b9a2;hp=5ced55bffae2b37dc7f5d7976a0afd4dc0c73d2a;hpb=3a5ec777c6ebdb84f8b908c7613a73499e0c8a43;p=vlc

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index 5ced55bffa..bc48112f9f 100644
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -2,7 +2,7 @@
  * vlc_objects.h: vlc_object_t definition.
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: vlc_objects.h,v 1.20 2003/10/14 22:41:41 gbazin Exp $
+ * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -10,7 +10,7 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 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
@@ -26,7 +26,7 @@
  * This file defines the vlc_object_t structure and object types
  */
 
-/** 
+/**
  * \defgroup vlc_object Objects
  * @{
  */
@@ -40,15 +40,16 @@
 #define VLC_OBJECT_ITEM       (-6)
 #define VLC_OBJECT_INPUT      (-7)
 #define VLC_OBJECT_DECODER    (-8)
-/* tmp for backward compat */
-#define VLC_OBJECT_DECODER_FIFO (-999)
 #define VLC_OBJECT_VOUT       (-9)
-#define VLC_OBJECT_AOUT      (-10)
-#define VLC_OBJECT_SOUT      (-11)
-#define VLC_OBJECT_HTTPD     (-12)
+#define VLC_OBJECT_AOUT       (-10)
+#define VLC_OBJECT_SOUT       (-11)
+#define VLC_OBJECT_HTTPD      (-12)
 #define VLC_OBJECT_PACKETIZER (-13)
-#define VLC_OBJECT_ENCODER   (-14)
-#define VLC_OBJECT_DIALOGS   (-15)
+#define VLC_OBJECT_ENCODER    (-14)
+#define VLC_OBJECT_DIALOGS    (-15)
+#define VLC_OBJECT_VLM        (-16)
+#define VLC_OBJECT_ANNOUNCE   (-17)
+#define VLC_OBJECT_DEMUX      (-18)
 
 #define VLC_OBJECT_GENERIC  (-666)