X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fplaylist_model.cpp;h=b0bbdbabdd9902fe4dd55f5eda1460e8724e7f33;hb=9cd8ee7b4ee1f29fc1c0d584be813b4130492246;hp=8ecde4d9c0c1da2cbc5e763600ed3b4f7a57ca2e;hpb=5b6e15db433474a58b363715a71cc973f8ebdac6;p=vlc

diff --git a/modules/gui/qt4/playlist_model.cpp b/modules/gui/qt4/playlist_model.cpp
index 8ecde4d9c0..b0bbdbabdd 100644
--- a/modules/gui/qt4/playlist_model.cpp
+++ b/modules/gui/qt4/playlist_model.cpp
@@ -20,11 +20,30 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+#define PLI_NAME( p ) p ? p->p_input->psz_name : "null"
 
-#include "qt4.hpp"
+#include <assert.h>
+#include <QIcon>
+#include <QFont>
+#include <QMenu>
 #include <QApplication>
+
+#include "qt4.hpp"
 #include "playlist_model.hpp"
-#include <assert.h>
+#include <vlc_intf_strings.h>
+
+#include "pixmaps/type_unknown.xpm"
+#include "pixmaps/type_afile.xpm"
+#include "pixmaps/type_vfile.xpm"
+#include "pixmaps/type_net.xpm"
+#include "pixmaps/type_card.xpm"
+#include "pixmaps/type_disc.xpm"
+#include "pixmaps/type_cdda.xpm"
+#include "pixmaps/type_directory.xpm"
+#include "pixmaps/type_playlist.xpm"
+#include "pixmaps/type_node.xpm"
+
+QIcon PLModel::icons[ITEM_TYPE_NUMBER];
 
 static int PlaylistChanged( vlc_object_t *, const char *,
                             vlc_value_t, vlc_value_t, void * );
@@ -56,6 +75,7 @@ void PLItem::init( int _i_id, int _i_input_id, PLItem *parent, PLModel *m)
     strings.append( "" );
     strings.append( "" );
     strings.append( "" );
+    strings.append( "" );
 }
 
 PLItem::PLItem( int _i_id, int _i_input_id, PLItem *parent, PLModel *m)
@@ -71,6 +91,7 @@ PLItem::PLItem( playlist_item_t * p_item, PLItem *parent, PLModel *m )
 PLItem::~PLItem()
 {
     qDeleteAll(children);
+    children.clear();
 }
 
 void PLItem::insertChild( PLItem *item, int i_pos, bool signal )
@@ -78,26 +99,46 @@ void PLItem::insertChild( PLItem *item, int i_pos, bool signal )
     assert( model );
     if( signal )
         model->beginInsertRows( model->index( this , 0 ), i_pos, i_pos );
-    children.append( item );
+    children.insert( i_pos, item );
     if( signal )
         model->endInsertRows();
 }
 
+void PLItem::remove( PLItem *removed )
+{
+    assert( model && parentItem );
+    int i_index = parentItem->children.indexOf( removed );
+    model->beginRemoveRows( model->index( parentItem, 0 ), i_index, i_index );
+    parentItem->children.removeAt( i_index );
+    model->endRemoveRows();
+}
+
 int PLItem::row() const
 {
-    if (parentItem)
+    if( parentItem )
         return parentItem->children.indexOf(const_cast<PLItem*>(this));
     return 0;
 }
 
