From 65340ca284dea0d1dd337b022934311ace637b65 Mon Sep 17 00:00:00 2001
From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <rdenis@simphalempin.com>
Date: Sun, 15 Jun 2008 19:34:40 +0300
Subject: [PATCH] Remove VLC_OBJECT_(ACCESS|DEMUX|STREAM) types

---
 include/vlc_objects.h           | 3 ---
 modules/misc/lua/libs/objects.c | 3 ---
 src/input/access.c              | 4 +++-
 src/input/demux.c               | 4 +++-
 src/input/input_internal.h      | 2 +-
 src/misc/objects.c              | 8 --------
 6 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index a41f74adaf..e25eb85006 100644
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -44,9 +44,6 @@
 #define VLC_OBJECT_ENCODER     (-14)
 #define VLC_OBJECT_DIALOGS     (-15)
 #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_OSDMENU     (-28)
diff --git a/modules/misc/lua/libs/objects.c b/modules/misc/lua/libs/objects.c
index f5c2f2f3e4..8bce1ecd66 100644
--- a/modules/misc/lua/libs/objects.c
+++ b/modules/misc/lua/libs/objects.c
@@ -100,9 +100,6 @@ static int vlc_object_type_from_string( const char *psz_name )
           { VLC_OBJECT_ENCODER, "encoder" },
           { VLC_OBJECT_DIALOGS, "dialogs" },
           { VLC_OBJECT_ANNOUNCE, "announce" },
-          { VLC_OBJECT_DEMUX, "demux" },
-          { VLC_OBJECT_ACCESS, "access" },
-          { VLC_OBJECT_STREAM, "stream" },
           { VLC_OBJECT_OPENGL, "opengl" },
           { VLC_OBJECT_FILTER, "filter" },
           { VLC_OBJECT_OSDMENU, "osdmenu" },
diff --git a/src/input/access.c b/src/input/access.c
index 49c6fd93dd..6b6f0f0ed5 100644
--- a/src/input/access.c
+++ b/src/input/access.c
@@ -36,7 +36,9 @@ static access_t *access_InternalNew( vlc_object_t *p_obj, const char *psz_access
                                       const char *psz_demux, const char *psz_path,
                                       access_t *p_source )
 {
-    access_t *p_access = vlc_object_create( p_obj, VLC_OBJECT_ACCESS );
+    static const char typename[] = "access";
+    access_t *p_access = vlc_custom_create( p_obj, sizeof (*p_access),
+                                            VLC_OBJECT_GENERIC, typename );
 
     if( p_access == NULL )
         return NULL;
diff --git a/src/input/demux.c b/src/input/demux.c
index 586bc0996e..26bdc36845 100644
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -41,7 +41,9 @@ demux_t *__demux_New( vlc_object_t *p_obj,
                        const char *psz_path,
                        stream_t *s, es_out_t *out, bool b_quick )
 {
-    demux_t *p_demux = vlc_object_create( p_obj, VLC_OBJECT_DEMUX );
+    static const char typename[] = "demux";
+    demux_t *p_demux = vlc_custom_create( p_obj, sizeof( *p_demux ),
+                                          VLC_OBJECT_GENERIC, typename );
     const char *psz_module;
 
     if( p_demux == NULL ) return NULL;
diff --git a/src/input/input_internal.h b/src/input/input_internal.h
index c1b25fe1e9..90cb3e9523 100644
--- a/src/input/input_internal.h
+++ b/src/input/input_internal.h
@@ -461,7 +461,7 @@ struct stream_t
 static inline stream_t *vlc_stream_create( vlc_object_t *obj )
 {
     return (stream_t *)vlc_custom_create( obj, sizeof(stream_t),
-                                          VLC_OBJECT_STREAM, "stream" );
+                                          VLC_OBJECT_GENERIC, "stream" );
 }
 
 #endif
diff --git a/src/misc/objects.c b/src/misc/objects.c
index 69a0e82402..9cea38cd13 100644
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -238,14 +238,6 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type )
             i_size = sizeof(intf_thread_t);
             psz_type = "dialogs";
             break;
-        case VLC_OBJECT_DEMUX:
-            i_size = sizeof(demux_t);
-            psz_type = "demux";
-            break;
-        case VLC_OBJECT_ACCESS:
-            i_size = sizeof(access_t);
-            psz_type = "access";
-            break;
         case VLC_OBJECT_DECODER:
             i_size = sizeof(decoder_t);
             psz_type = "decoder";
-- 
2.11.4.GIT