From 2817b1e41d8c5ea0cfe52493751921403b3e0e13 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sat, 20 Sep 2008 16:48:54 +0300 Subject: [PATCH] Remove the object ID field --- include/vlc_common.h | 1 - src/control/core.c | 2 +- src/misc/objects.c | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/include/vlc_common.h b/include/vlc_common.h index b52c80fc81..a8308b81b9 100644 --- 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 9db56144d4..843410b6ec 100644 --- 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 f806c619d0..5216552f85 100644 --- 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 ) -- 2.39.2