-void PLItem::update( playlist_item_t *p_item )
+void PLItem::update( playlist_item_t *p_item, bool iscurrent )
 {
+    char psz_duration[MSTRTIME_MAX_SIZE];
     assert( p_item->p_input->i_id == i_input_id );
     strings[0] = QString::fromUtf8( p_item->p_input->psz_name );
     if( p_item->p_input->p_meta )
     {
         strings[1] = QString::fromUtf8( p_item->p_input->p_meta->psz_artist );
     }
+    secstotimestr( psz_duration, p_item->p_input->i_duration / 1000000 );
+    strings[2] = QString( psz_duration );
+    type = p_item->p_input->i_type;
+    current = iscurrent;
+    if( current && p_item->p_input->p_meta &&
+        p_item->p_input->p_meta->psz_arturl &&
+        !strncmp( p_item->p_input->p_meta->psz_arturl, "file://", 7 ) )
+    {
+        model->sendArt( qfu( p_item->p_input->p_meta->psz_arturl ) );
+    }
 }
 
 /*************************************************************************
@@ -115,19 +156,25 @@ PLModel::PLModel( playlist_t *_p_playlist,
     b_need_update     = false;
     i_cached_id       = -1;
     i_cached_input_id = -1;
+    i_popup_item = i_popup_parent = -1;
+
+#define ADD_ICON(type, x) icons[ITEM_TYPE_##type] = QIcon( QPixmap( type_##x##_xpm ) );
+    ADD_ICON( UNKNOWN , unknown );
+    ADD_ICON( AFILE,afile );
+    ADD_ICON( VFILE, vfile );
+    ADD_ICON( DIRECTORY, directory );
+    ADD_ICON( DISC, disc );
+    ADD_ICON( CDDA, cdda );
+    ADD_ICON( CARD, card );
+    ADD_ICON( NET, net );
+    ADD_ICON( PLAYLIST, playlist );
+    ADD_ICON( NODE, node );
 
     rootItem = NULL;
-    rebuildRoot( p_root );
     addCallbacks();
+    rebuild( p_root );
 }
 
-void PLModel::rebuildRoot( playlist_item_t *p_root )
-{
-    if( rootItem ) delete rootItem;
-    rootItem = new PLItem( p_root, NULL, this );
-    rootItem->strings[0] = qtr("Name");
-    rootItem->strings[1] = qtr("Artist");
-}
 
 PLModel::~PLModel()
 {
@@ -135,6 +182,127 @@ PLModel::~PLModel()
     delete rootItem;
 }
 
+Qt::DropActions PLModel::supportedDropActions() const
+{
+    return Qt::CopyAction;
+}
+
+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;
+}
+
+QStringList PLModel::mimeTypes() const
+{
+    QStringList types;
+    types << "vlc/playlist-item-id";
+    return types;
+}
+
+QMimeData *PLModel::mimeData(const QModelIndexList &indexes) const
+{
+    QMimeData *mimeData = new QMimeData();
+    QByteArray encodedData;
+    QDataStream stream(&encodedData, QIODevice::WriteOnly);
+
+    foreach (QModelIndex index, indexes) {
+        if (index.isValid() && index.column() == 0 )
+            stream << itemId(index);
+    }
+    mimeData->setData("vlc/playlist-item-id", encodedData);
+    return mimeData;
+}
+
+bool PLModel::dropMimeData(const QMimeData *data, Qt::DropAction action,
+                           int row, int column, const QModelIndex &target)
+{
+    if ( data->hasFormat("vlc/playlist-item-id") )
+    {
+        if (action == Qt::IgnoreAction)
+            return true;
+
+        PLItem *targetItem;
+        if( target.isValid() )
+            targetItem = static_cast<PLItem*>( target.internalPointer() );
+        else
+            targetItem = rootItem;
+
+        QByteArray encodedData = data->data("vlc/playlist-item-id");
+        QDataStream stream(&encodedData, QIODevice::ReadOnly);
+
+        PLItem *newParentItem;
+        while (!stream.atEnd())
+        {
+            int i;
+            int srcId;
+            stream >> srcId;
+
+            PL_LOCK;
+            playlist_item_t *p_target =
+                        playlist_ItemGetById( p_playlist, targetItem->i_id );
+            playlist_item_t *p_src = playlist_ItemGetById( p_playlist, srcId );
+
+            if( !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;
+                playlist_TreeMove( p_playlist, p_src, p_parent, i );
+                newParentItem = parentItem;
+            }
+            else
+            {
+                /* \todo: if we drop on a top-level node, use copy instead ? */
+                playlist_TreeMove( p_playlist, p_src, p_target, 0 );
+                i = 0;
+                newParentItem = targetItem;
+            }
+            /* Remove from source */
+            PLItem *srcItem = FindById( rootItem, p_src->i_id );
+            // We dropped on the source selector. Ask the dialog to forward
+            // to the main view
+            if( !srcItem )
+            {
+                emit shouldRemove( p_src->i_id );
+            }
+            else
+                srcItem->remove( srcItem );
+
+            /* Display at new destination */
+            PLItem *newItem = new PLItem( p_src, newParentItem, this );
+            newParentItem->insertChild( newItem, i, true );
+            UpdateTreeItem( p_src, newItem, true );
+            if( p_src->i_children != -1 )
+                UpdateNodeChildren( newItem );
+            PL_UNLOCK;
+        }
+    }
+    return true;
+}
+
+void PLModel::removeItem( int i_id )
+{
+    PLItem *item = FindById( rootItem,i_id );
+    if( item ) item->remove( item );
+}
+
 void PLModel::addCallbacks()
 {
     /* Some global changes happened -> Rebuild all */
@@ -163,6 +331,13 @@ void PLModel::activateItem( const QModelIndex &index )
     assert( item );
     PL_LOCK;
     playlist_item_t *p_item = playlist_ItemGetById( p_playlist, item->i_id );
+    activateItem( p_item );
+    PL_UNLOCK;
+}
+/* Must be entered with lock */
+void PLModel::activateItem( playlist_item_t *p_item )
+{
+    if( !p_item ) return;
     playlist_item_t *p_parent = p_item;
     while( p_parent )
     {
@@ -170,30 +345,43 @@ void PLModel::activateItem( const QModelIndex &index )
         p_parent = p_parent->p_parent;
     }
     if( p_parent )
-    {
         playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, p_parent, p_item );
-    }
-    PL_UNLOCK;
 }
 
 /****************** Base model mandatory implementations *****************/
 QVariant PLModel::data(const QModelIndex &index, int role) const
 {
-    if ( !index.isValid() || role != Qt::DisplayRole ) return QVariant();
+    if(!index.isValid() ) return QVariant();
     PLItem *item = static_cast<PLItem*>(index.internalPointer());
-    return QVariant( item->columnString( index.column() ) );
+    if( role == Qt::DisplayRole )
+    {
+        return QVariant( item->columnString( index.column() ) );
+    }
+    else if( role == Qt::DecorationRole && index.column() == 0  )
+    {
+        if( item->type >= 0 )
+            return QVariant( PLModel::icons[item->type] );
+    }
+    else if( role == Qt::FontRole )
+    {
+        if( item->current == true )
+        {
+            QFont f; f.setBold( true ); return QVariant( f );
+        }
+    }
+    return QVariant();
 }
 
