i_id = _playlist_item->i_id; /* Playlist item specific id */
model = m; /* PLModel (QAbsmodel) */
i_type = -1; /* Item type - Avoid segfault */
- b_current = false; /* Is the item the current Item or not */
b_is_node = _playlist_item->i_children > -1;
p_input = _playlist_item->p_input;
vlc_gc_incref( p_input );
}
/* update the PL Item, get the good names and so on */
-void PLItem::update( playlist_item_t *p_item, bool iscurrent )
+void PLItem::update( playlist_item_t *p_item )
{
assert( p_item->p_input == p_input);
/* Useful for the model */
i_type = p_item->p_input->i_type;
- b_current = iscurrent;
b_is_node = p_item->i_children > -1;
i_showflags = parentItem ? parentItem->i_showflags : i_showflags;
i_cached_id = -1;
i_cached_input_id = -1;
i_popup_item = i_popup_parent = -1;
+ currentIndex = QModelIndex();
rootItem = NULL; /* PLItem rootItem, will be set in rebuild( ) */
}
else if( role == Qt::FontRole )
{
- if( item->b_current == true )
+ if( isCurrent( index ) )
{
QFont f; f.setBold( true ); return QVariant( f );
}
return QVariant();
}
-bool PLModel::isCurrent( const QModelIndex &index )
+bool PLModel::isCurrent( const QModelIndex &index ) const
{
assert( index.isValid() );
- return static_cast<PLItem*>(index.internalPointer())->b_current;
+ if(!currentIndex.isValid()) return false;
+ return static_cast<PLItem*>(index.internalPointer())->p_input ==
+ static_cast<PLItem*>(currentIndex.internalPointer())->p_input;
}
int PLModel::itemId( const QModelIndex &index ) const
{
PLItem *item = FindByInput( rootItem, input_GetItem( p_input )->i_id );
emit currentChanged( index( item, 0 ) );
+ currentIndex = index( item, 0 );
}
}
void PLModel::ProcessInputItemUpdate( input_item_t *p_item )
if( !force && i_depth == DEPTH_SEL && p_item->p_parent &&
p_item->p_parent->i_id != rootItem->i_id )
return;
- item->update( p_item, p_item == playlist_CurrentPlayingItem( p_playlist ) );
+ item->update( p_item );
if( signal )
- emit dataChanged( index( item, 0 ) , index( item, 1 ) );
+ emit dataChanged( index( item, 0 ) , index( item, columnCount( QModelIndex() ) ) );
}
/************************* Actions ******************************/
QModelIndex index( int r, int c, const QModelIndex &parent ) const;
QModelIndex index( PLItem *, int c ) const;
int itemId( const QModelIndex &index ) const;
- bool isCurrent( const QModelIndex &index );
+ bool isCurrent( const QModelIndex &index ) const;
QModelIndex parent( const QModelIndex &index ) const;
int childrenCount( const QModelIndex &parent = QModelIndex() ) const;
int rowCount( const QModelIndex &parent = QModelIndex() ) const;
/* Popup */
int i_popup_item, i_popup_parent;
QModelIndexList current_selection;
+ QModelIndex currentIndex;
QSignalMapper *ContextUpdateMapper;
/* Lookups */