hummmmmm ... breaking opengl build on windows isn't a good idea

[vlc] / include / vlc_objects.h

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index 5ced55bffae2b37dc7f5d7976a0afd4dc0c73d2a..52265d88a4cdabb178f7f934ac0d603878c982d4 100644 (file)
--- 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,25 @@
 #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_ACCESS     (-19)
+#define VLC_OBJECT_STREAM     (-20)
+#define VLC_OBJECT_OPENGL     (-21)
+#define VLC_OBJECT_FILTER     (-22)
+#define VLC_OBJECT_VOD        (-23)
+#define VLC_OBJECT_SPU        (-24)
+#define VLC_OBJECT_TLS        (-25)
+#define VLC_OBJECT_SD         (-26)
+#define VLC_OBJECT_XML        (-27)
 
 #define VLC_OBJECT_GENERIC  (-666)