Qt: cleanup and adjust to playlist changes

modules/gui/qt4/components/playlist/playlist_model.cpp

@@ -57,8 +57,6 @@ QIcon PLModel::icons[ITEM_TYPE_NUMBER];
 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 )
 {
@@ -178,13 +176,13 @@ bool PLModel::dropMimeData( const QMimeData *data, Qt::DropAction action,
         }
 
         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;
@@ -217,8 +215,7 @@ void PLModel::dropAppendCopy( QByteArray& data, PLItem *target )
             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;
@@ -563,10 +560,10 @@ bool PLModel::canEdit() const
   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
       )
     )
   );
@@ -898,14 +895,9 @@ void PLModel::popup( const QModelIndex & index, const QPoint &point, const QMode
         ( p_item->p_parent ? p_item->p_parent->i_id : -1 ) :
         ( p_item->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;

modules/gui/qt4/components/playlist/selector.cpp

@@ -173,7 +173,7 @@ void PLSelector::setSource( QTreeWidgetItem *item )
 
     if( i_type == SD_TYPE )
     {
-        pl_item = playlist_ChildSearchName( THEPL->p_root_category, qtu( item->data(0, LONGNAME_ROLE ).toString() ) );
+        pl_item = playlist_ChildSearchName( THEPL->p_root, qtu( item->data(0, LONGNAME_ROLE ).toString() ) );
         if( item->data( 0, SPECIAL_ROLE ).toInt() == IS_PODCAST )
         {
             if( pl_item && !sd_loaded )
@@ -241,11 +241,11 @@ PLSelItem *PLSelector::addPodcastItem( playlist_item_t *p_item )
 void PLSelector::createItems()
 {
     PLSelItem *pl = putPLData( addItem( PL_ITEM_TYPE, qtr( "Playlist" ), true ),
-                              THEPL->p_local_category );
+                              THEPL->p_playing );
     pl->treeItem()->setData( 0, SPECIAL_ROLE, QVariant( IS_PL ) );
 
     PLSelItem *ml = putPLData( addItem( PL_ITEM_TYPE, qtr( "Media Library" ), true ),
-                              THEPL->p_ml_category );
+                              THEPL->p_media_library );
     ml->treeItem()->setData( 0, SPECIAL_ROLE, QVariant( IS_ML ) );
 
     QTreeWidgetItem *msrc = addItem( CATEGORY_TYPE, qtr( "Media Sources" ),

modules/gui/qt4/components/playlist/standardpanel.cpp

@@ -162,17 +162,14 @@ void StandardPLPanel::handleExpansion( const QModelIndex& index )
 void StandardPLPanel::popupAdd()
 {
     QMenu popup;
-    if( currentRootId == THEPL->p_local_category->i_id ||
-        currentRootId == THEPL->p_local_onelevel->i_id )
+    if( currentRootId == THEPL->p_playing->i_id )
     {
         popup.addAction( qtr(I_PL_ADDF), THEDP, SLOT( simplePLAppendDialog()) );
         popup.addAction( qtr(I_PL_ADDDIR), THEDP, SLOT( PLAppendDir()) );
         popup.addAction( qtr(I_OP_ADVOP), THEDP, SLOT( PLAppendDialog()) );
     }
-    else if( ( THEPL->p_ml_category &&
-                currentRootId == THEPL->p_ml_category->i_id ) ||
-             ( THEPL->p_ml_onelevel &&
-                currentRootId == THEPL->p_ml_onelevel->i_id ) )
+    else if( THEPL->p_media_library &&
+                currentRootId == THEPL->p_media_library->i_id )
     {
         popup.addAction( qtr(I_PL_ADDF), THEDP, SLOT( simpleMLAppendDialog()) );
         popup.addAction( qtr(I_PL_ADDDIR), THEDP, SLOT( MLAppendDir() ) );
@@ -246,14 +243,12 @@ void StandardPLPanel::setRoot( playlist_item_t *p_item )
     locationBar->setIndex( QModelIndex() );
 
     /* enable/disable adding */
-    if( p_item == THEPL->p_local_category ||
-        p_item == THEPL->p_local_onelevel )
+    if( p_item == THEPL->p_playing )
     {
         addButton->setEnabled( true );
         addButton->setToolTip( qtr(I_PL_ADDPL) );
     }
-    else if( ( THEPL->p_ml_category && p_item == THEPL->p_ml_category) ||
-              ( THEPL->p_ml_onelevel && p_item == THEPL->p_ml_onelevel ) )
+    else if( THEPL->p_media_library && p_item == THEPL->p_media_library )
     {
         addButton->setEnabled( true );
         addButton->setToolTip( qtr(I_PL_ADDML) );

modules/gui/qt4/dialogs_provider.cpp

@@ -565,7 +565,7 @@ void DialogsProvider::saveAPlaylist()
         if( selected == qfu( vlc_gettext( types[i].filter ) ) )
         {
             playlist_Export( THEPL, qtu( toNativeSeparators( file ) ),
-                             THEPL->p_local_category, types[i].module );
+                             THEPL->p_playing, types[i].module );
             break;
         }
 }