Commit 2817b1e4 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove the object ID field

parent fddff181
...@@ -522,7 +522,6 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *, /* variable's object */ ...@@ -522,7 +522,6 @@ typedef int ( * vlc_callback_t ) ( vlc_object_t *, /* variable's object */
* these members are common for all vlc objects \ * these members are common for all vlc objects \
*/ \ */ \
/**@{*/ \ /**@{*/ \
int i_object_id; \
int i_object_type; \ int i_object_type; \
const char *psz_object_type; \ const char *psz_object_type; \
char *psz_object_name; \ char *psz_object_name; \
......
...@@ -187,7 +187,7 @@ void libvlc_wait( libvlc_instance_t *p_i ) ...@@ -187,7 +187,7 @@ void libvlc_wait( libvlc_instance_t *p_i )
int libvlc_get_vlc_id( libvlc_instance_t *p_instance ) 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) const char * libvlc_get_version(void)
......
...@@ -89,7 +89,6 @@ static void vlc_object_dump( vlc_object_t *p_this ); ...@@ -89,7 +89,6 @@ static void vlc_object_dump( vlc_object_t *p_this );
* Local structure lock * Local structure lock
*****************************************************************************/ *****************************************************************************/
static vlc_mutex_t structure_lock; static vlc_mutex_t structure_lock;
static unsigned object_counter = 0;
static void close_nocancel (int fd) static void close_nocancel (int fd)
{ {
...@@ -179,7 +178,6 @@ void *__vlc_custom_create( vlc_object_t *p_this, size_t i_size, ...@@ -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; p_priv->prev = vlc_internals (p_this)->prev;
vlc_internals (p_this)->prev = p_new; vlc_internals (p_this)->prev = p_new;
vlc_internals (p_priv->prev)->next = 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 ); vlc_mutex_unlock( &structure_lock );
if( i_type == VLC_OBJECT_LIBVLC ) if( i_type == VLC_OBJECT_LIBVLC )
......
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