-int PLModel::itemId( const QModelIndex &index ) const
+bool PLModel::isCurrent( const QModelIndex &index )
 {
     assert( index.isValid() );
-    return static_cast<PLItem*>(index.internalPointer())->i_id;
+    return static_cast<PLItem*>(index.internalPointer())->current;
 }
 
-Qt::ItemFlags PLModel::flags(const QModelIndex &index) const
+int PLModel::itemId( const QModelIndex &index ) const
 {
-    if( !index.isValid() ) return Qt::ItemIsEnabled;
-    return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
+    assert( index.isValid() );
+    return static_cast<PLItem*>(index.internalPointer())->i_id;
 }
 
 QVariant PLModel::headerData( int section, Qt::Orientation orientation,
@@ -226,26 +414,33 @@ QModelIndex PLModel::index( PLItem *item, int column ) const
     if( !item ) return QModelIndex();
     const PLItem *parent = item->parent();
     if( parent )
-        return createIndex( parent->children.lastIndexOf( item ), column, item );
+        return createIndex( parent->children.lastIndexOf( item ),
+                            column, item );
     return QModelIndex();
 }
 
 QModelIndex PLModel::parent(const QModelIndex &index) const
 {
-    if (!index.isValid())  return QModelIndex();
+    if( !index.isValid() ) return QModelIndex();
 
     PLItem *childItem = static_cast<PLItem*>(index.internalPointer());
+    if( !childItem ) { msg_Err( p_playlist, "NULL CHILD \n" ); return QModelIndex(); }
     PLItem *parentItem = childItem->parent();
-
-    if (parentItem == rootItem) return QModelIndex();
-
-    return createIndex(parentItem->row(), 0, parentItem);
+    if( !parentItem || parentItem == rootItem ) return QModelIndex();
+    if( ! parentItem->parentItem )
+    {
+        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;
 }
 
 int PLModel::columnCount( const QModelIndex &i) const
 {
     if( i_depth == 1 ) return 1;
-    return 2;
+    return 3;
 }
 
 int PLModel::childrenCount(const QModelIndex &parent) const
@@ -265,6 +460,39 @@ int PLModel::rowCount(const QModelIndex &parent) const
     return parentItem->childCount();
 }
 
