Remove VOD object type - not actually needed

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index b9d9a94acb1b2ee0412427c2d77fb1daf967e837..400bbc828b6666f1109dcce703dd72b7b1a3bdc2 100644 (file)
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -58,7 +58,7 @@
 #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_SD          (-26)

diff --git a/modules/misc/lua/objects.c b/modules/misc/lua/objects.c
index 188d4ea0b2a896a0e39edbedd30321b7faa87b6e..75481cc92287e150540fbc38e95a84e25b1c96b1 100644 (file)
--- a/modules/misc/lua/objects.c
+++ b/modules/misc/lua/objects.c
@@ -128,7 +128,6 @@ static int vlc_object_type_from_string( const char *psz_name )
           { VLC_OBJECT_STREAM, "stream" },
           { VLC_OBJECT_OPENGL, "opengl" },
           { VLC_OBJECT_FILTER, "filter" },
-          { VLC_OBJECT_VOD, "vod" },
           { VLC_OBJECT_SPU, "spu" },
           { VLC_OBJECT_SD, "sd" },
           { VLC_OBJECT_XML, "xml" },

diff --git a/src/input/vlm.c b/src/input/vlm.c
index b70bdde3df7c15a724acc2efb6b4b8a1ef61c4e2..230259fd6b4688a3e4feb756b74100b5edec8403 100644 (file)
--- a/src/input/vlm.c
+++ b/src/input/vlm.c
@@ -2331,7 +2331,9 @@ static int vlm_ControlMediaAdd( vlm_t *p_vlm, vlm_media_t *p_cfg, int64_t *p_id
     /* Check if we need to load the VOD server */
     if( p_cfg->b_vod && !p_vlm->i_vod )
     {
-        p_vlm->p_vod = vlc_object_create( p_vlm, VLC_OBJECT_VOD );
+        p_vlm->p_vod = vlc_custom_create( VLC_OBJECT(p_vlm),
+                                          sizeof( p_vlm->p_vod ),
+                                          VLC_OBJECT_GENERIC, "vod server" );
         vlc_object_attach( p_vlm->p_vod, p_vlm );
         p_vlm->p_vod->p_module = module_Need( p_vlm->p_vod, "vod server", 0, 0 );
         if( !p_vlm->p_vod->p_module )

diff --git a/src/misc/objects.c b/src/misc/objects.c
index 4e5127cdc66656de38f9b8afa979c4b0d5308c69..dacc3a6258ca72cfe479824135e988dc660e81d9 100644 (file)
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -56,7 +56,6 @@
 #include "vlc_httpd.h"
 #include "vlc_vlm.h"
 #include "input/vlm_internal.h"
-#include "vlc_vod.h"
 #include "vlc_tls.h"
 #include "vlc_xml.h"
 #include "vlc_osd.h"
@@ -320,10 +319,6 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type )
             i_size = sizeof( vlm_t );
             psz_type = "vlm dameon";
             break;
-        case VLC_OBJECT_VOD:
-            i_size = sizeof( vod_t );
-            psz_type = "vod server";
-            break;
         case VLC_OBJECT_XML:
             i_size = sizeof( xml_t );
             psz_type = "xml";