From ef49326ff53da4f4a9c83e51ced85fc4edf8821c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= Date: Tue, 15 Nov 2016 20:29:40 +0200 Subject: [PATCH] input: remove iput_item_t.i_id --- include/vlc_input_item.h | 2 -- modules/gui/qt/dialogs/messages.cpp | 2 +- src/input/item.c | 3 --- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/include/vlc_input_item.h b/include/vlc_input_item.h index b55eb098a7..37d84aa275 100644 --- a/include/vlc_input_item.h +++ b/include/vlc_input_item.h @@ -57,8 +57,6 @@ struct info_category_t */ struct input_item_t { - int i_id; /**< Identifier of the item */ - char *psz_name; /**< text describing this item */ char *psz_uri; /**< mrl of this item */ diff --git a/modules/gui/qt/dialogs/messages.cpp b/modules/gui/qt/dialogs/messages.cpp index 04d33938cc..b959622e04 100644 --- a/modules/gui/qt/dialogs/messages.cpp +++ b/modules/gui/qt/dialogs/messages.cpp @@ -363,7 +363,7 @@ static QTreeWidgetItem * PLWalk( playlist_item_t *p_node ) current->setText( 0, qfu( p_node->p_input->psz_name ) ); current->setToolTip( 0, qfu( p_node->p_input->psz_uri ) ); current->setText( 1, QString("%1").arg( p_node->i_id ) ); - current->setText( 2, QString("%1").arg( p_node->p_input->i_id ) ); + current->setText( 2, QString("%1").arg( (uintptr_t)p_node->p_input ) ); current->setText( 3, QString("0x%1").arg( p_node->i_flags, 0, 16 ) ); current->setText( 4, QString("0x%1").arg( p_node->p_input->i_type, 0, 16 ) ); for ( int i = 0; p_node->i_children > 0 && i < p_node->i_children; i++ ) diff --git a/src/input/item.c b/src/input/item.c index e39e34e00c..27bc789bae 100644 --- a/src/input/item.c +++ b/src/input/item.c @@ -1014,8 +1014,6 @@ input_item_t * input_item_NewExt( const char *psz_uri, const char *psz_name, mtime_t duration, int type, enum input_item_net_type i_net ) { - static atomic_uint last_input_id = ATOMIC_VAR_INIT(0); - input_item_owner_t *owner = calloc( 1, sizeof( *owner ) ); if( unlikely(owner == NULL) ) return NULL; @@ -1025,7 +1023,6 @@ input_item_NewExt( const char *psz_uri, const char *psz_name, input_item_t *p_input = &owner->item; vlc_event_manager_t * p_em = &p_input->event_manager; - p_input->i_id = atomic_fetch_add(&last_input_id, 1); vlc_mutex_init( &p_input->lock ); p_input->psz_name = NULL;