+/************************* General playlist status ***********************/
+
+bool PLModel::hasRandom()
+{
+    if( var_GetBool( p_playlist, "random" ) ) return true;
+    return false;
+}
+bool PLModel::hasRepeat()
+{
+    if( var_GetBool( p_playlist, "repeat" ) ) return true;
+    return false;
+}
+bool PLModel::hasLoop()
+{
+    if( var_GetBool( p_playlist, "loop" ) ) return true;
+    return false;
+}
+void PLModel::setLoop( bool on )
+{
+    var_SetBool( p_playlist, "loop", on ? VLC_TRUE:VLC_FALSE );
+    config_PutInt( p_playlist, "loop", on ? 1: 0 );
+}
+void PLModel::setRepeat( bool on )
+{
+    var_SetBool( p_playlist, "repeat", on ? VLC_TRUE:VLC_FALSE );
+    config_PutInt( p_playlist, "repeat", on ? 1: 0 );
+}
+void PLModel::setRandom( bool on )
+{
+    var_SetBool( p_playlist, "random", on ? VLC_TRUE:VLC_FALSE );
+    config_PutInt( p_playlist, "random", on ? 1: 0 );
+}
+
 /************************* Lookups *****************************/
 
 PLItem *PLModel::FindById( PLItem *root, int i_id )
@@ -277,8 +505,8 @@ PLItem *PLModel::FindByInput( PLItem *root, int i_id )
     return FindInner( root, i_id, true );
 }
 
-#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;
+#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 )
 {
@@ -318,13 +546,9 @@ PLItem * PLModel::FindInner( PLItem *root, int i_id, bool b_input )
             if( childFound )
             {
                 if( b_input )
-                {
-                    ICACHE( i_id, childFound );
-                }
+                    ICACHE( i_id, childFound )
                 else
-                {
-                    CACHE( i_id, childFound );
-                }
+                    CACHE( i_id, childFound )
                 return childFound;
             }
         }
@@ -341,7 +565,7 @@ void PLModel::customEvent( QEvent *event )
 {
     int type = event->type();
     if( type != ItemUpdate_Type && type != ItemAppend_Type &&
-        type != ItemDelete_Type )
+        type != ItemDelete_Type && type != PLUpdate_Type )
         return;
 
     PLEvent *ple = static_cast<PLEvent *>(event);
@@ -350,8 +574,10 @@ void PLModel::customEvent( QEvent *event )
         ProcessInputItemUpdate( ple->i_id );
     else if( type == ItemAppend_Type )
         ProcessItemAppend( ple->p_add );
-    else
+    else if( type == ItemDelete_Type )
         ProcessItemRemoval( ple->i_id );
+    else
+        rebuild();
 }
 
 /**** Events processing ****/
@@ -368,8 +594,9 @@ 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;
-
-    /// \todo
+    PLItem *item = FindById( rootItem, i_id );
+    if( item )
+        item->remove( item );
 }
 
 void PLModel::ProcessItemAppend( playlist_add_t *p_add )
@@ -380,60 +607,87 @@ void PLModel::ProcessItemAppend( playlist_add_t *p_add )
     if( b_need_update ) return;
 
     PLItem *nodeItem = FindById( rootItem, p_add->i_node );
+    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;
-
-    fprintf( stderr, "Appending item %s - parent %i (root %i)\n",
-                    p_item->p_input->psz_name, p_item->p_parent->i_id,
-                    rootItem->i_id );
     if( i_depth == 1 && p_item->p_parent &&
                         p_item->p_parent->i_id != rootItem->i_id )
         goto end;
 
-    fprintf( stderr, "Still continuing\n" );
-
     newItem = new PLItem( p_item, nodeItem, this );
     nodeItem->appendChild( newItem );
-    fprintf( stderr, "duh\n" );
     UpdateTreeItem( p_item, newItem, true );
 end:
+    PL_UNLOCK;
     return;
 }
 
