Commit 1e8999a2 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Create VLM as a custom object

parent 8654870c
......@@ -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 );
......
......@@ -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";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment