From bb5a8eb81e72432957f7dc0de32a9ae440884f62 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sat, 29 Mar 2008 11:16:41 +0200 Subject: [PATCH] Remove SD object type --- include/vlc_objects.h | 4 ++-- modules/misc/lua/objects.c | 1 - src/misc/objects.c | 6 +----- src/playlist/services_discovery.c | 4 +++- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/include/vlc_objects.h b/include/vlc_objects.h index 1511427ffd..e59a09eaa6 100644 --- a/include/vlc_objects.h +++ b/include/vlc_objects.h @@ -1,7 +1,7 @@ /***************************************************************************** * vlc_objects.h: vlc_object_t definition and manipulation methods ***************************************************************************** - * Copyright (C) 2002-2006 the VideoLAN team + * Copyright (C) 2002-2008 the VideoLAN team * $Id$ * * Authors: Samuel Hocevar @@ -61,7 +61,7 @@ -#define VLC_OBJECT_SD (-26) + #define VLC_OBJECT_XML (-27) #define VLC_OBJECT_OSDMENU (-28) #define VLC_OBJECT_STATS (-29) diff --git a/modules/misc/lua/objects.c b/modules/misc/lua/objects.c index bf53676ff4..0d13cba548 100644 --- 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_SD, "sd" }, { VLC_OBJECT_XML, "xml" }, { VLC_OBJECT_OSDMENU, "osdmenu" }, { VLC_OBJECT_HTTPD_HOST, "httpd_host" }, diff --git a/src/misc/objects.c b/src/misc/objects.c index b1d4aea991..a83be8a2f9 100644 --- a/src/misc/objects.c +++ b/src/misc/objects.c @@ -1,7 +1,7 @@ /***************************************************************************** * objects.c: vlc_object_t handling ***************************************************************************** - * Copyright (C) 2004-2007 the VideoLAN team + * Copyright (C) 2004-2008 the VideoLAN team * $Id$ * * Authors: Samuel Hocevar @@ -266,10 +266,6 @@ void * __vlc_object_create( vlc_object_t *p_this, int i_type ) i_size = sizeof(playlist_t); psz_type = "playlist"; break; - case VLC_OBJECT_SD: - i_size = sizeof(services_discovery_t); - psz_type = "services discovery"; - break; case VLC_OBJECT_INPUT: i_size = sizeof(input_thread_t); psz_type = "input"; diff --git a/src/playlist/services_discovery.c b/src/playlist/services_discovery.c index c7bc7eb06e..d938c437ab 100644 --- a/src/playlist/services_discovery.c +++ b/src/playlist/services_discovery.c @@ -55,7 +55,9 @@ char ** __services_discovery_GetServicesNames( vlc_object_t * p_super, services_discovery_t * services_discovery_Create ( vlc_object_t * p_super, const char * psz_module_name ) { - services_discovery_t *p_sd = vlc_object_create( p_super, VLC_OBJECT_SD ); + services_discovery_t *p_sd; + p_sd = vlc_custom_create( p_super, sizeof( *p_sd ), VLC_OBJECT_GENERIC, + "services discovery" ); if( !p_sd ) return NULL; -- 2.39.2