#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 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 */
QObject *parent ) /* Basic Qt parent */
: QAbstractItemModel( parent )
{
i_cached_id = -1;
i_cached_input_id = -1;
i_popup_item = i_popup_parent = -1;
- currentItem = 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( NODE, ":/type/node" );
#undef ADD_ICON
- rebuild( p_root, true );
+ 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* ) );
+ CONNECT( THEMIM, playlistItemAppended( int, int ),
+ this, processItemAppend( int, int ) );
+ CONNECT( THEMIM, playlistItemRemoved( int ),
+ this, processItemRemoval( int ) );
}
PLModel::~PLModel()
{
- delCallbacks();
delete rootItem;
}
}
bool copy = false;
- playlist_item_t *p_pl = p_playlist->p_local_category;
- playlist_item_t *p_ml = p_playlist->p_ml_category;
+ 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_input == p_pl->p_input ) ||
- ( p_ml && p_parent->p_input == p_ml->p_input ) )
+ ( p_pl && p_parent == p_pl ) ||
+ ( p_ml && p_parent == p_ml ) )
)
copy = true;
PL_UNLOCK;
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 ||
- p_parent == p_playlist->p_local_onelevel ),
+ p_parent == p_playlist->p_playing,
true );
}
PL_UNLOCK;
removeItem( item );
}
-/* callbacks and slots */
-void PLModel::addCallbacks()
-{
- /* 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, "playlist-item-append", ItemAppended, this );
- var_DelCallback( p_playlist, "playlist-item-deleted", ItemDeleted, this );
-}
-
void PLModel::activateItem( const QModelIndex &index )
{
assert( index.isValid() );
}
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.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 ) const
{
- if( !currentItem ) return false;
- return getItem( index )->p_input == currentItem->p_input;
+ return getItem( index )->p_input == THEMIM->currentInputItem();
}
int PLModel::itemId( const QModelIndex &index ) const
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();
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 *****************************/
#undef CACHE
#undef ICACHE
-PLItem *PLModel::getItem( QModelIndex index )
-{
- assert( index.isValid() );
- return static_cast<PLItem*>( index.internalPointer() );
-}
-
-int PLModel::columnToMeta( int _column ) const
+int PLModel::columnToMeta( int _column )
{
int meta = 1;
int column = 0;
return meta;
}
-int PLModel::columnFromMeta( int meta_col ) const
+int PLModel::columnFromMeta( int meta_col )
{
int meta = 1;
int column = 0;
return (
rootItem != NULL &&
(
- rootItem->p_input == p_playlist->p_local_category->p_input ||
+ rootItem->p_input == p_playlist->p_playing->p_input ||
(
- p_playlist->p_ml_category &&
- rootItem->p_input == p_playlist->p_ml_category->p_input
+ p_playlist->p_media_library &&
+ rootItem->p_input == p_playlist->p_media_library->p_input
)
)
);
}
/************************* Updates handling *****************************/
-void PLModel::customEvent( QEvent *event )
-{
- int type = event->type();
- if( type != ItemAppend_Type &&
- type != ItemDelete_Type )
- return;
-
- PLEvent *ple = static_cast<PLEvent *>(event);
-
- if( type == ItemAppend_Type )
- processItemAppend( &ple->add );
- else if( type == ItemDelete_Type )
- processItemRemoval( ple->i_id );
-}
/**** Events processing ****/
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;
+ if( item ) emit currentChanged( index( item, 0 ) );
}
+ processInputItemUpdate( input_GetItem( p_input ) );
}
+
void PLModel::processInputItemUpdate( input_item_t *p_item )
{
if( !p_item || p_item->i_id <= 0 ) return;
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( PLItem *existing, nodeItem->children )
- if( existing->i_id == p_add->i_item ) return;
+ 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;
+ 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;
- beginInsertRows( index( nodeItem, 0 ), nodeItem->childCount(), nodeItem->childCount() );
- nodeItem->appendChild( newItem );
+ beginInsertRows( index( nodeItem, 0 ), pos, pos );
+ nodeItem->insertChild( newItem, pos );
endInsertRows();
- updateTreeItem( newItem );
- return;
-end:
- PL_UNLOCK;
- return;
+
+ if( newItem->p_input == THEMIM->currentInputItem() )
+ emit currentChanged( index( newItem, 0 ) );
}
void PLModel::rebuild()
{
- rebuild( NULL, false );
+ rebuild( NULL );
}
-void PLModel::rebuild( playlist_item_t *p_root, bool b_first )
+void PLModel::rebuild( playlist_item_t *p_root )
{
playlist_item_t* p_item;
- /* Remove callbacks before locking to avoid deadlocks
- The first time the callbacks are not present so
- don't try to delete them */
- if( !b_first )
- delCallbacks();
/* Invalidate cache */
i_cached_id = i_cached_input_id = -1;
assert( rootItem );
/* Recreate from root */
updateChildren( rootItem );
- if( (p_item = playlist_CurrentPlayingItem(p_playlist)) )
- currentItem = findByInput( rootItem, p_item->p_input->i_id );
- else
- currentItem = NULL;
PL_UNLOCK;
/* And signal the view */
reset();
- emit currentChanged( index( currentItem, 0 ) );
-
- addCallbacks();
+ if( p_root ) emit rootChanged();
}
void PLModel::takeItem( PLItem *item )
if( item->i_id == i_cached_id ) i_cached_id = -1;
i_cached_input_id = -1;
- if( currentItem == item || rootItem == item)
- {
- currentItem = NULL;
- emit currentChanged( QModelIndex() );
- }
-
- if(item == rootItem)
- rootItem = NULL;
-
if( item->parentItem ) {
int i = item->parentItem->children.indexOf( item );
beginRemoveRows( index( item->parentItem, 0), i, i );
}
else delete item;
+ if(item == rootItem)
+ {
+ rootItem = NULL;
+ rebuild( p_playlist->p_playing );
+ }
}
/* This function must be entered WITH the playlist lock */
/* This function must be entered WITH the playlist lock */
void PLModel::updateChildren( playlist_item_t *p_node, PLItem *root )
{
- playlist_item_t *p_item = playlist_CurrentPlayingItem(p_playlist);
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_item && newItem->p_input == p_item->p_input )
- {
- currentItem = newItem;
- emit currentChanged( index( currentItem, 0 ) );
- }
if( p_node->pp_children[i]->i_children != -1 )
updateChildren( p_node->pp_children[i], newItem );
}
{
if( !canEdit() ) return;
- for( int i = selected.size() -1 ; i >= 0; i-- )
+ while( !selected.isEmpty() )
{
- QModelIndex index = selected[i];
+ QModelIndex index = selected[0];
+ selected.removeAt( 0 );
+
if( index.column() != 0 ) continue;
+
PLItem *item = getItem( index );
- if( item )
- {
- if( item->children.size() )
- recurseDelete( item->children, &selected );
- doDeleteItem( item, &selected );
- }
- if( i > selected.size() ) i = selected.size();
+ 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 )
-{
- 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 */
- removeItem( item );
-}
-
/******* 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 )
{
+ msg_Dbg( p_intf, "Sorting by column %i, order %i", column, order );
+
int meta = columnToMeta( column );
if( meta == COLUMN_END ) return;
ORDER_NORMAL : ORDER_REVERSE );
}
}
+
+ i_cached_id = i_cached_input_id = -1;
+
if( count )
{
beginInsertRows( qIndex, 0, count - 1 );
PL_UNLOCK;
}
-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 )
{
int i_id = index.isValid() ? itemId( index ) : rootItem->i_id;
playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_id );
if( !p_item )
{
- PL_UNLOCK; return;
+ PL_UNLOCK;
+ return false;
}
+
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 ) :
- ( p_item->i_id );
+ ( rootItem->i_id );
i_popup_column = index.column();
- /* check whether we are in tree view */
- bool tree = false;
- 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;
- }
+
+ bool tree = var_InheritBool( p_intf, "playlist-tree" );
+
PL_UNLOCK;
current_selection = list;
- QMenu *menu = new QMenu;
+
+ QMenu menu;
if( i_popup_item > -1 )
{
- 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() ) );
- menu->addSeparator();
- QMenu *sort_menu = menu->addMenu( qtr( "Sort by ") +
+ 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 )
+ {
+ 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 if( THEPL->p_media_library &&
+ rootItem->i_id == THEPL->p_media_library->i_id )
+ {
+ 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() ) );
+ }
+ }
+ 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( tree )
- menu->addAction( qtr(I_POP_ADD), this, SLOT( popupAddNode() ) );
- if( i_popup_item > -1 )
+ if( !menu.isEmpty() )
{
- menu->addSeparator();
- menu->addAction( qtr( I_POP_EXPLORE ), this, SLOT( popupExplore() ) );
+ menu.exec( point ); return true;
}
- menu->popup( point );
+ else return false;
}
void PLModel::popupDel()
THEDP->streamingDialog( NULL, mrls[0] );
}
-#include <QUrl>
-#include <QFileInfo>
-#include <QDesktopServices>
void PLModel::popupExplore()
{
PL_LOCK;
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 ) )
+ if( !EMPTY_STR( psz_access ) && (
+ !strncasecmp( psz_access, "file", 4 ) ||
+ !strncasecmp( psz_access, "dire", 4 ) ))
{
- QFileInfo info( qfu( psz_meta ) );
+ QFileInfo info( qfu( psz_path ) );
QDesktopServices::openUrl(
QUrl::fromLocalFile( info.absolutePath() ) );
}
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;
{
sort( i_popup_parent, i_popup_column, Qt::DescendingOrder );
}
-/**********************************************************************
- * Playlist callbacks
- **********************************************************************/
-
-static int ItemDeleted( 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( ItemDelete_Type, nval.i_int );
- QApplication::postEvent( p_model, event );
- return VLC_SUCCESS;
-}
-
-static int ItemAppended( vlc_object_t *p_this, const char *psz_variable,
- vlc_value_t oval, vlc_value_t nval, void *param )
-{
- 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;
-}
-