Remove VOD object type - not actually needed
authorRémi Denis-Courmont <rem@videolan.org>
Sat, 29 Mar 2008 09:04:54 +0000 (11:04 +0200)
committerRémi Denis-Courmont <rem@videolan.org>
Sat, 29 Mar 2008 09:04:54 +0000 (11:04 +0200)
include/vlc_objects.h
modules/misc/lua/objects.c
src/input/vlm.c
src/misc/objects.c

index b9d9a94..400bbc8 100644 (file)
@@ -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)
index 188d4ea..75481cc 100644 (file)
@@ -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" },
index b70bdde..230259f 100644 (file)
@@ -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 )
index 4e5127c..dacc3a6 100644 (file)
@@ -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";