* $Id$
*
* Authors: Clément Stenac <zorglub@videolan.org>
+ * Ilkka Ollakkka <ileoo (at) videolan dot org>
+ * Jakob Leben <jleben@videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
QIcon PLModel::icons[ITEM_TYPE_NUMBER];
-static int PlaylistChanged( vlc_object_t *, const char *,
- vlc_value_t, vlc_value_t, void * );
-static int PlaylistNext( vlc_object_t *, const char *,
- vlc_value_t, vlc_value_t, void * );
-static int ItemAppended( vlc_object_t *p_this, const char *psz_variable,
- vlc_value_t oval, vlc_value_t nval, void *param );
-static int ItemDeleted( vlc_object_t *p_this, const char *psz_variable,
- vlc_value_t oval, vlc_value_t nval, void *param );
-
/*************************************************************************
* Playlist model implementation
*************************************************************************/
-/*
- This model is called two times, for the selector and the standard panel
-*/
PLModel::PLModel( playlist_t *_p_playlist, /* THEPL */
intf_thread_t *_p_intf, /* main Qt p_intf */
playlist_item_t * p_root,
- /*playlist_GetPreferredNode( THEPL, THEPL->p_local_category );
- and THEPL->p_root_category for SelectPL */
- int _i_depth, /* -1 for StandPL, 1 for SelectPL */
QObject *parent ) /* Basic Qt parent */
: QAbstractItemModel( parent )
{
- i_depth = _i_depth;
- assert( i_depth == DEPTH_SEL || i_depth == DEPTH_PL );
p_intf = _p_intf;
p_playlist = _p_playlist;
i_cached_id = -1;
rootItem = NULL; /* PLItem rootItem, will be set in rebuild( ) */
/* Icons initialization */
-#define ADD_ICON(type, x) icons[ITEM_TYPE_##type] = QIcon( QPixmap( x ) )
+#define ADD_ICON(type, x) icons[ITEM_TYPE_##type] = QIcon( x )
ADD_ICON( UNKNOWN , type_unknown_xpm );
ADD_ICON( FILE, ":/type/file" );
ADD_ICON( DIRECTORY, ":/type/directory" );
#undef ADD_ICON
rebuild( p_root );
- CONNECT( THEMIM->getIM(), metaChanged( int ),
- this, ProcessInputItemUpdate( int ) );
+ CONNECT( THEMIM->getIM(), metaChanged( input_item_t *),
+ this, processInputItemUpdate( input_item_t *) );
CONNECT( THEMIM, inputChanged( input_thread_t * ),
- this, ProcessInputItemUpdate( input_thread_t* ) );
+ this, processInputItemUpdate( input_thread_t* ) );
+ CONNECT( THEMIM, playlistItemAppended( int, int ),
+ this, processItemAppend( int, int ) );
+ CONNECT( THEMIM, playlistItemRemoved( int ),
+ this, processItemRemoval( int ) );
}
PLModel::~PLModel()
{
- if(i_depth == -1)
- getSettings()->setValue( "qt-pl-showflags", rootItem->i_showflags );
- delCallbacks();
delete rootItem;
}
Qt::ItemFlags PLModel::flags( const QModelIndex &index ) const
{
- Qt::ItemFlags defaultFlags = QAbstractItemModel::flags( index );
- if( index.isValid() )
- return Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled | defaultFlags;
- else
- return Qt::ItemIsDropEnabled | defaultFlags;
+ Qt::ItemFlags flags = QAbstractItemModel::flags( index );
+
+ PLItem *item = index.isValid() ? getItem( index ) : rootItem;
+
+ if( canEdit() )
+ {
+ PL_LOCK;
+ playlist_item_t *plItem =
+ playlist_ItemGetById( p_playlist, item->i_id );
+
+ if ( plItem && ( plItem->i_children > -1 ) )
+ flags |= Qt::ItemIsDropEnabled;
+
+ PL_UNLOCK;
+
+ }
+ flags |= Qt::ItemIsDragEnabled;
+
+ return flags;
}
-/* A list of model indexes are a playlist */
QStringList PLModel::mimeTypes() const
{
QStringList types;
- types << "vlc/playlist-item-id";
+ types << "vlc/qt-playlist-item";
return types;
}
QMimeData *mimeData = new QMimeData();
QByteArray encodedData;
QDataStream stream( &encodedData, QIODevice::WriteOnly );
+ QModelIndexList list;
foreach( const QModelIndex &index, indexes ) {
if( index.isValid() && index.column() == 0 )
- stream << itemId( index );
+ list.append(index);
}
- mimeData->setData( "vlc/playlist-item-id", encodedData );
+
+ qSort(list);
+
+ foreach( const QModelIndex &index, list ) {
+ PLItem *item = getItem( index );
+ stream.writeRawData( (char*) &item, sizeof( PLItem* ) );
+ }
+ mimeData->setData( "vlc/qt-playlist-item", encodedData );
return mimeData;
}
/* Drop operation */
bool PLModel::dropMimeData( const QMimeData *data, Qt::DropAction action,
- int row, int column, const QModelIndex &target )
+ int row, int column, const QModelIndex &parent )
{
- if( data->hasFormat( "vlc/playlist-item-id" ) )
+ if( data->hasFormat( "vlc/qt-playlist-item" ) )
{
if( action == Qt::IgnoreAction )
return true;
- if( !target.isValid() )
- /* We don't want to move on an invalid position */
- return true;
+ PLItem *parentItem = parent.isValid() ? getItem( parent ) : rootItem;
- PLItem *targetItem = static_cast<PLItem*>( target.internalPointer() );
+ PL_LOCK;
+ playlist_item_t *p_parent =
+ playlist_ItemGetById( p_playlist, parentItem->i_id );
+ if( !p_parent || p_parent->i_children == -1 )
+ {
+ PL_UNLOCK;
+ return false;
+ }
+
+ bool copy = false;
+ playlist_item_t *p_pl = p_playlist->p_playing;
+ playlist_item_t *p_ml = p_playlist->p_media_library;
+ if
+ (
+ row == -1 && (
+ ( p_pl && p_parent == p_pl ) ||
+ ( p_ml && p_parent == p_ml ) )
+ )
+ copy = true;
+ PL_UNLOCK;
+
+ QByteArray encodedData = data->data( "vlc/qt-playlist-item" );
+ if( copy )
+ dropAppendCopy( encodedData, parentItem );
+ else
+ dropMove( encodedData, parentItem, row );
+ }
+ return true;
+}
+
+void PLModel::dropAppendCopy( QByteArray& data, PLItem *target )
+{
+ QDataStream stream( &data, QIODevice::ReadOnly );
+
+ PL_LOCK;
+ playlist_item_t *p_parent =
+ playlist_ItemGetById( p_playlist, target->i_id );
+ while( !stream.atEnd() )
+ {
+ PLItem *item;
+ stream.readRawData( (char*)&item, sizeof(PLItem*) );
+ playlist_item_t *p_item = playlist_ItemGetById( p_playlist, item->i_id );
+ if( !p_item ) continue;
+ input_item_t *p_input = p_item->p_input;
+ playlist_AddExt ( p_playlist,
+ p_input->psz_uri, p_input->psz_name,
+ PLAYLIST_APPEND | PLAYLIST_SPREPARSE, PLAYLIST_END,
+ p_input->i_duration,
+ p_input->i_options, p_input->ppsz_options, p_input->optflagc,
+ p_parent == p_playlist->p_playing,
+ true );
+ }
+ PL_UNLOCK;
+}
- QByteArray encodedData = data->data( "vlc/playlist-item-id" );
- QDataStream stream( &encodedData, QIODevice::ReadOnly );
+void PLModel::dropMove( QByteArray& data, PLItem *target, int row )
+{
+ QDataStream stream( &data, QIODevice::ReadOnly );
+ QList<PLItem*> model_items;
+ QList<int> ids;
+ int new_pos = row == -1 ? target->children.size() : row;
+ int model_pos = new_pos;
+ while( !stream.atEnd() )
+ {
+ PLItem *item;
+ stream.readRawData( (char*)&item, sizeof(PLItem*) );
- PLItem *newParentItem;
- while( !stream.atEnd() )
+ /* better not try to move a node into itself: */
+ PLItem *climber = target;
+ while( climber )
{
- int i;
- int srcId;
- stream >> srcId;
+ if( climber == item ) break;
+ climber = climber->parentItem;
+ }
+ if( climber ) continue;
- PL_LOCK;
- playlist_item_t *p_target =
- playlist_ItemGetById( p_playlist, targetItem->i_id );
- playlist_item_t *p_src = playlist_ItemGetById( p_playlist, srcId );
+ if( item->parentItem == target &&
+ target->children.indexOf( item ) < model_pos )
+ model_pos--;
- if( !p_target || !p_src )
+ ids.append( item->i_id );
+ model_items.append( item );
+
+ takeItem( item );
+ }
+ int count = ids.size();
+ if( count )
+ {
+ playlist_item_t *pp_items[count];
+
+ PL_LOCK;
+ for( int i = 0; i < count; i++ )
+ {
+ playlist_item_t *p_item = playlist_ItemGetById( p_playlist, ids[i] );
+ if( !p_item )
{
PL_UNLOCK;
- return false;
+ return;
}
- if( p_target->i_children == -1 ) /* A leaf */
- {
- PLItem *parentItem = targetItem->parent();
- assert( parentItem );
- playlist_item_t *p_parent =
- playlist_ItemGetById( p_playlist, parentItem->i_id );
- if( !p_parent )
- {
- PL_UNLOCK;
- return false;
- }
- for( i = 0 ; i< p_parent->i_children ; i++ )
- if( p_parent->pp_children[i] == p_target ) break;
- // Move the item to the element after i
- playlist_TreeMove( p_playlist, p_src, p_parent, i + 1 );
- newParentItem = parentItem;
- }
- else
- {
- /* \todo: if we drop on a top-level node, use copy instead ? */
- playlist_TreeMove( p_playlist, p_src, p_target, 0 );
- i = 0;
- newParentItem = targetItem;
- }
- PL_UNLOCK;
+ pp_items[i] = p_item;
}
- /*TODO: That's not a good idea to rebuild the playlist */
- rebuild();
+ playlist_item_t *p_parent =
+ playlist_ItemGetById( p_playlist, target->i_id );
+ playlist_TreeMoveMany( p_playlist, count, pp_items, p_parent,
+ new_pos );
+ PL_UNLOCK;
+
+ insertChildren( target, model_items, model_pos );
}
- return true;
}
/* remove item with its id */
void PLModel::removeItem( int i_id )
{
- PLItem *item = FindById( rootItem, i_id );
- if( item ) item->remove( item );
-}
-
-/* callbacks and slots */
-void PLModel::addCallbacks()
-{
- /* Some global changes happened -> Rebuild all */
- var_AddCallback( p_playlist, "intf-change", PlaylistChanged, this );
- /* We went to the next item
- var_AddCallback( p_playlist, "item-current", PlaylistNext, this );
- */
- /* One item has been updated */
- var_AddCallback( p_playlist, "playlist-item-append", ItemAppended, this );
- var_AddCallback( p_playlist, "playlist-item-deleted", ItemDeleted, this );
-}
-
-void PLModel::delCallbacks()
-{
- /*
- var_DelCallback( p_playlist, "item-current", PlaylistNext, this );
- */
- var_DelCallback( p_playlist, "intf-change", PlaylistChanged, this );
- var_DelCallback( p_playlist, "playlist-item-append", ItemAppended, this );
- var_DelCallback( p_playlist, "playlist-item-deleted", ItemDeleted, this );
+ PLItem *item = findById( rootItem, i_id );
+ removeItem( item );
}
void PLModel::activateItem( const QModelIndex &index )
{
assert( index.isValid() );
- PLItem *item = static_cast<PLItem*>(index.internalPointer());
+ PLItem *item = getItem( index );
assert( item );
PL_LOCK;
playlist_item_t *p_item = playlist_ItemGetById( p_playlist, item->i_id );
QVariant PLModel::data( const QModelIndex &index, int role ) const
{
if( !index.isValid() ) return QVariant();
- PLItem *item = static_cast<PLItem*>(index.internalPointer());
+ PLItem *item = getItem( index );
if( role == Qt::DisplayRole )
{
- return QVariant( item->columnString( index.column() ) );
+ int metadata = columnToMeta( index.column() );
+ if( metadata == COLUMN_END ) return QVariant();
+
+ QString returninfo;
+ if( metadata == COLUMN_NUMBER )
+ returninfo = QString::number( index.row() + 1 );
+ else
+ {
+ char *psz = psz_column_meta( item->p_input, metadata );
+ returninfo = qfu( psz );
+ free( psz );
+ }
+ return QVariant( returninfo );
}
else if( role == Qt::DecorationRole && index.column() == 0 )
{
- /* Use to segfault here because i_type wasn't always initialized */
- if( item->i_type >= 0 )
- return QVariant( PLModel::icons[item->i_type] );
+ /* Used to segfault here because i_type wasn't always initialized */
+ return QVariant( PLModel::icons[item->p_input->i_type] );
}
else if( role == Qt::FontRole )
{
- if( item->b_current == true )
+ if( isCurrent( index ) )
{
QFont f; f.setBold( true ); return QVariant( f );
}
}
+ else if( role == Qt::BackgroundRole && isCurrent( index ) )
+ {
+ return QVariant( QBrush( Qt::gray ) );
+ }
+ else if( role == IsCurrentRole ) return QVariant( isCurrent( index ) );
+
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;
+ input_thread_t *p_input_thread = THEMIM->getInput();
+ if( !p_input_thread ) return false;
+ return getItem( index )->p_input == input_GetItem( p_input_thread );
}
int PLModel::itemId( const QModelIndex &index ) const
{
- assert( index.isValid() );
- return static_cast<PLItem*>(index.internalPointer())->i_id;
+ return getItem( index )->i_id;
}
QVariant PLModel::headerData( int section, Qt::Orientation orientation,
int role ) const
{
- if (orientation == Qt::Horizontal && role == Qt::DisplayRole)
- return QVariant( rootItem->columnString( section ) );
- return QVariant();
+ if (orientation != Qt::Horizontal || role != Qt::DisplayRole)
+ return QVariant();
+
+ int meta_col = columnToMeta( section );
+
+ if( meta_col == COLUMN_END ) return QVariant();
+
+ return QVariant( qfu( psz_column_title( meta_col ) ) );
}
QModelIndex PLModel::index( int row, int column, const QModelIndex &parent )
const
{
- PLItem *parentItem;
- if( !parent.isValid() )
- parentItem = rootItem;
- else
- parentItem = static_cast<PLItem*>(parent.internalPointer());
+ PLItem *parentItem = parent.isValid() ? getItem( parent ) : rootItem;
PLItem *childItem = parentItem->child( row );
if( childItem )
return QModelIndex();
}
+QModelIndex PLModel::index( int i_id, int c )
+{
+ return index( findById( rootItem, i_id ), c );
+}
+
/* Return the index of a given item */
QModelIndex PLModel::index( PLItem *item, int column ) const
{
return QModelIndex();
}
+QModelIndex PLModel::currentIndex()
+{
+ input_thread_t *p_input_thread = THEMIM->getInput();
+ if( !p_input_thread ) return QModelIndex();
+ PLItem *item = findByInput( rootItem, input_GetItem( p_input_thread )->i_id );
+ return index( item, 0 );
+}
+
QModelIndex PLModel::parent( const QModelIndex &index ) const
{
if( !index.isValid() ) return QModelIndex();
- PLItem *childItem = static_cast<PLItem*>(index.internalPointer());
+ PLItem *childItem = getItem( index );
if( !childItem )
{
msg_Err( p_playlist, "NULL CHILD" );
int PLModel::columnCount( const QModelIndex &i) const
{
- return rootItem->item_col_strings.count();
-}
-
-int PLModel::childrenCount( const QModelIndex &parent ) const
-{
- return rowCount( parent );
+ return columnFromMeta( COLUMN_END );
}
int PLModel::rowCount( const QModelIndex &parent ) const
{
- PLItem *parentItem;
-
- if( !parent.isValid() )
- parentItem = rootItem;
- else
- parentItem = static_cast<PLItem*>(parent.internalPointer());
-
+ PLItem *parentItem = parent.isValid() ? getItem( parent ) : rootItem;
return parentItem->childCount();
}
QStringList lst;
for( int i = 0; i < current_selection.size(); i++ )
{
- PL_LOCK;
- PLItem *item = static_cast<PLItem*>
- (current_selection[i].internalPointer());
+ PLItem *item = getItem( current_selection[i] );
if( item )
{
+ PL_LOCK;
playlist_item_t *p_item = playlist_ItemGetById( p_playlist, item->i_id );
if( p_item )
{
char *psz = input_item_GetURI( p_item->p_input );
if( psz )
{
- lst.append( psz );
+ lst.append( qfu(psz) );
free( psz );
}
}
+ PL_UNLOCK;
}
- PL_UNLOCK;
}
return lst;
}
-/************************* General playlist status ***********************/
-
-bool PLModel::hasRandom()
-{
- return var_GetBool( p_playlist, "random" );
-}
-bool PLModel::hasRepeat()
-{
- return var_GetBool( p_playlist, "repeat" );
-}
-bool PLModel::hasLoop()
-{
- return var_GetBool( p_playlist, "loop" );
-}
-void PLModel::setLoop( bool on )
-{
- var_SetBool( p_playlist, "loop", on ? true:false );
- config_PutInt( p_playlist, "loop", on ? 1: 0 );
-}
-void PLModel::setRepeat( bool on )
-{
- var_SetBool( p_playlist, "repeat", on ? true:false );
- config_PutInt( p_playlist, "repeat", on ? 1: 0 );
-}
-void PLModel::setRandom( bool on )
-{
- var_SetBool( p_playlist, "random", on ? true:false );
- config_PutInt( p_playlist, "random", on ? 1: 0 );
-}
/************************* Lookups *****************************/
-PLItem *PLModel::FindById( PLItem *root, int i_id )
+PLItem *PLModel::findById( PLItem *root, int i_id )
{
- return FindInner( root, i_id, false );
+ return findInner( root, i_id, false );
}
-PLItem *PLModel::FindByInput( PLItem *root, int i_id )
+PLItem *PLModel::findByInput( PLItem *root, int i_id )
{
- return FindInner( root, i_id, true );
+ PLItem *result = findInner( root, i_id, true );
+ return result;
}
#define CACHE( i, p ) { i_cached_id = i; p_cached_item = p; }
#define ICACHE( i, p ) { i_cached_input_id = i; p_cached_item_bi = p; }
-PLItem * PLModel::FindInner( PLItem *root, int i_id, bool b_input )
+PLItem * PLModel::findInner( PLItem *root, int i_id, bool b_input )
{
+ if( !root ) return NULL;
if( ( !b_input && i_cached_id == i_id) ||
( b_input && i_cached_input_id ==i_id ) )
{
CACHE( i_id, root );
return root;
}
- else if( b_input && root->i_input_id == i_id )
+ else if( b_input && root->p_input->i_id == i_id )
{
ICACHE( i_id, root );
return root;
CACHE( i_id, (*it) );
return p_cached_item;
}
- else if( b_input && (*it)->i_input_id == i_id )
+ else if( b_input && (*it)->p_input->i_id == i_id )
{
ICACHE( i_id, (*it) );
return p_cached_item_bi;
}
if( (*it)->children.size() )
{
- PLItem *childFound = FindInner( (*it), i_id, b_input );
+ PLItem *childFound = findInner( (*it), i_id, b_input );
if( childFound )
{
if( b_input )
#undef CACHE
#undef ICACHE
+int PLModel::columnToMeta( int _column )
+{
+ int meta = 1;
+ int column = 0;
-/************************* Updates handling *****************************/
-void PLModel::customEvent( QEvent *event )
+ while( column != _column && meta != COLUMN_END )
+ {
+ meta <<= 1;
+ column++;
+ }
+
+ return meta;
+}
+
+int PLModel::columnFromMeta( int meta_col )
{
- int type = event->type();
- if( type != ItemAppend_Type &&
- type != ItemDelete_Type && type != PLUpdate_Type )
- return;
+ int meta = 1;
+ int column = 0;
- PLEvent *ple = static_cast<PLEvent *>(event);
+ while( meta != meta_col && meta != COLUMN_END )
+ {
+ meta <<= 1;
+ column++;
+ }
- if( type == ItemAppend_Type )
- ProcessItemAppend( &ple->add );
- else if( type == ItemDelete_Type )
- ProcessItemRemoval( ple->i_id );
- else
- rebuild();
+ return column;
}
+bool PLModel::canEdit() const
+{
+ return (
+ rootItem != NULL &&
+ (
+ rootItem->p_input == p_playlist->p_playing->p_input ||
+ (
+ p_playlist->p_media_library &&
+ rootItem->p_input == p_playlist->p_media_library->p_input
+ )
+ )
+ );
+}
+/************************* Updates handling *****************************/
+
/**** Events processing ****/
-void PLModel::ProcessInputItemUpdate( input_thread_t *p_input )
+void PLModel::processInputItemUpdate( input_thread_t *p_input )
{
if( !p_input ) return;
- ProcessInputItemUpdate( input_GetItem( p_input )->i_id );
+ if( p_input && !( p_input->b_dead || !vlc_object_alive( p_input ) ) )
+ {
+ PLItem *item = findByInput( rootItem, input_GetItem( p_input )->i_id );
+ if( item ) emit currentChanged( index( item, 0 ) );
+ }
+ processInputItemUpdate( input_GetItem( p_input ) );
}
-void PLModel::ProcessInputItemUpdate( int i_input_id )
+
+void PLModel::processInputItemUpdate( input_item_t *p_item )
{
- if( i_input_id <= 0 ) return;
- PLItem *item = FindByInput( rootItem, i_input_id );
+ if( !p_item || p_item->i_id <= 0 ) return;
+ PLItem *item = findByInput( rootItem, p_item->i_id );
if( item )
- {
- QPL_LOCK;
- UpdateTreeItem( item, true );
- QPL_UNLOCK;
- }
+ updateTreeItem( item );
}
-void PLModel::ProcessItemRemoval( int i_id )
+void PLModel::processItemRemoval( int i_id )
{
if( i_id <= 0 ) return;
- if( i_id == i_cached_id ) i_cached_id = -1;
- i_cached_input_id = -1;
-
removeItem( i_id );
}
-void PLModel::ProcessItemAppend( const playlist_add_t *p_add )
+void PLModel::processItemAppend( int i_item, int i_parent )
{
playlist_item_t *p_item = NULL;
PLItem *newItem = NULL;
+ input_thread_t *currentInputThread;
+ int pos;
- PLItem *nodeItem = FindById( rootItem, p_add->i_node );
- PL_LOCK;
- if( !nodeItem ) goto end;
+ PLItem *nodeItem = findById( rootItem, i_parent );
+ if( !nodeItem ) return;
+
+ foreach( PLItem *existing, nodeItem->children )
+ if( existing->i_id == i_item ) return;
- p_item = playlist_ItemGetById( p_playlist, p_add->i_item );
+ PL_LOCK;
+ p_item = playlist_ItemGetById( p_playlist, i_item );
if( !p_item || p_item->i_flags & PLAYLIST_DBL_FLAG ) goto end;
- if( i_depth == DEPTH_SEL && p_item->p_parent &&
- p_item->p_parent->i_id != rootItem->i_id )
- goto end;
- newItem = new PLItem( p_item, nodeItem, this );
- nodeItem->appendChild( newItem );
- UpdateTreeItem( p_item, newItem, true );
+ for( pos = 0; pos < p_item->p_parent->i_children; pos++ )
+ if( p_item->p_parent->pp_children[pos] == p_item ) break;
+
+ newItem = new PLItem( p_item, nodeItem );
+ PL_UNLOCK;
+
+ beginInsertRows( index( nodeItem, 0 ), pos, pos );
+ nodeItem->insertChild( newItem, pos );
+ endInsertRows();
+
+ return;
end:
PL_UNLOCK;
return;
void PLModel::rebuild( playlist_item_t *p_root )
{
playlist_item_t* p_item;
- /* Remove callbacks before locking to avoid deadlocks */
- delCallbacks();
+
/* Invalidate cache */
i_cached_id = i_cached_input_id = -1;
+ if( rootItem ) rootItem->removeChildren();
+
PL_LOCK;
- /* Clear the tree */
- if( rootItem )
- {
- if( rootItem->children.size() )
- {
- beginRemoveRows( index( rootItem, 0 ), 0,
- rootItem->children.size() -1 );
- qDeleteAll( rootItem->children );
- rootItem->children.clear();
- endRemoveRows();
- }
- }
if( p_root )
{
delete rootItem;
- rootItem = new PLItem( p_root, getSettings(), this );
+ rootItem = new PLItem( p_root );
}
assert( rootItem );
/* Recreate from root */
- UpdateNodeChildren( rootItem );
- if( (p_item = playlist_CurrentPlayingItem(p_playlist)) )
- {
- PLItem *currentItem = FindByInput( rootItem,
- p_item->p_input->i_id );
- if( currentItem )
- {
- UpdateTreeItem( p_item, currentItem,
- true, false );
- }
- }
+ updateChildren( rootItem );
PL_UNLOCK;
/* And signal the view */
- emit layoutChanged();
- addCallbacks();
+ reset();
+
+ if( p_root ) emit rootChanged();
}
-/* This function must be entered WITH the playlist lock */
-void PLModel::UpdateNodeChildren( PLItem *root )
+void PLModel::takeItem( PLItem *item )
{
- playlist_item_t *p_node = playlist_ItemGetById( p_playlist, root->i_id );
- UpdateNodeChildren( p_node, root );
+ assert( item );
+ PLItem *parent = item->parentItem;
+ assert( parent );
+ int i_index = parent->children.indexOf( item );
+
+ beginRemoveRows( index( parent, 0 ), i_index, i_index );
+ parent->takeChildAt( i_index );
+ endRemoveRows();
}
-/* This function must be entered WITH the playlist lock */
-void PLModel::UpdateNodeChildren( playlist_item_t *p_node, PLItem *root )
+void PLModel::insertChildren( PLItem *node, QList<PLItem*>& items, int i_pos )
{
- for( int i = 0; i < p_node->i_children ; i++ )
+ assert( node );
+ int count = items.size();
+ if( !count ) return;
+ beginInsertRows( index( node, 0 ), i_pos, i_pos + count - 1 );
+ for( int i = 0; i < count; i++ )
{
- if( p_node->pp_children[i]->i_flags & PLAYLIST_DBL_FLAG ) continue;
- PLItem *newItem = new PLItem( p_node->pp_children[i], root, this );
- root->appendChild( newItem, false );
- UpdateTreeItem( newItem, false, true );
- if( i_depth == DEPTH_PL && p_node->pp_children[i]->i_children != -1 )
- UpdateNodeChildren( p_node->pp_children[i], newItem );
+ node->children.insert( i_pos + i, items[i] );
+ items[i]->parentItem = node;
+ }
+ endInsertRows();
+}
+
+void PLModel::removeItem( PLItem *item )
+{
+ if( !item ) return;
+
+ if( item->i_id == i_cached_id ) i_cached_id = -1;
+ i_cached_input_id = -1;
+
+ if( item->parentItem ) {
+ int i = item->parentItem->children.indexOf( item );
+ beginRemoveRows( index( item->parentItem, 0), i, i );
+ item->parentItem->children.removeAt(i);
+ delete item;
+ endRemoveRows();
+ }
+ else delete item;
+
+ if(item == rootItem)
+ {
+ rootItem = NULL;
+ rebuild( p_playlist->p_playing );
}
}
/* This function must be entered WITH the playlist lock */
-void PLModel::UpdateTreeItem( PLItem *item, bool signal, bool force )
+void PLModel::updateChildren( PLItem *root )
{
- playlist_item_t *p_item = playlist_ItemGetById( p_playlist, item->i_id );
- UpdateTreeItem( p_item, item, signal, force );
+ playlist_item_t *p_node = playlist_ItemGetById( p_playlist, root->i_id );
+ updateChildren( p_node, root );
}
/* This function must be entered WITH the playlist lock */
-void PLModel::UpdateTreeItem( playlist_item_t *p_item, PLItem *item,
- bool signal, bool force )
+void PLModel::updateChildren( playlist_item_t *p_node, PLItem *root )
+{
+ for( int i = 0; i < p_node->i_children ; i++ )
+ {
+ if( p_node->pp_children[i]->i_flags & PLAYLIST_DBL_FLAG ) continue;
+ PLItem *newItem = new PLItem( p_node->pp_children[i], root );
+ root->appendChild( newItem );
+ if( p_node->pp_children[i]->i_children != -1 )
+ updateChildren( p_node->pp_children[i], newItem );
+ }
+}
+
+/* Function doesn't need playlist-lock, as we don't touch playlist_item_t stuff here*/
+void PLModel::updateTreeItem( PLItem *item )
{
- if ( !p_item )
- return;
- 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 ) );
- if( signal )
- emit dataChanged( index( item, 0 ) , index( item, 1 ) );
+ if( !item ) return;
+ emit dataChanged( index( item, 0 ) , index( item, columnCount( QModelIndex() ) ) );
}
/************************* Actions ******************************/
*/
void PLModel::doDelete( QModelIndexList selected )
{
- for( int i = selected.size() -1 ; i >= 0; i-- )
+ if( !canEdit() ) return;
+
+ while( !selected.isEmpty() )
{
- QModelIndex index = selected[i];
+ QModelIndex index = selected[0];
+ selected.removeAt( 0 );
+
if( index.column() != 0 ) continue;
- PLItem *item = static_cast<PLItem*>(index.internalPointer());
- if( item )
- {
- if( item->children.size() )
- recurseDelete( item->children, &selected );
- doDeleteItem( item, &selected );
- }
+
+ PLItem *item = getItem( index );
+ if( item->children.size() )
+ recurseDelete( item->children, &selected );
+
+ PL_LOCK;
+ playlist_DeleteFromInput( p_playlist, item->p_input, pl_Locked );
+ PL_UNLOCK;
+
+ removeItem( item );
}
}
PLItem *item = children[i];
if( item->children.size() )
recurseDelete( item->children, fullList );
- doDeleteItem( item, fullList );
+ fullList->removeAll( index( item, 0 ) );
}
}
-void PLModel::doDeleteItem( PLItem *item, QModelIndexList *fullList )
+/******* Volume III: Sorting and searching ********/
+void PLModel::sort( int column, Qt::SortOrder order )
{
- QModelIndex deleteIndex = index( item, 0 );
- fullList->removeAll( deleteIndex );
-
- PL_LOCK;
- playlist_item_t *p_item = playlist_ItemGetById( p_playlist, item->i_id );
- if( !p_item )
- {
- PL_UNLOCK;
- return;
- }
- if( p_item->i_children == -1 )
- playlist_DeleteFromInput( p_playlist, p_item->p_input, pl_Locked );
- else
- playlist_NodeDelete( p_playlist, p_item, true, false );
- /* And finally, remove it from the tree */
- item->remove( item );
- PL_UNLOCK;
+ sort( rootItem->i_id, column, order );
}
-/******* Volume III: Sorting and searching ********/
-void PLModel::sort( int column, Qt::SortOrder order )
+void PLModel::sort( int i_root_id, int column, Qt::SortOrder order )
{
- int i_index = -1;
- int i_flag = 0;
+ msg_Dbg( p_intf, "Sorting by column %i, order %i", column, order );
+
+ int meta = columnToMeta( column );
+ if( meta == COLUMN_END ) return;
- int i_column = 1;
- for( i_column = 1; i_column != COLUMN_END; i_column<<=1 )
+ PLItem *item = findById( rootItem, i_root_id );
+ if( !item ) return;
+ QModelIndex qIndex = index( item, 0 );
+ int count = item->children.size();
+ if( count )
{
- if( ( shownFlags() & i_column ) )
- i_index++;
- if( column == i_index )
- {
- i_flag = i_column;
- goto next;
- }
+ beginRemoveRows( qIndex, 0, count - 1 );
+ item->removeChildren();
+ endRemoveRows( );
}
-
-next:
PL_LOCK;
{
playlist_item_t *p_root = playlist_ItemGetById( p_playlist,
- rootItem->i_id );
- if( p_root && i_flag )
+ i_root_id );
+ if( p_root )
{
playlist_RecursiveNodeSort( p_playlist, p_root,
- i_column_sorting( i_flag ),
+ i_column_sorting( meta ),
order == Qt::AscendingOrder ?
ORDER_NORMAL : ORDER_REVERSE );
}
}
+
+ i_cached_id = i_cached_input_id = -1;
+
+ if( count )
+ {
+ beginInsertRows( qIndex, 0, count - 1 );
+ updateChildren( item );
+ endInsertRows( );
+ }
PL_UNLOCK;
- rebuild();
}
-void PLModel::search( const QString& search_text )
+void PLModel::search( const QString& search_text, const QModelIndex & idx, bool b_recursive )
{
/** \todo Fire the search with a small delay ? */
PL_LOCK;
{
playlist_item_t *p_root = playlist_ItemGetById( p_playlist,
- rootItem->i_id );
+ itemId( idx ) );
assert( p_root );
const char *psz_name = search_text.toUtf8().data();
- playlist_LiveSearchUpdate( p_playlist , p_root, psz_name );
+ playlist_LiveSearchUpdate( p_playlist , p_root, psz_name, b_recursive );
+
+ if( idx.isValid() )
+ {
+ PLItem *searchRoot = getItem( idx );
+
+ beginRemoveRows( idx, 0, searchRoot->children.size() - 1 );
+ searchRoot->removeChildren();
+ endRemoveRows( );
+
+ beginInsertRows( idx, 0, searchRoot->children.size() - 1 );
+ updateChildren( searchRoot );
+ endInsertRows();
+
+ PL_UNLOCK;
+ return;
+ }
}
PL_UNLOCK;
rebuild();
}
/*********** Popup *********/
-void PLModel::popup( QModelIndex & index, QPoint &point, QModelIndexList list )
+bool PLModel::popup( const QModelIndex & index, const QPoint &point, const QModelIndexList &list )
{
- assert( index.isValid() );
+ int i_id = index.isValid() ? itemId( index ) : rootItem->i_id;
+
PL_LOCK;
- playlist_item_t *p_item = playlist_ItemGetById( p_playlist, itemId( index ) );
- if( p_item )
+ playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_id );
+ if( !p_item )
{
- i_popup_item = p_item->i_id;
- i_popup_parent = p_item->p_parent ? p_item->p_parent->i_id : -1;
PL_UNLOCK;
- current_selection = list;
- QMenu *menu = new QMenu;
- menu->addAction( qtr(I_POP_PLAY), this, SLOT( popupPlay() ) );
- menu->addAction( qtr(I_POP_DEL), this, SLOT( popupDel() ) );
- menu->addSeparator();
- menu->addAction( qtr(I_POP_STREAM), this, SLOT( popupStream() ) );
- menu->addAction( qtr(I_POP_SAVE), this, SLOT( popupSave() ) );
- menu->addSeparator();
- menu->addAction( qtr(I_POP_INFO), this, SLOT( popupInfo() ) );
- if( p_item->i_children > -1 )
- {
- menu->addSeparator();
- menu->addAction( qtr(I_POP_SORT), this, SLOT( popupSort() ) );
- menu->addAction( qtr(I_POP_ADD), this, SLOT( popupAdd() ) );
- }
- menu->addSeparator();
- menu->addAction( qtr( I_POP_EXPLORE ), this, SLOT( popupExplore() ) );
- menu->popup( point );
+ return false;
}
- else
- PL_UNLOCK;
-}
+ i_popup_item = index.isValid() ? p_item->i_id : -1;
+ i_popup_parent = index.isValid() ?
+ ( p_item->p_parent ? p_item->p_parent->i_id : -1 ) :
+ ( rootItem->i_id );
+ i_popup_column = index.column();
-void PLModel::viewchanged( int meta )
-{
- assert( meta );
- int _meta = meta;
- if( rootItem )
- {
- int index=-1;
- while( _meta )
- {
- index++;
- _meta >>= 1;
- }
+ bool tree = var_InheritBool( p_intf, "playlist-tree" );
- /* UNUSED emit layoutAboutToBeChanged(); */
- index = __MIN( index, rootItem->item_col_strings.count() );
- QModelIndex parent = createIndex( 0, 0, rootItem );
+ PL_UNLOCK;
+
+ current_selection = list;
- if( rootItem->i_showflags & meta )
- /* Removing columns */
+ QMenu menu;
+ if( i_popup_item > -1 )
+ {
+ menu.addAction( QIcon( ":/menu/play" ), qtr(I_POP_PLAY), this, SLOT( popupPlay() ) );
+ menu.addAction( QIcon( ":/buttons/playlist/playlist_remove" ),
+ qtr(I_POP_DEL), this, SLOT( popupDel() ) );
+ menu.addSeparator();
+ menu.addAction( QIcon( ":/menu/stream" ),
+ qtr(I_POP_STREAM), this, SLOT( popupStream() ) );
+ menu.addAction( qtr(I_POP_SAVE), this, SLOT( popupSave() ) );
+ menu.addSeparator();
+ menu.addAction( QIcon( ":/menu/info" ), qtr(I_POP_INFO), this, SLOT( popupInfo() ) );
+ menu.addAction( QIcon( ":/type/folder-grey" ),
+ qtr( I_POP_EXPLORE ), this, SLOT( popupExplore() ) );
+ }
+ if( canEdit() )
+ {
+ QIcon addIcon( ":/buttons/playlist/playlist_add" );
+ menu.addSeparator();
+ if( tree ) menu.addAction( addIcon, qtr(I_POP_NEWFOLDER), this, SLOT( popupAddNode() ) );
+ if( rootItem->i_id == THEPL->p_playing->i_id )
{
- beginRemoveColumns( parent, index, index+1 );
- rootItem->i_showflags &= ~( meta );
- getSettings()->setValue( "qt-pl-showflags", rootItem->i_showflags );
- rootItem->updateColumnHeaders();
- endRemoveColumns();
+ menu.addAction( addIcon, qtr(I_PL_ADDF), THEDP, SLOT( simplePLAppendDialog()) );
+ menu.addAction( addIcon, qtr(I_PL_ADDDIR), THEDP, SLOT( PLAppendDir()) );
+ menu.addAction( addIcon, qtr(I_OP_ADVOP), THEDP, SLOT( PLAppendDialog()) );
}
- else
+ else if( THEPL->p_media_library &&
+ rootItem->i_id == THEPL->p_media_library->i_id )
{
- /* Adding columns */
- beginInsertColumns( parent, index, index+1 );
- rootItem->i_showflags |= meta;
- getSettings()->setValue( "qt-pl-showflags", rootItem->i_showflags );
- rootItem->updateColumnHeaders();
- endInsertColumns();
+ menu.addAction( addIcon, qtr(I_PL_ADDF), THEDP, SLOT( simpleMLAppendDialog()) );
+ menu.addAction( addIcon, qtr(I_PL_ADDDIR), THEDP, SLOT( MLAppendDir() ) );
+ menu.addAction( addIcon, qtr(I_OP_ADVOP), THEDP, SLOT( MLAppendDialog() ) );
}
- rebuild();
}
+ if( i_popup_item > -1 )
+ {
+ menu.addSeparator();
+ QMenu *sort_menu = menu.addMenu( qtr( "Sort by" ) + QString(" ") +
+ qfu( psz_column_title( columnToMeta( index.column() ) ) ) );
+ sort_menu->addAction( qtr( "Ascending" ),
+ this, SLOT( popupSortAsc() ) );
+ sort_menu->addAction( qtr( "Descending" ),
+ this, SLOT( popupSortDesc() ) );
+ }
+ if( !menu.isEmpty() )
+ {
+ menu.exec( point ); return true;
+ }
+ else return false;
}
void PLModel::popupDel()
mid->setParent( PlaylistDialog::getInstance( p_intf ),
Qt::Dialog );
mid->show();
- }
+ } else
+ PL_UNLOCK;
}
void PLModel::popupStream()
PL_UNLOCK;
}
-/**********************************************************************
- * Playlist callbacks
- **********************************************************************/
-static int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable,
- vlc_value_t oval, vlc_value_t nval, void *param )
-{
- PLModel *p_model = (PLModel *) param;
- PLEvent *event = new PLEvent( PLUpdate_Type, 0 );
- QApplication::postEvent( p_model, event );
- return VLC_SUCCESS;
-}
-
-static int PlaylistNext( vlc_object_t *p_this, const char *psz_variable,
- vlc_value_t oval, vlc_value_t nval, void *param )
+#include <QInputDialog>
+void PLModel::popupAddNode()
{
- PLModel *p_model = (PLModel *) param;
- PLEvent *event = new PLEvent( ItemUpdate_Type, oval.i_int );
- QApplication::postEvent( p_model, event );
- event = new PLEvent( ItemUpdate_Type, nval.i_int );
- QApplication::postEvent( p_model, event );
- return VLC_SUCCESS;
+ bool ok;
+ QString name = QInputDialog::getText( PlaylistDialog::getInstance( p_intf ),
+ qtr( "Create Folder" ), qtr( "Enter name for new folder:" ),
+ QLineEdit::Normal, QString(), &ok);
+ if( !ok || name.isEmpty() ) return;
+ PL_LOCK;
+ playlist_item_t *p_item = playlist_ItemGetById( p_playlist,
+ i_popup_parent );
+ if( p_item )
+ {
+ playlist_NodeCreate( p_playlist, qtu( name ), p_item, 0, NULL );
+ }
+ PL_UNLOCK;
}
-static int ItemDeleted( vlc_object_t *p_this, const char *psz_variable,
- vlc_value_t oval, vlc_value_t nval, void *param )
+void PLModel::popupSortAsc()
{
- PLModel *p_model = (PLModel *) param;
- PLEvent *event = new PLEvent( ItemDelete_Type, nval.i_int );
- QApplication::postEvent( p_model, event );
- return VLC_SUCCESS;
+ sort( i_popup_parent, i_popup_column, Qt::AscendingOrder );
}
-static int ItemAppended( vlc_object_t *p_this, const char *psz_variable,
- vlc_value_t oval, vlc_value_t nval, void *param )
+void PLModel::popupSortDesc()
{
- PLModel *p_model = (PLModel *) param;
- const playlist_add_t *p_add = (playlist_add_t *)nval.p_address;
- PLEvent *event = new PLEvent( p_add );
- QApplication::postEvent( p_model, event );
- return VLC_SUCCESS;
+ sort( i_popup_parent, i_popup_column, Qt::DescendingOrder );
}
-
projects / vlc / blobdiff