Remove SD object type

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index 1511427ffdfe4ed411c51378decea3624c5212c3..e59a09eaa6d1a3e70b8c16bc10e18d548a8d34d4 100644 (file)
--- 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 <sam@zoy.org>
@@ -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 bf53676ff4999a37e09987e7618d3f4c3b664194..0d13cba54854dce4927ef5a346e7f9e5ef7e9262 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_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 b1d4aea991db473c0985a5290140ca41595a7291..a83be8a2f9b7682a269b6bd8f8e4af8f24cd5662 100644 (file)
--- 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 <sam@zoy.org>
@@ -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 c7bc7eb06e0a495d06753b7b79e3d4665358d256..d938c437abb64c57b44f177f63f63a9b05496191 100644 (file)
--- 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;