Remove the object ID field

diff --git a/include/vlc_common.h b/include/vlc_common.h
index b52c80fc81f75b6658c1592eaf1b4f4224b249af..a8308b81b9bfe955f33a39b794a68e8b995d6244 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -522,7 +522,6 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *,      /* variable's object */
  * these members are common for all vlc objects                             \
  */                                                                         \
 /**@{*/                                                                     \
-    int   i_object_id;                                                      \
     int   i_object_type;                                                    \
     const char *psz_object_type;                                            \
     char *psz_object_name;                                                  \

diff --git a/src/control/core.c b/src/control/core.c
index 9db56144d44321dda1455f95b17e01f0dc2cebf7..843410b6ece521ce1ea992449f04a6bf87b4f819 100644 (file)
--- a/src/control/core.c
+++ b/src/control/core.c
@@ -187,7 +187,7 @@ void libvlc_wait( libvlc_instance_t *p_i )
 
 int libvlc_get_vlc_id( libvlc_instance_t *p_instance )
 {
-    return p_instance->p_libvlc_int->i_object_id;
+    return 1;
 }
 
 const char * libvlc_get_version(void)

diff --git a/src/misc/objects.c b/src/misc/objects.c
index f806c619d075538f57da1aa7d6ea19028152c0c7..5216552f85ffb618fd3fcaf3ef01e8e6abd521f7 100644 (file)
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -89,7 +89,6 @@ static void vlc_object_dump( vlc_object_t *p_this );
  * Local structure lock
  *****************************************************************************/
 static vlc_mutex_t structure_lock;
-static unsigned    object_counter = 0;
 
 static void close_nocancel (int fd)
 {
@@ -179,7 +178,6 @@ void *__vlc_custom_create( vlc_object_t *p_this, size_t i_size,
     p_priv->prev = vlc_internals (p_this)->prev;
     vlc_internals (p_this)->prev = p_new;
     vlc_internals (p_priv->prev)->next = p_new;
-    p_new->i_object_id = object_counter++; /* fetch THEN increment */
     vlc_mutex_unlock( &structure_lock );
 
     if( i_type == VLC_OBJECT_LIBVLC )