*
* 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
#include <QMenu>
#include <QApplication>
#include <QSettings>
+#include <QUrl>
+#include <QFileInfo>
+#include <QDesktopServices>
+#include <QInputDialog>
#include "sorting.h"
-QIcon PLModel::icons[ITEM_TYPE_NUMBER];
+#define I_NEW_DIR \
+ I_DIR_OR_FOLDER( N_("Create Directory"), N_( "Create Folder" ) )
+#define I_NEW_DIR_NAME \
+ I_DIR_OR_FOLDER( N_( "Enter name for new directory:" ), \
+ N_( "Enter name for new folder:" ) )
-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 );
+QIcon PLModel::icons[ITEM_TYPE_NUMBER];
/*************************************************************************
* 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;
i_cached_input_id = -1;
i_popup_item = i_popup_parent = -1;
- currentItem = NULL;
+ sortingMenu = NULL;
rootItem = NULL; /* PLItem rootItem, will be set in rebuild( ) */
- if( i_depth == DEPTH_SEL )
- i_showflags = 0;
- else
- {
- i_showflags = getSettings()->value( "qt-pl-showflags", COLUMN_DEFAULT ).toInt();
- if( i_showflags < 1)
- i_showflags = COLUMN_DEFAULT; /* reasonable default to show something */
- else if ( i_showflags >= COLUMN_END )
- i_showflags = COLUMN_END - 1; /* show everything */
- }
-
/* 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( input_item_t *),
- this, ProcessInputItemUpdate( input_item_t *) );
- CONNECT( THEMIM, inputChanged( input_thread_t * ),
- this, ProcessInputItemUpdate( input_thread_t* ) );
- PL_LOCK;
- playlist_item_t *p_item;
- /* Check if there's allready some item playing when playlist
- * model is created, if so, tell model that it's currentone
- */
- if( (p_item = playlist_CurrentPlayingItem(p_playlist)) )
- {
- currentItem = FindByInput( rootItem,
- p_item->p_input->i_id );
- emit currentChanged( index( currentItem, 0 ) );
- }
- PL_UNLOCK;
+ DCONNECT( THEMIM->getIM(), metaChanged( input_item_t *),
+ this, processInputItemUpdate( input_item_t *) );
+ DCONNECT( THEMIM, inputChanged( 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", i_showflags );
- delCallbacks();
delete rootItem;
+ delete sortingMenu;
}
Qt::DropActions PLModel::supportedDropActions() const
{
- return Qt::CopyAction; /* Why not Qt::MoveAction */
+ return Qt::CopyAction | Qt::MoveAction;
}
Qt::ItemFlags PLModel::flags( const QModelIndex &index ) const
{
Qt::ItemFlags flags = QAbstractItemModel::flags( index );
- PLItem *item = index.isValid() ?
- static_cast<PLItem*>( index.internalPointer() ) :
- rootItem;
+ const PLItem *item = index.isValid() ? getItem( index ) : rootItem;
- input_item_t *pl_input = p_playlist->p_local_category->p_input;
- input_item_t *ml_input = p_playlist->p_ml_category->p_input;
-
- if( rootItem->i_id == p_playlist->p_root_onelevel->i_id
- || rootItem->i_id == p_playlist->p_root_category->i_id )
- {
- if( item->p_input == pl_input
- || item->p_input == ml_input)
- flags |= Qt::ItemIsDropEnabled;
- }
- else if( rootItem->p_input == pl_input ||
- rootItem->p_input == ml_input )
+ if( canEdit() )
{
PL_LOCK;
playlist_item_t *plItem =
return flags;
}
-/* A list of model indexes are a playlist */
QStringList PLModel::mimeTypes() const
{
QStringList types;
- types << "vlc/playlist-item-id";
+ types << "vlc/qt-input-items";
return types;
}
+bool modelIndexLessThen( const QModelIndex &i1, const QModelIndex &i2 )
+{
+ if( !i1.isValid() || !i2.isValid() ) return false;
+ PLItem *item1 = static_cast<PLItem*>( i1.internalPointer() );
+ PLItem *item2 = static_cast<PLItem*>( i2.internalPointer() );
+ if( item1->parent() == item2->parent() ) return i1.row() < i2.row();
+ else return *item1 < *item2;
+}
+
QMimeData *PLModel::mimeData( const QModelIndexList &indexes ) const
{
- QMimeData *mimeData = new QMimeData();
- QByteArray encodedData;
- QDataStream stream( &encodedData, QIODevice::WriteOnly );
+ PlMimeData *plMimeData = new PlMimeData();
QModelIndexList list;
foreach( const QModelIndex &index, indexes ) {
list.append(index);
}
- qSort(list);
+ qSort(list.begin(), list.end(), modelIndexLessThen);
+ PLItem *item = NULL;
foreach( const QModelIndex &index, list ) {
- stream << itemId( index );
+ if( item )
+ {
+ PLItem *testee = getItem( index );
+ while( testee->parent() )
+ {
+ if( testee->parent() == item ||
+ testee->parent() == item->parent() ) break;
+ testee = testee->parent();
+ }
+ if( testee->parent() == item ) continue;
+ item = getItem( index );
+ }
+ else
+ item = getItem( index );
+
+ plMimeData->appendItem( item->p_input );
}
- mimeData->setData( "vlc/playlist-item-id", encodedData );
- return mimeData;
+
+ return plMimeData;
}
/* Drop operation */
bool PLModel::dropMimeData( const QMimeData *data, Qt::DropAction action,
int row, int column, const QModelIndex &parent )
{
- if( data->hasFormat( "vlc/playlist-item-id" ) )
+ bool copy = action == Qt::CopyAction;
+ if( !copy && action != Qt::MoveAction )
+ return true;
+
+ const PlMimeData *plMimeData = qobject_cast<const PlMimeData*>( data );
+ if( plMimeData )
{
- if( action == Qt::IgnoreAction )
- return true;
+ if( copy )
+ dropAppendCopy( plMimeData, getItem( parent ), row );
+ else
+ dropMove( plMimeData, getItem( parent ), row );
+ }
+ return true;
+}
- PL_LOCK;
+void PLModel::dropAppendCopy( const PlMimeData *plMimeData, PLItem *target, int pos )
+{
+ PL_LOCK;
- playlist_item_t *p_parent;
+ playlist_item_t *p_parent =
+ playlist_ItemGetByInput( p_playlist, target->p_input );
+ if( !p_parent ) return;
- if( !parent.isValid())
- {
- if( row > -1)
- p_parent = playlist_ItemGetById( p_playlist, rootItem->i_id );
- else
- {
- PL_UNLOCK;
- return true;
- }
- }
- else
- p_parent = playlist_ItemGetById( p_playlist, itemId ( parent ) );
+ if( pos == -1 ) pos = PLAYLIST_END;
- if( !p_parent || p_parent->i_children == -1 )
- {
- PL_UNLOCK;
- return false;
- }
+ QList<input_item_t*> inputItems = plMimeData->inputItems();
- bool copy = false;
- if( row == -1 &&
- ( p_parent->p_input == p_playlist->p_local_category->p_input
- || p_parent->p_input == p_playlist->p_ml_category->p_input ) )
- copy = true;
+ foreach( input_item_t* p_input, inputItems )
+ {
+ playlist_item_t *p_item = playlist_ItemGetByInput( p_playlist, p_input );
+ if( !p_item ) continue;
+ pos = playlist_NodeAddCopy( p_playlist, p_item, p_parent, pos );
+ }
- QByteArray encodedData = data->data( "vlc/playlist-item-id" );
- QDataStream stream( &encodedData, QIODevice::ReadOnly );
+ PL_UNLOCK;
+}
- if( copy )
- {
- while( !stream.atEnd() )
- {
- int i_id;
- stream >> i_id;
- playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_id );
- if( !p_item )
- {
- PL_UNLOCK;
- return false;
- }
- 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_local_category, true );
- }
- }
- else
+void PLModel::dropMove( const PlMimeData * plMimeData, PLItem *target, int row )
+{
+ QList<input_item_t*> inputItems = plMimeData->inputItems();
+ QList<PLItem*> model_items;
+ playlist_item_t *pp_items[inputItems.size()];
+
+ PL_LOCK;
+
+ playlist_item_t *p_parent =
+ playlist_ItemGetByInput( p_playlist, target->p_input );
+
+ if( !p_parent || row > p_parent->i_children )
+ {
+ PL_UNLOCK; return;
+ }
+
+ int new_pos = row == -1 ? p_parent->i_children : row;
+ int model_pos = new_pos;
+ int i = 0;
+
+ foreach( input_item_t *p_input, inputItems )
+ {
+ playlist_item_t *p_item = playlist_ItemGetByInput( p_playlist, p_input );
+ if( !p_item ) continue;
+
+ PLItem *item = findByInput( rootItem, p_input->i_id );
+ if( !item ) continue;
+
+ /* Better not try to move a node into itself.
+ Abort the whole operation in that case,
+ because it is ambiguous. */
+ PLItem *climber = target;
+ while( climber )
{
- QList<int> ids;
- while( !stream.atEnd() )
- {
- int id;
- stream >> id;
- ids.append(id);
- }
- int count = ids.size();
- playlist_item_t *items[count];
- for( int i = 0; i < count; i++ )
+ if( climber == item )
{
- playlist_item_t *item = playlist_ItemGetById( p_playlist, ids[i] );
- if( !item )
- {
- PL_UNLOCK;
- return false;
- }
- items[i] = item;
+ PL_UNLOCK; return;
}
- playlist_TreeMoveMany( p_playlist, count, items, p_parent,
- (row == -1 ? p_parent->i_children : row) );
+ climber = climber->parentItem;
}
- PL_UNLOCK;
- /*TODO: That's not a good idea to rebuild the playlist */
- rebuild();
+ if( item->parentItem == target &&
+ target->children.indexOf( item ) < new_pos )
+ model_pos--;
+
+ model_items.append( item );
+ pp_items[i] = p_item;
+ i++;
}
- return true;
-}
-/* remove item with its id */
-void PLModel::removeItem( int i_id )
-{
- PLItem *item = FindById( rootItem, i_id );
- if( currentItem && item && currentItem->p_input == item->p_input ) currentItem = NULL;
- if( item ) item->remove( item, i_depth );
-}
+ if( model_items.isEmpty() )
+ {
+ PL_UNLOCK; return;
+ }
-/* 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 );
+ playlist_TreeMoveMany( p_playlist, i, pp_items, p_parent, new_pos );
+
+ PL_UNLOCK;
+
+ foreach( PLItem *item, model_items )
+ takeItem( item );
+
+ insertChildren( target, model_items, model_pos );
}
-void PLModel::delCallbacks()
+/* remove item with its id */
+void PLModel::removeItem( int i_id )
{
- /*
- 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());
+ const PLItem *item = getItem( index );
assert( item );
PL_LOCK;
playlist_item_t *p_item = playlist_ItemGetById( p_playlist, item->i_id );
}
/****************** Base model mandatory implementations *****************/
-QVariant PLModel::data( const QModelIndex &index, int role ) const
+QVariant PLModel::data( const QModelIndex &index, const int role ) const
{
if( !index.isValid() ) return QVariant();
- PLItem *item = static_cast<PLItem*>(index.internalPointer());
+ const PLItem *item = getItem( index );
if( role == Qt::DisplayRole )
{
- int running_index = -1;
- int columncount = 0;
- int metadata = 1;
-
- if( i_depth == DEPTH_SEL )
- {
- vlc_mutex_lock( &item->p_input->lock );
- QString returninfo = QString( qfu( item->p_input->psz_name ) );
- vlc_mutex_unlock( &item->p_input->lock );
- return QVariant(returninfo);
- }
-
- while( metadata < COLUMN_END )
- {
- if( i_showflags & metadata )
- running_index++;
- if( running_index == index.column() )
- break;
- metadata <<= 1;
- }
-
- if( running_index != index.column() ) return QVariant();
+ int metadata = columnToMeta( index.column() );
+ if( metadata == COLUMN_END ) return QVariant();
QString returninfo;
if( metadata == COLUMN_NUMBER )
else
{
char *psz = psz_column_meta( item->p_input, metadata );
- returninfo = QString( qfu( psz ) );
+ 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->p_input->i_type >= 0 )
- return QVariant( PLModel::icons[item->p_input->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 )
{
+ QFont f;
+ f.setPointSize( f.pointSize() - 1 );
if( isCurrent( index ) )
- {
- QFont f; f.setBold( true ); return QVariant( 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 ) );
+ else if( role == IsLeafNodeRole )
+ {
+ QVariant isLeaf;
+ PL_LOCK;
+ playlist_item_t *plItem =
+ playlist_ItemGetById( p_playlist, item->i_id );
+
+ if( plItem )
+ isLeaf = plItem->i_children == -1;
+
+ PL_UNLOCK;
+ return isLeaf;
+ }
+ else if( role == IsCurrentsParentNodeRole )
+ {
+ return QVariant( isParent( index, currentIndex() ) );
}
return QVariant();
}
+/* Seek from current index toward the top and see if index is one of parent nodes */
+bool PLModel::isParent( const QModelIndex &index, const QModelIndex ¤t ) const
+{
+ if( !index.isValid() )
+ return false;
+
+ if( index == current )
+ return true;
+
+ if( !current.isValid() || !current.parent().isValid() )
+ return false;
+
+ return isParent( index, current.parent() );
+}
+
bool PLModel::isCurrent( const QModelIndex &index ) const
{
- assert( index.isValid() );
- if( !currentItem ) return false;
- return static_cast<PLItem*>(index.internalPointer())->p_input == currentItem->p_input;
+ return getItem( index )->p_input == THEMIM->currentInputItem();
}
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
{
- int metadata=1;
- int running_index=-1;
if (orientation != Qt::Horizontal || role != Qt::DisplayRole)
return QVariant();
- if( i_depth == DEPTH_SEL ) return QVariant( QString("") );
-
- while( metadata < COLUMN_END )
- {
- if( metadata & i_showflags )
- running_index++;
- if( running_index == section )
- break;
- metadata <<= 1;
- }
+ int meta_col = columnToMeta( section );
- if( running_index != section ) return QVariant();
+ if( meta_col == COLUMN_END ) return QVariant();
- return QVariant( qfu( psz_column_title( metadata ) ) );
+ return QVariant( qfu( psz_column_title( meta_col ) ) );
}
-QModelIndex PLModel::index( int row, int column, const QModelIndex &parent )
+QModelIndex PLModel::index( const int row, const 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( const int i_id, const 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() const
+{
+ 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" );
msg_Err( p_playlist, "----- PLEASE REPORT THIS ------" );
return createIndex( 0, 0, parentItem );
}
- QModelIndex ind = createIndex(parentItem->row(), 0, parentItem);
- return ind;
+ return createIndex(parentItem->row(), 0, parentItem);
}
int PLModel::columnCount( const QModelIndex &i) const
{
- int columnCount=0;
- int metadata=1;
- if( i_depth == DEPTH_SEL ) return 1;
-
- while( metadata < COLUMN_END )
- {
- if( metadata & i_showflags )
- columnCount++;
- metadata <<= 1;
- }
- return columnCount;
-}
-
-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());
-
+ const PLItem *parentItem = parent.isValid() ? getItem( parent ) : rootItem;
return parentItem->childCount();
}
QStringList lst;
for( int i = 0; i < current_selection.size(); i++ )
{
- PLItem *item = static_cast<PLItem*>
- (current_selection[i].internalPointer());
+ const PLItem *item = getItem( current_selection[i] );
if( item )
{
PL_LOCK;
char *psz = input_item_GetURI( p_item->p_input );
if( psz )
{
- lst.append( psz );
+ lst.append( qfu(psz) );
free( psz );
}
}
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 ) const
{
- 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 ) const
{
- PLItem *result = 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 ) const
{
- if( ( !b_input && i_cached_id == i_id) ||
- ( b_input && i_cached_input_id ==i_id ) )
- {
- return b_input ? p_cached_item_bi : p_cached_item;
- }
+ if( !root ) return NULL;
if( !b_input && root->i_id == i_id )
- {
- CACHE( i_id, root );
return root;
- }
+
else if( b_input && root->p_input->i_id == i_id )
- {
- ICACHE( i_id, root );
return root;
- }
QList<PLItem *>::iterator it = root->children.begin();
while ( it != root->children.end() )
{
if( !b_input && (*it)->i_id == i_id )
- {
- CACHE( i_id, (*it) );
- return p_cached_item;
- }
+ return (*it);
+
else if( b_input && (*it)->p_input->i_id == i_id )
- {
- ICACHE( i_id, (*it) );
- return p_cached_item_bi;
- }
+ return (*it);
+
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 )
- ICACHE( i_id, childFound )
- else
- CACHE( i_id, childFound )
- return childFound;
- }
+ return childFound;
}
it++;
}
return NULL;
}
-#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;
+
+ while( meta != meta_col && meta != COLUMN_END )
+ {
+ meta <<= 1;
+ column++;
+ }
- PLEvent *ple = static_cast<PLEvent *>(event);
+ return column;
+}
- if( type == ItemAppend_Type )
- ProcessItemAppend( &ple->add );
- else if( type == ItemDelete_Type )
- ProcessItemRemoval( ple->i_id );
- else
- rebuild();
+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 ) );
if( p_input && !( p_input->b_dead || !vlc_object_alive( p_input ) ) )
{
- PLItem *item = FindByInput( rootItem, input_GetItem( p_input )->i_id );
- currentItem = item;
- emit currentChanged( index( item, 0 ) );
- }
- else
- {
- currentItem = NULL;
+ 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( input_item_t *p_item )
+
+void PLModel::processInputItemUpdate( input_item_t *p_item )
{
if( !p_item || p_item->i_id <= 0 ) return;
- PLItem *item = FindByInput( rootItem, p_item->i_id );
+ PLItem *item = findByInput( rootItem, p_item->i_id );
if( item )
- UpdateTreeItem( item, true, true);
+ 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 );
+ PLItem *nodeItem = findById( rootItem, i_parent );
if( !nodeItem ) return;
+ foreach( const PLItem *existing, nodeItem->children )
+ if( existing->i_id == i_item ) return;
+
PL_LOCK;
- p_item = playlist_ItemGetById( p_playlist, p_add->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;
+ p_item = playlist_ItemGetById( p_playlist, i_item );
+ if( !p_item || p_item->i_flags & PLAYLIST_DBL_FLAG )
+ {
+ PL_UNLOCK; return;
+ }
+
+ 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;
- emit layoutAboutToBeChanged();
- emit beginInsertRows( index( newItem, 0 ), nodeItem->childCount(), nodeItem->childCount()+1 );
- nodeItem->appendChild( newItem );
- emit endInsertRows();
- emit layoutChanged();
- UpdateTreeItem( newItem, true );
- return;
-end:
- PL_UNLOCK;
- return;
+ beginInsertRows( index( nodeItem, 0 ), pos, pos );
+ nodeItem->insertChild( newItem, pos );
+ endInsertRows();
+
+ if( newItem->p_input == THEMIM->currentInputItem() )
+ emit currentChanged( index( newItem, 0 ) );
}
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;
- emit layoutAboutToBeChanged();
+ if( rootItem ) rootItem->removeChildren();
- /* Clear the tree */
- if( rootItem )
- {
- if( rootItem->children.size() )
- {
- emit beginRemoveRows( index( rootItem, 0 ), 0,
- rootItem->children.size() -1 );
- qDeleteAll( rootItem->children );
- rootItem->children.clear();
- emit endRemoveRows();
- }
- }
PL_LOCK;
if( p_root )
{
}
assert( rootItem );
/* Recreate from root */
- UpdateNodeChildren( rootItem );
- if( (p_item = playlist_CurrentPlayingItem(p_playlist)) )
+ updateChildren( rootItem );
+ PL_UNLOCK;
+
+ /* And signal the view */
+ reset();
+
+ if( p_root ) emit rootChanged();
+}
+
+void PLModel::takeItem( PLItem *item )
+{
+ 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();
+}
+
+void PLModel::insertChildren( PLItem *node, QList<PLItem*>& items, int i_pos )
+{
+ 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++ )
{
- currentItem = FindByInput( rootItem,
- p_item->p_input->i_id );
- if( currentItem )
- {
- UpdateTreeItem( currentItem, true, false );
- }
+ node->children.insert( i_pos + i, items[i] );
+ items[i]->parentItem = node;
}
- else
- {
- currentItem = NULL;
+ endInsertRows();
+}
+
+void PLModel::removeItem( PLItem *item )
+{
+ if( !item ) return;
+
+ 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();
}
- PL_UNLOCK;
+ else delete item;
- /* And signal the view */
- emit layoutChanged();
- addCallbacks();
+ if(item == rootItem)
+ {
+ rootItem = NULL;
+ rebuild( p_playlist->p_playing );
+ }
}
/* This function must be entered WITH the playlist lock */
-void PLModel::UpdateNodeChildren( PLItem *root )
+void PLModel::updateChildren( PLItem *root )
{
- emit layoutAboutToBeChanged();
playlist_item_t *p_node = playlist_ItemGetById( p_playlist, root->i_id );
- UpdateNodeChildren( p_node, root );
- emit layoutChanged();
+ updateChildren( p_node, root );
}
/* This function must be entered WITH the playlist lock */
-void PLModel::UpdateNodeChildren( playlist_item_t *p_node, PLItem *root )
+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 );
- emit beginInsertRows( index( newItem, 0 ), root->childCount(), root->childCount()+1 );
root->appendChild( newItem );
- emit endInsertRows();
- UpdateTreeItem( newItem, true, true );
- if( i_depth == DEPTH_PL && p_node->pp_children[i]->i_children != -1 )
- UpdateNodeChildren( p_node->pp_children[i], 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, bool signal, bool force )
+void PLModel::updateTreeItem( PLItem *item )
{
- if ( !item || !item->p_input )
- return;
- if( !force && i_depth == DEPTH_SEL && item->parentItem &&
- item->parentItem->p_input != rootItem->p_input )
- return;
- if( signal )
- emit dataChanged( index( item, 0 ) , index( item, columnCount( QModelIndex() ) ) );
+ if( !item ) return;
+ emit dataChanged( index( item, 0 ) , index( item, columnCount( QModelIndex() ) ) );
}
/************************* Actions ******************************/
/**
- * Deletion, here we have to do a ugly slow hack as we retrieve the full
- * list of indexes to delete at once: when we delete a node and all of
- * its children, we need to update the list.
- * Todo: investigate whethere we can use ranges to be sure to delete all items?
+ * Deletion, don't delete items childrens if item is going to be
+ * delete allready, so we remove childrens from selection-list.
*/
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 );
- }
- if( i > selected.size() ) i = selected.size();
+
+ 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( const 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 );
- PL_UNLOCK;
- /* And finally, remove it from the tree */
- emit beginRemoveRows( index( item->parentItem, 0), item->parentItem->children.indexOf( item ),
- item->parentItem->children.indexOf( item )+1 );
- item->remove( item, i_depth );
- emit endRemoveRows();
+ sort( rootItem->i_id, column, order );
}
-/******* Volume III: Sorting and searching ********/
-void PLModel::sort( int column, Qt::SortOrder order )
+void PLModel::sort( const int i_root_id, const 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 i_column = 1;
- for( i_column = 1; i_column != COLUMN_END; i_column<<=1 )
+ int meta = columnToMeta( column );
+ if( meta == COLUMN_END ) return;
+
+ 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();
+ /* if we have popup item, try to make sure that you keep that item visible */
+ if( i_popup_item > -1 )
+ {
+ PLItem *popupitem = findById( rootItem, i_popup_item );
+ if( popupitem ) emit currentChanged( index( popupitem, 0 ) );
+ /* reset i_popup_item as we don't show it as selected anymore anyway */
+ i_popup_item = -1;
+ }
+ else if( currentIndex().isValid() ) emit currentChanged( currentIndex() );
}
-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 );
+ const char *psz_name = qtu( search_text );
+ 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 )
{
+ int i_id = index.isValid() ? itemId( index ) : rootItem->i_id;
+
PL_LOCK;
- int i_id;
- if( index.isValid() ) i_id = itemId( index );
- else i_id = rootItem->i_id;
playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_id );
- if( p_item )
+ if( !p_item )
{
- i_popup_item = p_item->i_id;
- i_popup_parent = p_item->p_parent ? p_item->p_parent->i_id : -1;
- bool node = p_item->i_children > -1;
- bool tree = false;
- if( node )
- {
- /* check whether we are in tree view */
- playlist_item_t *p_up = p_item;
- while( p_up )
- {
- if ( p_up == p_playlist->p_root_category ) tree = true;
- p_up = p_up->p_parent;
- }
- }
PL_UNLOCK;
-
- current_selection = list;
- QMenu *menu = new QMenu;
- if( index.isValid() )
- {
- 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( node )
- {
- if( index.isValid() ) menu->addSeparator();
- menu->addAction( qtr(I_POP_SORT), this, SLOT( popupSort() ) );
- if( tree )
- menu->addAction( qtr(I_POP_ADD), this, SLOT( popupAddNode() ) );
- }
- if( index.isValid() )
- {
- menu->addSeparator();
- menu->addAction( qtr( I_POP_EXPLORE ), this, SLOT( popupExplore() ) );
- }
- menu->popup( point );
+ return false;
}
- else
- PL_UNLOCK;
-}
+ input_item_t *p_input = p_item->p_input;
+ vlc_gc_incref( p_input );
-void PLModel::viewchanged( int meta )
-{
- assert( meta );
- int _meta = meta;
- if( rootItem )
+ 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();
+
+ bool tree = ( rootItem && rootItem->i_id != p_playlist->p_playing->i_id ) ||
+ var_InheritBool( p_intf, "playlist-tree" );
+
+ PL_UNLOCK;
+
+ current_selection = list;
+
+ QMenu menu;
+ if( i_popup_item > -1 )
{
- int index=-1;
- while( _meta )
+ menu.addAction( QIcon( ":/menu/play" ), qtr(I_POP_PLAY), this, SLOT( popupPlay() ) );
+ menu.addAction( QIcon( ":/menu/stream" ),
+ qtr(I_POP_STREAM), this, SLOT( popupStream() ) );
+ menu.addAction( qtr(I_POP_SAVE), this, SLOT( popupSave() ) );
+ menu.addAction( QIcon( ":/menu/info" ), qtr(I_POP_INFO), this, SLOT( popupInfo() ) );
+ if( !strncasecmp( p_input->psz_uri, "file://", 7 ) )
+ menu.addAction( QIcon( ":/type/folder-grey" ),
+ qtr( I_POP_EXPLORE ), this, SLOT( popupExplore() ) );
+ menu.addSeparator();
+ }
+ 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 )
{
- index++;
- _meta >>= 1;
+ 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()) );
}
-
- /* UNUSED emit layoutAboutToBeChanged(); */
- index = __MIN( index, columnCount() );
- QModelIndex parent = createIndex( 0, 0, rootItem );
-
- if( i_showflags & meta )
- /* Removing columns */
+ else if( THEPL->p_media_library &&
+ rootItem->i_id == THEPL->p_media_library->i_id )
{
- emit beginRemoveColumns( parent, index, index+1 );
- i_showflags &= ~( meta );
- getSettings()->setValue( "qt-pl-showflags", i_showflags );
- emit endRemoveColumns();
+ 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() ) );
}
- else
+ }
+ if( i_popup_item > -1 )
+ {
+ menu.addAction( QIcon( ":/buttons/playlist/playlist_remove" ),
+ qtr(I_POP_DEL), this, SLOT( popupDel() ) );
+ menu.addSeparator();
+ if( !sortingMenu )
{
- /* Adding columns */
- emit beginInsertColumns( parent, index, index+1 );
- i_showflags |= meta;
- getSettings()->setValue( "qt-pl-showflags", i_showflags );
- emit endInsertColumns();
+ sortingMenu = new QMenu( qtr( "Sort by" ) );
+ sortingMapper = new QSignalMapper( this );
+ int i, j;
+ for( i = 1, j = 1; i < COLUMN_END; i <<= 1, j++ )
+ {
+ if( i == COLUMN_NUMBER ) continue;
+ QMenu *m = sortingMenu->addMenu( qfu( psz_column_title( i ) ) );
+ QAction *asc = m->addAction( qtr("Ascending") );
+ QAction *desc = m->addAction( qtr("Descending") );
+ sortingMapper->setMapping( asc, j );
+ sortingMapper->setMapping( desc, -j );
+ CONNECT( asc, triggered(), sortingMapper, map() );
+ CONNECT( desc, triggered(), sortingMapper, map() );
+ }
+ CONNECT( sortingMapper, mapped( int ), this, popupSort( int ) );
}
- emit columnsChanged( meta );
- rebuild();
+ menu.addMenu( sortingMenu );
}
+ vlc_gc_decref( p_input );
+
+ if( !menu.isEmpty() )
+ {
+ menu.exec( point ); return true;
+ }
+ else return false;
}
void PLModel::popupDel()
THEDP->streamingDialog( NULL, mrls[0] );
}
-#include <QUrl>
-#include <QFileInfo>
-#include <QDesktopServices>
void PLModel::popupExplore()
{
PL_LOCK;
playlist_item_t *p_item = playlist_ItemGetById( p_playlist,
- i_popup_item );
+ i_popup_item );
if( p_item )
{
- input_item_t *p_input = p_item->p_input;
- char *psz_meta = input_item_GetURI( p_input );
- PL_UNLOCK;
- if( psz_meta )
- {
- const char *psz_access;
- const char *psz_demux;
- char *psz_path;
- input_SplitMRL( &psz_access, &psz_demux, &psz_path, psz_meta );
-
- if( EMPTY_STR( psz_access ) ||
- !strncasecmp( psz_access, "file", 4 ) ||
- !strncasecmp( psz_access, "dire", 4 ) )
- {
- QFileInfo info( qfu( psz_meta ) );
- QDesktopServices::openUrl(
- QUrl::fromLocalFile( info.absolutePath() ) );
- }
- free( psz_meta );
- }
+ input_item_t *p_input = p_item->p_input;
+ char *psz_meta = input_item_GetURI( p_input );
+ PL_UNLOCK;
+ if( psz_meta )
+ {
+ const char *psz_access;
+ const char *psz_demux;
+ char *psz_path;
+ input_SplitMRL( &psz_access, &psz_demux, &psz_path, psz_meta );
+
+ if( !EMPTY_STR( psz_access ) && (
+ !strncasecmp( psz_access, "file", 4 ) ||
+ !strncasecmp( psz_access, "dire", 4 ) ))
+ {
+#ifdef WIN32
+ /* Qt openURL doesn't know to open files that starts with a / or \ */
+ if( psz_path[0] == '/' || psz_path[0] == '\\' )
+ psz_path++;
+#endif
+
+ QFileInfo info( qfu( decode_URI( psz_path ) ) );
+ QDesktopServices::openUrl(
+ QUrl::fromLocalFile( info.absolutePath() ) );
+ }
+ free( psz_meta );
+ }
}
else
PL_UNLOCK;
}
-#include <QInputDialog>
void PLModel::popupAddNode()
{
bool ok;
QString name = QInputDialog::getText( PlaylistDialog::getInstance( p_intf ),
- qtr( I_POP_ADD ), qtr( "Enter name for new node:" ),
+ qtr( I_NEW_DIR ), qtr( I_NEW_DIR_NAME ),
QLineEdit::Normal, QString(), &ok);
if( !ok || name.isEmpty() ) return;
+
PL_LOCK;
playlist_item_t *p_item = playlist_ItemGetById( p_playlist,
- i_popup_item );
+ i_popup_parent );
if( p_item )
- {
- playlist_NodeCreate( p_playlist, qtu( name ), p_item, 0, NULL );
- }
+ playlist_NodeCreate( p_playlist, qtu( name ), p_item, PLAYLIST_END, 0, NULL );
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 )
+
+void PLModel::popupSort( int column )
{
- PLModel *p_model = (PLModel *) param;
- PLEvent *event = new PLEvent( PLUpdate_Type, 0 );
- QApplication::postEvent( p_model, event );
- return VLC_SUCCESS;
+ sort( i_popup_parent,
+ column > 0 ? column - 1 : -column - 1,
+ column > 0 ? Qt::AscendingOrder : Qt::DescendingOrder );
}
-static int PlaylistNext( vlc_object_t *p_this, const char *psz_variable,
- vlc_value_t oval, vlc_value_t nval, void *param )
+/******************* Drag and Drop helper class ******************/
+
+PlMimeData::PlMimeData( )
+{ }
+
+PlMimeData::~PlMimeData()
{
- 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;
+ foreach( input_item_t *p_item, _inputItems )
+ vlc_gc_decref( p_item );
}
-static int ItemDeleted( vlc_object_t *p_this, const char *psz_variable,
- vlc_value_t oval, vlc_value_t nval, void *param )
+void PlMimeData::appendItem( input_item_t *p_item )
{
- PLModel *p_model = (PLModel *) param;
- PLEvent *event = new PLEvent( ItemDelete_Type, nval.i_int );
- QApplication::postEvent( p_model, event );
- return VLC_SUCCESS;
+ vlc_gc_incref( p_item );
+ _inputItems.append( p_item );
}
-static int ItemAppended( vlc_object_t *p_this, const char *psz_variable,
- vlc_value_t oval, vlc_value_t nval, void *param )
+QList<input_item_t*> PlMimeData::inputItems() const
{
- 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;
+ return _inputItems;
}
+QStringList PlMimeData::formats () const
+{
+ QStringList fmts;
+ fmts << "vlc/qt-input-items";
+ return fmts;
+}
projects / vlc / blobdiff