/*****************************************************************************
* playlist_model.cpp : Manage playlist model
****************************************************************************
- * Copyright (C) 2006-2007 the VideoLAN team
+ * Copyright (C) 2006-2011 the VideoLAN team
* $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
#endif
#include "qt4.hpp"
-#include "dialogs_provider.hpp"
#include "components/playlist/playlist_model.hpp"
-#include "dialogs/mediainfo.hpp"
-#include "dialogs/playlist.hpp"
-#include <vlc_intf_strings.h>
+#include "dialogs_provider.hpp" /* THEDP */
+#include "input_manager.hpp" /* THEMIM */
+#include "dialogs/mediainfo.hpp" /* MediaInfo Dialog */
+#include "dialogs/playlist.hpp" /* Playlist Dialog */
+
+#include <vlc_intf_strings.h> /* I_DIR */
#include "pixmaps/types/type_unknown.xpm"
+#include "sorting.h"
#include <assert.h>
#include <QIcon>
#include <QFont>
#include <QMenu>
-#include <QApplication>
-#include <QSettings>
+#include <QUrl>
+#include <QFileInfo>
+#include <QDesktopServices>
+#include <QInputDialog>
+#include <QSignalMapper>
-#include "sorting.h"
+#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:" ) )
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 )
+ : VLCModel( _p_intf, 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;
+ sortingMenu = NULL;
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" );
- ADD_ICON( DISC, ":/disc" );
- ADD_ICON( CDDA, ":/cdda" );
- ADD_ICON( CARD, ":/capture-card" );
- ADD_ICON( NET, ":/type_net" );
- ADD_ICON( PLAYLIST, ":/type_playlist" );
- ADD_ICON( NODE, ":/type_node" );
+ ADD_ICON( FILE, ":/type/file" );
+ ADD_ICON( DIRECTORY, ":/type/directory" );
+ ADD_ICON( DISC, ":/type/disc" );
+ ADD_ICON( CDDA, ":/type/cdda" );
+ ADD_ICON( CARD, ":/type/capture-card" );
+ ADD_ICON( NET, ":/type/net" );
+ ADD_ICON( PLAYLIST, ":/type/playlist" );
+ ADD_ICON( NODE, ":/type/node" );
#undef ADD_ICON
+ i_zoom = getSettings()->value( "Playlist/zoom", 0 ).toInt();
+
rebuild( p_root );
- CONNECT( THEMIM->getIM(), metaChanged( int ),
- this, ProcessInputItemUpdate( int ) );
- CONNECT( THEMIM, inputChanged( input_thread_t * ),
- this, ProcessInputItemUpdate( input_thread_t* ) );
+ 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()
{
- getSettings()->setValue( "qt-pl-showflags", rootItem->i_showflags );
- delCallbacks();
+ getSettings()->setValue( "Playlist/zoom", i_zoom );
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 defaultFlags = QAbstractItemModel::flags( index );
- if( index.isValid() )
- return Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled | defaultFlags;
- else
- return Qt::ItemIsDropEnabled | defaultFlags;
+ Qt::ItemFlags flags = QAbstractItemModel::flags( index );
+
+ const 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-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 ) {
if( index.isValid() && index.column() == 0 )
- stream << itemId( index );
+ list.append(index);
}
- mimeData->setData( "vlc/playlist-item-id", encodedData );
- return mimeData;
+
+ qSort(list.begin(), list.end(), modelIndexLessThen);
+
+ PLItem *item = NULL;
+ foreach( const QModelIndex &index, list ) {
+ 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->inputItem() );
+ }
+
+ return plMimeData;
}
/* Drop operation */
bool PLModel::dropMimeData( const QMimeData *data, Qt::DropAction action,
- int row, int column, const QModelIndex &target )
+ int row, int, 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;
+}
- if( !target.isValid() )
- /* We don't want to move on an invalid position */
- return true;
+void PLModel::dropAppendCopy( const PlMimeData *plMimeData, PLItem *target, int pos )
+{
+ PL_LOCK;
- PLItem *targetItem = static_cast<PLItem*>( target.internalPointer() );
+ playlist_item_t *p_parent =
+ playlist_ItemGetByInput( p_playlist, target->inputItem() );
+ if( !p_parent ) return;
- QByteArray encodedData = data->data( "vlc/playlist-item-id" );
- QDataStream stream( &encodedData, QIODevice::ReadOnly );
+ if( pos == -1 ) pos = PLAYLIST_END;
- PLItem *newParentItem;
- while( !stream.atEnd() )
- {
- int i;
- int srcId;
- stream >> srcId;
+ QList<input_item_t*> inputItems = plMimeData->inputItems();
- PL_LOCK;
- playlist_item_t *p_target =
- playlist_ItemGetById( p_playlist, targetItem->i_id );
- playlist_item_t *p_src = playlist_ItemGetById( p_playlist, srcId );
+ 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 );
+ }
- if( !p_target || !p_src )
- {
- PL_UNLOCK;
- return false;
- }
- 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
+ PL_UNLOCK;
+}
+
+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.count()];
+
+ PL_LOCK;
+
+ playlist_item_t *p_parent =
+ playlist_ItemGetByInput( p_playlist, target->inputItem() );
+
+ 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 )
+ {
+ if( climber == item )
{
- /* \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; return;
}
- PL_UNLOCK;
+ climber = climber->parent();
}
- /*TODO: That's not a good idea to rebuild the playlist */
- rebuild();
+
+ if( item->parent() == 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( item ) item->remove( item );
-}
+ 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 );
PL_UNLOCK;
}
-/* Must be entered with lock */
+/* Convenient overloaded private version of activateItem
+ * Must be entered with PL lock */
void PLModel::activateItem( playlist_item_t *p_item )
{
if( !p_item ) return;
playlist_item_t *p_parent = p_item;
while( p_parent )
{
- if( p_parent->i_id == rootItem->i_id ) break;
+ if( p_parent->i_id == rootItem->id() ) break;
p_parent = p_parent->p_parent;
}
if( p_parent )
playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Locked,
- p_parent, p_item );
+ p_parent, p_item );
}
/****************** 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 )
{
- 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 if( metadata == COLUMN_COVER )
+ {
+ QString artUrl;
+ artUrl = InputManager::decodeArtURL( item->inputItem() );
+ if( artUrl.isEmpty() )
+ {
+ for( int i = 0; i < item->childCount(); i++ )
+ {
+ artUrl = InputManager::decodeArtURL( item->child( i )->inputItem() );
+ if( !artUrl.isEmpty() )
+ break;
+ }
+ }
+ return QVariant( artUrl );
+ }
+ else
+ {
+ char *psz = psz_column_meta( item->inputItem(), 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->inputItem()->i_type] );
}
else if( role == Qt::FontRole )
{
- if( item->b_current == true )
- {
- QFont f; f.setBold( true ); return QVariant( f );
- }
+ QFont f;
+ f.setPointSize( __MAX( f.pointSize() - 1 + i_zoom, 4 ) );
+ if( isCurrent( index ) )
+ 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();
}
-bool PLModel::isCurrent( const QModelIndex &index )
+/* 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
{
- assert( index.isValid() );
- return static_cast<PLItem*>(index.internalPointer())->b_current;
+ 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
+{
+ return getItem( index )->inputItem() == THEMIM->currentInputItem();
}
int PLModel::itemId( const QModelIndex &index ) const
{
- assert( index.isValid() );
- return static_cast<PLItem*>(index.internalPointer())->i_id;
+ return getItem( index )->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 )
+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" );
PLItem *parentItem = childItem->parent();
if( !parentItem || parentItem == rootItem ) return QModelIndex();
- if( !parentItem->parentItem )
+ if( !parentItem->parent() )
{
msg_Err( p_playlist, "No parent parent, trying row 0 " );
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 PLModel::columnCount( const QModelIndex &) 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());
-
+ const PLItem *parentItem = parent.isValid() ? getItem( parent ) : rootItem;
return parentItem->childCount();
}
QStringList PLModel::selectedURIs()
{
QStringList lst;
- for( int i = 0; i < current_selection.size(); i++ )
+ for( int i = 0; i < current_selection.count(); i++ )
{
- PL_LOCK;
- PLItem *item = static_cast<PLItem*>
- (current_selection[i].internalPointer());
+ const 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 ) 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
{
- 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 ) 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 );
+ if( !b_input && root->id() == i_id )
return root;
- }
- else if( b_input && root->i_input_id == i_id )
- {
- ICACHE( i_id, root );
+
+ else if( b_input && root->inputItem()->i_id == i_id )
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;
- }
- else if( b_input && (*it)->i_input_id == i_id )
- {
- ICACHE( i_id, (*it) );
- return p_cached_item_bi;
- }
- if( (*it)->children.size() )
+ if( !b_input && (*it)->id() == i_id )
+ return (*it);
+
+ else if( b_input && (*it)->inputItem()->i_id == i_id )
+ return (*it);
+
+ if( (*it)->childCount() )
{
- 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;
- }
}
- it++;
+ ++it;
}
return NULL;
}
-#undef CACHE
-#undef ICACHE
-
-/************************* Updates handling *****************************/
-void PLModel::customEvent( QEvent *event )
+bool PLModel::canEdit() const
{
- int type = event->type();
- if( type != ItemAppend_Type &&
- type != ItemDelete_Type && type != PLUpdate_Type )
- return;
-
- PLEvent *ple = static_cast<PLEvent *>(event);
-
- if( type == ItemAppend_Type )
- ProcessItemAppend( &ple->add );
- else if( type == ItemDelete_Type )
- ProcessItemRemoval( ple->i_id );
- else
- rebuild();
+ return (
+ rootItem != NULL &&
+ (
+ rootItem->inputItem() == p_playlist->p_playing->p_input ||
+ ( p_playlist->p_media_library &&
+ rootItem->inputItem() == 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;
+ int pos;
+
+ /* Find the Parent */
+ PLItem *nodeParentItem = findById( rootItem, i_parent );
+ if( !nodeParentItem ) return;
+
+ /* Search for an already matching children */
+ foreach( const PLItem *existing, nodeParentItem->children )
+ if( existing->i_id == i_item ) return;
- PLItem *nodeItem = FindById( rootItem, p_add->i_node );
+ /* Find the child */
PL_LOCK;
- if( !nodeItem ) goto end;
-
- 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;
-
- newItem = new PLItem( p_item, nodeItem, this );
- nodeItem->appendChild( newItem );
- UpdateTreeItem( p_item, newItem, true );
-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, nodeParentItem );
PL_UNLOCK;
- return;
-}
+ /* We insert the newItem (children) inside the parent */
+ beginInsertRows( index( nodeParentItem, 0 ), pos, pos );
+ nodeParentItem->insertChild( newItem, pos );
+ endInsertRows();
-void PLModel::rebuild()
-{
- rebuild( NULL );
+ if( newItem->inputItem() == 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;
+ 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 )
+ if( p_root ) // Can be NULL
{
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->parent();
+ 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.count();
+ if( !count ) return;
+ printf( "Here I am\n");
+ 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;
+
+ i_cached_id = -1;
+ i_cached_input_id = -1;
+
+ if( item->parent() ) {
+ int i = item->parent()->children.indexOf( item );
+ beginRemoveRows( index( item->parent(), 0), i, i );
+ item->parent()->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->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 )
{
- 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 ) );
+ 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( !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 );
- }
+
+ PLItem *item = getItem( index );
+ if( item->childCount() )
+ recurseDelete( item->children, &selected );
+
+ PL_LOCK;
+ playlist_DeleteFromInput( p_playlist, item->inputItem(), pl_Locked );
+ PL_UNLOCK;
+
+ removeItem( item );
}
}
void PLModel::recurseDelete( QList<PLItem*> children, QModelIndexList *fullList )
{
- for( int i = children.size() - 1; i >= 0 ; i-- )
+ for( int i = children.count() - 1; i >= 0 ; i-- )
{
PLItem *item = children[i];
- if( item->children.size() )
+ if( item->childCount() )
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 );
- /* And finally, remove it from the tree */
- item->remove( item );
- PL_UNLOCK;
+ sort( rootItem->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->childCount();
+ 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 );
+ playlist_LiveSearchUpdate( p_playlist , p_root, qtu( search_text ),
+ b_recursive );
+ if( idx.isValid() )
+ {
+ PLItem *searchRoot = getItem( idx );
+
+ beginRemoveRows( idx, 0, searchRoot->childCount() - 1 );
+ searchRoot->removeChildren();
+ endRemoveRows( );
+
+ beginInsertRows( idx, 0, searchRoot->childCount() - 1 );
+ updateChildren( searchRoot ); // The PL_LOCK is needed here
+ 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->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->id() );
-void PLModel::viewchanged( int meta )
-{
- assert( meta );
- int _meta = meta;
- if( rootItem )
+ bool tree = ( rootItem && rootItem->id() != p_playlist->p_playing->i_id ) ||
+ var_InheritBool( p_intf, "playlist-tree" );
+
+ input_item_t *p_input = p_item->p_input;
+ vlc_gc_incref( p_input );
+ PL_UNLOCK;
+
+ /* */
+ QMenu menu;
+
+ /* Play/Stream/Info static actions */
+ 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( p_input->psz_uri && !strncasecmp( p_input->psz_uri, "file://", 7 ) )
{
- index++;
- _meta >>= 1;
+ menu.addAction( QIcon( ":/type/folder-grey" ),
+ qtr( I_POP_EXPLORE ), this, SLOT( popupExplore() ) );
}
+ menu.addSeparator();
+ }
+ vlc_gc_decref( p_input );
- /* UNUSED emit layoutAboutToBeChanged(); */
- index = __MIN( index, rootItem->item_col_strings.count() );
- QModelIndex parent = createIndex( 0, 0, rootItem );
-
- if( rootItem->i_showflags & meta )
- /* Removing columns */
+ /* In PL or ML, allow to add a file/folder */
+ if( canEdit() )
+ {
+ QIcon addIcon( ":/buttons/playlist/playlist_add" );
+ menu.addSeparator();
+ if( tree ) menu.addAction( addIcon, qtr(I_POP_NEWFOLDER), this, SLOT( popupAddNode() ) );
+ if( rootItem->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->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();
}
+
+ /* Item removal */
+ if( i_popup_item > -1 )
+ {
+ if( rootItem->id() != THEPL->p_playing->i_id )
+ menu.addAction( qtr( "Add to playlist"), this, SLOT( popupAddToPlaylist() ) );
+ menu.addAction( QIcon( ":/buttons/playlist/playlist_remove" ),
+ qtr(I_POP_DEL), this, SLOT( popupDel() ) );
+ menu.addSeparator();
+ }
+
+ /* Playlist sorting */
+ if( !sortingMenu )
+ {
+ sortingMenu = new QMenu( qtr( "Sort by" ) );
+ sortingMapper = new QSignalMapper( this );
+ /* Choose what columns to show in sorting menu, not sure if this should be configurable*/
+ QList<int> sortingColumns;
+ sortingColumns << COLUMN_TITLE << COLUMN_ARTIST << COLUMN_ALBUM << COLUMN_TRACK_NUMBER << COLUMN_URI;
+ foreach( int Column, sortingColumns )
+ {
+ QAction *asc = sortingMenu->addAction( qfu( psz_column_title( Column ) ) + " " + qtr("Ascending") );
+ QAction *desc = sortingMenu->addAction( qfu( psz_column_title( Column ) ) + " " + qtr("Descending") );
+ sortingMapper->setMapping( asc, columnFromMeta(Column) + 1 );
+ sortingMapper->setMapping( desc, -1 * (columnFromMeta(Column)+1) );
+ CONNECT( asc, triggered(), sortingMapper, map() );
+ CONNECT( desc, triggered(), sortingMapper, map() );
+ }
+ CONNECT( sortingMapper, mapped( int ), this, popupSort( int ) );
+ }
+ menu.addMenu( sortingMenu );
+
+ /* Zoom */
+ QMenu *zoomMenu = new QMenu( qtr( "Display size" ) );
+ zoomMenu->addAction( qtr( "Increase" ), this, SLOT( increaseZoom() ) );
+ zoomMenu->addAction( qtr( "Decrease" ), this, SLOT( decreaseZoom() ) );
+ menu.addMenu( zoomMenu );
+
+ /* Store the current selected item for popup*() methods */
+ current_selection = list;
+
+ /* Display and forward the result */
+ if( !menu.isEmpty() )
+ {
+ menu.exec( point ); return true;
+ }
+ else return false;
}
void PLModel::popupDel()
PL_UNLOCK;
}
+void PLModel::popupAddToPlaylist()
+{
+ playlist_Lock( THEPL );
+
+ foreach( QModelIndex currentIndex, current_selection )
+ {
+ playlist_item_t *p_item = playlist_ItemGetById( THEPL, itemId( currentIndex ) );
+ if( !p_item ) continue;
+
+ playlist_NodeAddCopy( THEPL, p_item,
+ THEPL->p_playing,
+ PLAYLIST_END );
+ }
+ playlist_Unlock( THEPL );
+}
+
void PLModel::popupInfo()
{
PL_LOCK;
mid->setParent( PlaylistDialog::getInstance( p_intf ),
Qt::Dialog );
mid->show();
- }
+ } else
+ PL_UNLOCK;
}
void PLModel::popupStream()
QStringList mrls = selectedURIs();
if( !mrls.isEmpty() )
THEDP->streamingDialog( NULL, mrls[0], false );
-
}
void PLModel::popupSave()
THEDP->streamingDialog( NULL, mrls[0] );
}
-#include <QUrl>
-#include <QFileInfo>
-#include <QDesktopServices>
void PLModel::popupExplore()
{
+ char *uri = NULL, *path = NULL;
+
PL_LOCK;
- playlist_item_t *p_item = playlist_ItemGetById( p_playlist,
- i_popup_item );
+ playlist_item_t *p_item = playlist_ItemGetById( p_playlist, 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;
+ uri = input_item_GetURI( p_input );
}
- else
- PL_UNLOCK;
+ PL_UNLOCK;
+
+ if( uri != NULL )
+ {
+ path = make_path( uri );
+ free( uri );
+ }
+ if( path == NULL )
+ return;
+
+ QFileInfo info( qfu( path ) );
+ free( path );
+
+ QDesktopServices::openUrl( QUrl::fromLocalFile( info.absolutePath() ) );
}
-/**********************************************************************
- * 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::popupAddNode()
{
- PLModel *p_model = (PLModel *) param;
- PLEvent *event = new PLEvent( PLUpdate_Type, 0 );
- QApplication::postEvent( p_model, event );
- return VLC_SUCCESS;
+ bool ok;
+ QString name = QInputDialog::getText( PlaylistDialog::getInstance( p_intf ),
+ 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_parent );
+ if( p_item )
+ playlist_NodeCreate( p_playlist, qtu( name ), p_item, PLAYLIST_END, 0, NULL );
+ PL_UNLOCK;
}
-static int PlaylistNext( 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( 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;
+ sort( i_popup_parent,
+ column > 0 ? column - 1 : -column - 1,
+ column > 0 ? Qt::AscendingOrder : Qt::DescendingOrder );
}
-static int ItemDeleted( vlc_object_t *p_this, const char *psz_variable,
- vlc_value_t oval, vlc_value_t nval, void *param )
+/* */
+void PLModel::increaseZoom()
{
- PLModel *p_model = (PLModel *) param;
- PLEvent *event = new PLEvent( ItemDelete_Type, nval.i_int );
- QApplication::postEvent( p_model, event );
- return VLC_SUCCESS;
+ i_zoom++;
+ emit layoutChanged();
}
-static int ItemAppended( vlc_object_t *p_this, const char *psz_variable,
- vlc_value_t oval, vlc_value_t nval, void *param )
+void PLModel::decreaseZoom()
{
- 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;
+ i_zoom--;
+ emit layoutChanged();
}
+/******************* Drag and Drop helper class ******************/
+PlMimeData::~PlMimeData()
+{
+ foreach( input_item_t *p_item, _inputItems )
+ vlc_gc_decref( p_item );
+}
+
+void PlMimeData::appendItem( input_item_t *p_item )
+{
+ vlc_gc_incref( p_item );
+ _inputItems.append( p_item );
+}
+
+QList<input_item_t*> PlMimeData::inputItems() const
+{
+ return _inputItems;
+}
+
+QStringList PlMimeData::formats () const
+{
+ QStringList fmts;
+ fmts << "vlc/qt-input-items";
+ return fmts;
+}
projects / vlc / blobdiff