Fix potential memleak.

[vlc] / modules / gui / qt4 / components / playlist / playlist_model.cpp

diff --git a/modules/gui/qt4/components/playlist/playlist_model.cpp b/modules/gui/qt4/components/playlist/playlist_model.cpp
index 2ec2458ec3f5c2a12023a72e59a3046266088755..e802ecff44cad17626f123fe0addcfcf3bef990d 100644 (file)
--- a/modules/gui/qt4/components/playlist/playlist_model.cpp
+++ b/modules/gui/qt4/components/playlist/playlist_model.cpp
@@ -30,7 +30,7 @@
 #include "dialogs/mediainfo.hpp"
 #include <vlc_intf_strings.h>
 
-#include "pixmaps/type_unknown.xpm"
+#include "pixmaps/types/type_unknown.xpm"
 
 #include <assert.h>
 #include <QIcon>
@@ -83,14 +83,14 @@ PLModel::PLModel( playlist_t *_p_playlist,  /* THEPL */
     /* Icons initialization */
 #define ADD_ICON(type, x) icons[ITEM_TYPE_##type] = QIcon( QPixmap( x ) )
     ADD_ICON( UNKNOWN , type_unknown_xpm );
-    ADD_ICON( FILE, ":/pixmaps/type_file.png" );
-    ADD_ICON( DIRECTORY, ":/pixmaps/type_directory.png" );
-    ADD_ICON( DISC, ":/pixmaps/disc_16px.png" );
-    ADD_ICON( CDDA, ":/pixmaps/cdda_16px.png" );
-    ADD_ICON( CARD, ":/pixmaps/capture-card_16px.png" );
-    ADD_ICON( NET, ":/pixmaps/type_net.png" );
-    ADD_ICON( PLAYLIST, ":/pixmaps/type_playlist.png" );
-    ADD_ICON( NODE, ":/pixmaps/type_node.png" );
+    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" );
 #undef ADD_ICON
 
     rebuild( p_root );
@@ -98,8 +98,7 @@ PLModel::PLModel( playlist_t *_p_playlist,  /* THEPL */
 
 PLModel::~PLModel()
 {
-    QSettings settings( "vlc", "vlc-qt-interface" );
-    settings.setValue( "qt-pl-showflags", rootItem->i_showflags );
+    getSettings()->setValue( "qt-pl-showflags", rootItem->i_showflags );
     delCallbacks();
     delete rootItem;
 }
@@ -168,9 +167,9 @@ bool PLModel::dropMimeData( const QMimeData *data, Qt::DropAction action,
             PL_LOCK;
             playlist_item_t *p_target =
                         playlist_ItemGetById( p_playlist, targetItem->i_id,
-                                              true );
+                                              pl_Locked );
             playlist_item_t *p_src = playlist_ItemGetById( p_playlist, srcId,
-                                                           true );
+                                                           pl_Locked );
 
             if( !p_target || !p_src )
             {
@@ -183,7 +182,7 @@ bool PLModel::dropMimeData( const QMimeData *data, Qt::DropAction action,
                 assert( parentItem );
                 playlist_item_t *p_parent =
                          playlist_ItemGetById( p_playlist, parentItem->i_id,
-                                               true );
+                                               pl_Locked );
                 if( !p_parent )
                 {
                     PL_UNLOCK;
@@ -260,7 +259,7 @@ void PLModel::activateItem( const QModelIndex &index )
     assert( item );
     PL_LOCK;
     playlist_item_t *p_item = playlist_ItemGetById( p_playlist, item->i_id,
-                                                    true);
+                                                    pl_Locked );
     activateItem( p_item );
     PL_UNLOCK;
 }
@@ -276,7 +275,7 @@ void PLModel::activateItem( playlist_item_t *p_item )
         p_parent = p_parent->p_parent;
     }
     if( p_parent )
-        playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, true,
+        playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Locked,
                           p_parent, p_item );
 }
 
@@ -523,7 +522,11 @@ void PLModel::ProcessInputItemUpdate( int i_input_id )
     if( i_input_id <= 0 ) return;
     PLItem *item = FindByInput( rootItem, i_input_id );
     if( item )
