Commit 2e50c820 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Revert "qt4: use longname to search activated input-item"

This reverts commit edcc45df.

This causes segmentation faults and breaks SD categories.
parent 548b93d0
...@@ -82,21 +82,23 @@ void PLSelector::setSource( QTreeWidgetItem *item ) ...@@ -82,21 +82,23 @@ void PLSelector::setSource( QTreeWidgetItem *item )
if( !playlist_IsServicesDiscoveryLoaded( THEPL, qtu( qs ) ) ) if( !playlist_IsServicesDiscoveryLoaded( THEPL, qtu( qs ) ) )
{ {
playlist_ServicesDiscoveryAdd( THEPL, qtu( qs ) ); playlist_ServicesDiscoveryAdd( THEPL, qtu( qs ) );
#warning FIXME
playlist_item_t *pl_item =
THEPL->p_root_category->pp_children[THEPL->p_root_category->i_children-1];
item->setData( 0, PPL_ITEM_ROLE, QVariant::fromValue( pl_item ) );
emit activated( pl_item );
return;
} }
} }
if( i_type == SD_TYPE ) if( i_type == SD_TYPE )
msg_Dbg( p_intf, "SD already loaded, reloading" ); msg_Dbg( p_intf, "SD already loaded, reloading" );
playlist_Lock( THEPL );
playlist_item_t *pl_item = playlist_item_t *pl_item =
playlist_ChildSearchName( THEPL->p_root_onelevel, qtu( item->data(0, LONGNAME_ROLE ).toString() ) ); item->data( 0, PPL_ITEM_ROLE ).value<playlist_item_t *>();
playlist_Unlock( THEPL );
if( pl_item ) if( pl_item )
emit activated( pl_item ); emit activated( pl_item );
else
msg_Info( p_intf, "no node found for %s", qtu( item->data(0, LONGNAME_ROLE ).toString() ) );
} }
void PLSelector::createItems() void PLSelector::createItems()
...@@ -133,7 +135,6 @@ void PLSelector::createItems() ...@@ -133,7 +135,6 @@ void PLSelector::createItems()
sd_item = new QTreeWidgetItem( QStringList( qfu(*ppsz_longname) ) ); sd_item = new QTreeWidgetItem( QStringList( qfu(*ppsz_longname) ) );
sd_item->setData( 0, TYPE_ROLE, SD_TYPE ); sd_item->setData( 0, TYPE_ROLE, SD_TYPE );
sd_item->setData( 0, NAME_ROLE, qfu( *ppsz_name ) ); sd_item->setData( 0, NAME_ROLE, qfu( *ppsz_name ) );
sd_item->setData( 0, LONGNAME_ROLE, qfu( *ppsz_longname ) );
sd_item->setFlags( sd_item->flags() & ~Qt::ItemIsDropEnabled ); sd_item->setFlags( sd_item->flags() & ~Qt::ItemIsDropEnabled );
sds->addChild( sd_item ); sds->addChild( sd_item );
free( *ppsz_name ); free( *ppsz_name );
......
...@@ -48,7 +48,6 @@ enum { ...@@ -48,7 +48,6 @@ enum {
TYPE_ROLE = Qt::UserRole, TYPE_ROLE = Qt::UserRole,
PPL_ITEM_ROLE, PPL_ITEM_ROLE,
NAME_ROLE, NAME_ROLE,
LONGNAME_ROLE,
}; };
Q_DECLARE_METATYPE( playlist_item_t *); Q_DECLARE_METATYPE( playlist_item_t *);
......
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