[vlc-devel] commit: Create VLM as a custom object ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rem at videolan.org> | Sat Mar 29 13:02:07 2008 +0200| [1e8999a2b68e8dfca7798051a42e81c0be7528b7]

Create VLM as a custom object

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1e8999a2b68e8dfca7798051a42e81c0be7528b7
---

 src/input/vlm.c    |    4 +++-
 src/misc/objects.c |    6 ------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/input/vlm.c b/src/input/vlm.c
index 3138e91..62705f9 100644
--- a/src/input/vlm.c
+++ b/src/input/vlm.c
@@ -102,6 +102,7 @@ vlm_t *__vlm_New ( vlc_object_t *p_this )
     vlc_value_t lockval;
     vlm_t *p_vlm = NULL;
     char *psz_vlmconf;
+    static const char vlm_object_name[] = "vlm daemon";
 
     /* Avoid multiple creation */
     if( var_Create( p_this->p_libvlc, "vlm_mutex", VLC_VAR_MUTEX ) ||
@@ -120,7 +121,8 @@ vlm_t *__vlm_New ( vlc_object_t *p_this )
 
     msg_Dbg( p_this, "creating VLM" );
 
-    p_vlm = vlc_object_create( p_this, VLC_OBJECT_VLM );
+    p_vlm = vlc_custom_create( p_this, sizeof( *p_vlm), VLC_OBJECT_VLM,
+                               vlm_object_name );
     if( !p_vlm )
     {
         vlc_mutex_unlock( lockval.p_address );
diff --git a/src/misc/objects.c b/src/misc/objects.c
index d0074f4..7479b55 100644
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -53,8 +53,6 @@
 #include "vlc_codec.h"
 #include "vlc_filter.h"
 
-#include "vlc_vlm.h"
-#include "input/vlm_internal.h"
 #include "vlc_osd.h"
 #include "vlc_meta.h"
 
@@ -304,10 +302,6 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type )
             i_size = sizeof(sout_instance_t);
             psz_type = "stream output";
             break;
-        case VLC_OBJECT_VLM:
-            i_size = sizeof( vlm_t );
-            psz_type = "vlm dameon";
-            break;
         case VLC_OBJECT_OPENGL:
             i_size = sizeof( vout_thread_t );
             psz_type = "opengl";