+    {
+        QPL_LOCK;
         UpdateTreeItem( item, true );
+        QPL_UNLOCK;
+    }
 }
 
 void PLModel::ProcessItemRemoval( int i_id )
@@ -544,7 +547,7 @@ void PLModel::ProcessItemAppend( playlist_add_t *p_add )
     PL_LOCK;
     if( !nodeItem ) goto end;
 
-    p_item = playlist_ItemGetById( p_playlist, p_add->i_item, true );
+    p_item = playlist_ItemGetById( p_playlist, p_add->i_item, pl_Locked );
     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 )
@@ -587,7 +590,7 @@ void PLModel::rebuild( playlist_item_t *p_root )
     if( p_root )
     {
         delete rootItem;
-        rootItem = new PLItem( p_root, NULL, this );
+        rootItem = new PLItem( p_root, getSettings(), this );
     }
     assert( rootItem );
     /* Recreate from root */
@@ -613,7 +616,7 @@ void PLModel::rebuild( playlist_item_t *p_root )
 void PLModel::UpdateNodeChildren( PLItem *root )
 {
     playlist_item_t *p_node = playlist_ItemGetById( p_playlist, root->i_id,
-                                                    true );
+                                                    pl_Locked );
     UpdateNodeChildren( p_node, root );
 }
 
@@ -635,7 +638,7 @@ void PLModel::UpdateNodeChildren( playlist_item_t *p_node, PLItem *root )
 void PLModel::UpdateTreeItem( PLItem *item, bool signal, bool force )
 {
     playlist_item_t *p_item = playlist_ItemGetById( p_playlist, item->i_id,
-                                                    true );
+                                                    pl_Locked );
     UpdateTreeItem( p_item, item, signal, force );
 }
 
@@ -695,13 +698,13 @@ void PLModel::doDeleteItem( PLItem *item, QModelIndexList *fullList )
 
     PL_LOCK;
     playlist_item_t *p_item = playlist_ItemGetById( p_playlist, item->i_id,
-                                                    true );
+                                                    pl_Locked );
     if( !p_item )
     {
         PL_UNLOCK; return;
     }
     if( p_item->i_children == -1 )
-        playlist_DeleteFromInput( p_playlist, item->i_input_id, true );
+        playlist_DeleteFromInput( p_playlist, item->i_input_id, pl_Locked );
     else
         playlist_NodeDelete( p_playlist, p_item, true, false );
     /* And finally, remove it from the tree */
@@ -752,7 +755,7 @@ next:
     {
         playlist_item_t *p_root = playlist_ItemGetById( p_playlist,
                                                         rootItem->i_id,
-                                                        true );
+                                                        pl_Locked );
         if( p_root )
         {
             playlist_RecursiveNodeSort( p_playlist, p_root,
@@ -773,7 +776,7 @@ void PLModel::search( QString search_text )
     {
         playlist_item_t *p_root = playlist_ItemGetById( p_playlist,
                                                         rootItem->i_id,
-                                                        true );
+                                                        pl_Locked );
         assert( p_root );
         char *psz_name = search_text.toUtf8().data();
         playlist_LiveSearchUpdate( p_playlist , p_root, psz_name );
@@ -788,7 +791,7 @@ 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 ), true );
+                                                    itemId( index ), pl_Locked );
     if( p_item )
     {
         i_popup_item = p_item->i_id;
@@ -866,7 +869,8 @@ void PLModel::popupPlay()
     PL_LOCK;
     {
         playlist_item_t *p_item = playlist_ItemGetById( p_playlist,
-                                                        i_popup_item,true );
+                                                        i_popup_item,
+                                                        pl_Locked );
         activateItem( p_item );
     }
     PL_UNLOCK;
@@ -876,7 +880,7 @@ void PLModel::popupInfo()
 {
     playlist_item_t *p_item = playlist_ItemGetById( p_playlist,
                                                     i_popup_item,
-                                                    false );
+                                                    pl_Unlocked );
     if( p_item )
     {
         MediaInfoDialog *mid = new MediaInfoDialog( p_intf, p_item->p_input );