Remove VLC_OBJECT_(ACCESS|DEMUX|STREAM) types

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index a41f74adafcea4f8a743525d6d861649fa278f48..e25eb85006528aaad5e9b18cdb24ec0e8b15e014 100644 (file)
--- 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 f5c2f2f3e48bfa2f1ccf886b08add930575be3fd..8bce1ecd6614b0b14b183ba7a80b1929e0ae38d7 100644 (file)
--- 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 49c6fd93ddce5fcd71ab5e295f941065befa1665..6b6f0f0ed54f2cc33c4592958393d5c88b8d0db1 100644 (file)
--- 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 586bc0996ec93c4a8bdb3f4af348e2dd294c35c5..26bdc36845f31c73240193945c16532392da3668 100644 (file)
--- 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 c1b25fe1e9fb1d5ec822c13f80323e924fd331b8..90cb3e952397bae4342c3ea4c9b16460ff00327b 100644 (file)
--- 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 69a0e82402549b89e6432d552e56f2dbefc9b1c9..9cea38cd136b971fa2d58247f45d371c8afbbe95 100644 (file)
--- 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";