-void PLModel::Rebuild()
+
+void PLModel::rebuild()
+{
+    rebuild( NULL );
+}
+
+void PLModel::rebuild( playlist_item_t *p_root )
 {
     /* Remove callbacks before locking to avoid deadlocks */
     delCallbacks();
-    PL_LOCK;
-
     /* Invalidate cache */
     i_cached_id = i_cached_input_id = -1;
 
+    PL_LOCK;
     /* Clear the tree */
-    qDeleteAll( rootItem->children );
-
+    if( rootItem )
+    {
+        beginRemoveRows( index( rootItem, 0 ), 0,
+                         rootItem->children.size() -1 );
+        qDeleteAll( rootItem->children );
+        rootItem->children.clear();
+        endRemoveRows();
+    }
+    if( p_root )
+    {
+        //if( rootItem ) delete rootItem;
+        rootItem = new PLItem( p_root, NULL, this );
+        rootItem->strings[0] = qtr("Name");
+        rootItem->strings[1] = qtr("Artist");
+        rootItem->strings[2] = qtr("Duration");
+    }
+    assert( rootItem );
     /* Recreate from root */
     UpdateNodeChildren( rootItem );
+    if( p_playlist->status.p_item )
+    {
+        PLItem *currentItem = FindByInput( rootItem,
+                                     p_playlist->status.p_item->p_input->i_id );
+        if( currentItem )
+        {
+            UpdateTreeItem( p_playlist->status.p_item, currentItem,
+                            true, false );
+        }
+    }
+    PL_UNLOCK;
 
     /* And signal the view */
     emit layoutChanged();
-
     addCallbacks();
-    PL_UNLOCK;
 }
 
+/* This function must be entered WITH the playlist lock */
 void PLModel::UpdateNodeChildren( PLItem *root )
 {
     playlist_item_t *p_node = playlist_ItemGetById( p_playlist, root->i_id );
     UpdateNodeChildren( p_node, root );
 }
 
+/* This function must be entered WITH the playlist lock */
 void PLModel::UpdateNodeChildren( 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, this );
         root->appendChild( newItem, false );
         UpdateTreeItem( newItem, false, true );
@@ -442,24 +696,178 @@ void PLModel::UpdateNodeChildren( playlist_item_t *p_node, PLItem *root )
     }
 }
 
+/* This function must be entered WITH the playlist lock */
 void PLModel::UpdateTreeItem( PLItem *item, bool signal, bool force )
 {
     playlist_item_t *p_item = playlist_ItemGetById( p_playlist, item->i_id );
     UpdateTreeItem( p_item, item, signal, force );
 }
 
+/* This function must be entered WITH the playlist lock */
 void PLModel::UpdateTreeItem( playlist_item_t *p_item, PLItem *item,
                               bool signal, bool force )
 {
     if( !force && i_depth == 1 && p_item->p_parent &&
-                                 p_item->p_parent->i_id == rootItem->i_id )
+                                 p_item->p_parent->i_id != rootItem->i_id )
         return;
-    item->update( p_item );
+    item->update( p_item, p_item == p_playlist->status.p_item );
     if( signal )
-    {    // emit
+        emit dataChanged( index( item, 0 ) , index( item, 1 ) );
+}
+
+/************************* Actions ******************************/
+
+void PLModel::sendArt( QString url )
+{
+    QString arturl = url.replace( "file://",QString("" ) );
+    emit artSet( arturl );
+}
+
+/**
+ * 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?
+ */
+void PLModel::doDelete( QModelIndexList selected )
+{
+    for( int i = selected.size() -1 ; i >= 0; i-- )
+    {
+        QModelIndex index = selected[i];
+        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 );
+        }
+    }
+}
+
+void PLModel::recurseDelete( QList<PLItem*> children, QModelIndexList *fullList)
+{
+    for( int i = children.size() - 1; i >= 0 ; i-- )
+    {
+        PLItem *item = children[i];
+        if( item->children.size() )
+            recurseDelete( item->children, fullList );
+        doDeleteItem( item, fullList );
     }
 }
 
+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_DeleteAllFromInput( p_playlist, item->i_input_id );
+    else
+        playlist_NodeDelete( p_playlist, p_item, VLC_TRUE, VLC_FALSE );
+    /* And finally, remove it from the tree */
+    item->remove( item );
+    PL_UNLOCK;
+}
+
+/******* Volume III: Sorting and searching ********/
+void PLModel::sort( int column, Qt::SortOrder order )
+{
+    PL_LOCK;
+    playlist_item_t *p_root = playlist_ItemGetById( p_playlist, rootItem->i_id );
+    int i_mode;
+    switch( column )
+    {
+    case 0: i_mode = SORT_TITLE_NODES_FIRST;break;
+    case 1: i_mode = SORT_ARTIST;break;
+    case 2: i_mode = SORT_DURATION; break;
+    default: i_mode = SORT_TITLE_NODES_FIRST; break;
+    }
+    if( p_root )
+        playlist_RecursiveNodeSort( p_playlist, p_root, i_mode,
+                                    order == Qt::AscendingOrder ? ORDER_NORMAL :
+                                                            ORDER_REVERSE );
+    PL_UNLOCK
+    rebuild();
+}
+
+void PLModel::search( QString search_text )
+{
+    /** \todo Fire the search with a small delay ? */
+    PL_LOCK;
+    playlist_item_t *p_root = playlist_ItemGetById( p_playlist,rootItem->i_id );
+    assert( p_root );
+    char *psz_name = search_text.toUtf8().data();
+    playlist_LiveSearchUpdate( p_playlist , p_root, psz_name );
+    PL_UNLOCK;
+    rebuild();
+}
+
+/*********** Popup *********/
+void PLModel::popup( QModelIndex & index, QPoint &point, QModelIndexList list )
+{
+    assert( index.isValid() );
+    PL_LOCK;
+    playlist_item_t *p_item = playlist_ItemGetById( p_playlist,
+                                                    itemId( index ) );
+    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( qfu(I_POP_PLAY), this, SLOT( popupPlay() ) );
+        menu->addAction( qfu(I_POP_DEL), this, SLOT( popupDel() ) );
+        menu->addSeparator();
+        menu->addAction( qfu(I_POP_STREAM), this, SLOT( popupStream() ) );
+        menu->addAction( qfu(I_POP_SAVE), this, SLOT( popupSave() ) );
+        menu->addSeparator();
+        menu->addAction( qfu(I_POP_INFO), this, SLOT( popupInfo() ) );
+        if( p_item->i_children > -1 )
+        {
+            menu->addSeparator();
+            menu->addAction( qfu(I_POP_SORT), this, SLOT( popupSort() ) );
+            menu->addAction( qfu(I_POP_ADD), this, SLOT( popupAdd() ) );
+        }
+        menu->popup( point );
+    }
+    else
+        PL_UNLOCK;
+}
+
+void PLModel::popupDel()
+{
+    doDelete( current_selection );
+}
+void PLModel::popupPlay()
+{
+    PL_LOCK;
+    playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_popup_item );
+    activateItem( p_item );
+    PL_UNLOCK;
+}
+
+void PLModel::popupInfo()
+{
+    fprintf( stderr, "Popup Info is NOT implemented\n" );
+}
+
+void PLModel::popupStream()
+{
+    fprintf( stderr, "Stream not implemented\n" );
+}
+void PLModel::popupSave()
+{
+    fprintf( stderr, "Save not implemented\n" );
+}
+
 /**********************************************************************
  * Playlist callbacks
  **********************************************************************/
@@ -467,7 +875,8 @@ static int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable,
                             vlc_value_t oval, vlc_value_t nval, void *param )
 {
     PLModel *p_model = (PLModel *) param;
-    p_model->b_need_update = VLC_TRUE;
+    PLEvent *event = new PLEvent( PLUpdate_Type, 0 );
+    QApplication::postEvent( p_model, static_cast<QEvent*>(event) );
     return VLC_SUCCESS;
 }
 
@@ -509,11 +918,10 @@ static int ItemAppended( vlc_object_t *p_this, const char *psz_variable,
 
     if( ++p_model->i_items_to_append >= 50 )
     {
-        p_model->b_need_update = VLC_TRUE;
-        return VLC_SUCCESS;
+//        p_model->b_need_update = VLC_TRUE;
+//        return VLC_SUCCESS;
     }
     PLEvent *event = new PLEvent(  p_add );
     QApplication::postEvent( p_model, static_cast<QEvent*>(event) );
-    fprintf( stderr, "Posted event to model\n" );
     return VLC_SUCCESS;
 }