Fix a refcount issue

Start using media library

diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index c4c92e7e3daaf6d71b57d2e23ca2f575fc4c771d..1b473c7ce3caca5df04d66531306bca0fa961645 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.cpp
+++ b/modules/gui/qt4/dialogs_provider.cpp
@@ -101,6 +101,12 @@ void DialogsProvider::openDialog()
 {
     openDialog( 0 );
 }
+void DialogsProvider::PLAppendDialog()
+{
+}
+void DialogsProvider::MLAppendDialog()
+{
+}
 void DialogsProvider::openDialog( int i_dialog )
 {
 }
@@ -129,7 +135,7 @@ void DialogsProvider::doInteraction( intf_dialog_args_t *p_arg )
         break;
     case INTERACT_DESTROY:
         qdialog = (InteractionDialog*)(p_dialog->p_private);
-        delete qdialog; 
+        delete qdialog;
         p_dialog->i_status = DESTROYED_DIALOG;
         break;
     }
@@ -171,7 +177,7 @@ void DialogsProvider::menuUpdateAction( QObject *data )
     f->doFunc( p_intf );
 }
 
-void DialogsProvider::simpleAppendDialog()
+void DialogsProvider::simplePLAppendDialog()
 {
     QStringList files = showSimpleOpen();
     QString file;
@@ -183,6 +189,18 @@ void DialogsProvider::simpleAppendDialog()
     }
 }
 
+void DialogsProvider::simpleMLAppendDialog()
+{
+    QStringList files = showSimpleOpen();
+    QString file;
+    foreach( file, files )
+    {
+        const char * psz_utf8 = file.toUtf8().data();
+        playlist_MLAdd( THEPL, psz_utf8, psz_utf8,
+                        PLAYLIST_APPEND | PLAYLIST_PREPARSE, PLAYLIST_END );
+    }
+}
+
 void DialogsProvider::simpleOpenDialog()
 {
     QStringList files = showSimpleOpen();

diff --git a/modules/gui/qt4/dialogs_provider.hpp b/modules/gui/qt4/dialogs_provider.hpp
index 7488278468abe738185dce6feb1cf02778d750a4..ed476013c917c73c0fb93390991bda958b1bfa0c 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.hpp
+++ b/modules/gui/qt4/dialogs_provider.hpp
@@ -70,9 +70,12 @@ public slots:
     void streaminfoDialog();
     void prefsDialog();
     void messagesDialog();
-    void simpleAppendDialog();
+    void simplePLAppendDialog();
+    void simpleMLAppendDialog();
     void simpleOpenDialog();
     void openDialog();
+    void PLAppendDialog();
+    void MLAppendDialog();
     void openDialog( int );
     void popupMenu( int );
     void doInteraction( intf_dialog_args_t * );

diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index 411642e4c377c12a1289081b82ad5d728cea798c..34ab07b5a775b6285e822061fce250e736d67f33 100644 (file)
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -156,6 +156,11 @@ MainInputManager::MainInputManager( intf_thread_t *_p_intf ) : QObject(NULL),
              im, SLOT( setInput( input_thread_t * ) ) );
 }
 
+MainInputManager::~MainInputManager()
+{
+    if( p_input ) vlc_object_release( p_input );
+}
+
 void MainInputManager::updateInput()
 {
     vlc_mutex_lock( &p_intf->change_lock );

diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp
index 6505d5190ec9a0e53dd19d708e1a7c6603c210f5..c2f3a77478c7caa4c2a2bf04975e7f543a09ad5c 100644 (file)
--- a/modules/gui/qt4/input_manager.hpp
+++ b/modules/gui/qt4/input_manager.hpp
@@ -62,7 +62,11 @@ public:
             instance = new MainInputManager( _p_intf );
         return instance;
     }
-
+    static void killInstance()
+    {
+        if( instance ) delete instance;
+    }
+    virtual ~MainInputManager();
     input_thread_t *getInput() { return p_input; };
     InputManager *getIM() { return im; };
 

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 363c86c740ec7b5deaa276f71b9366ac04e51393..92cb588b6a17f94f6503513837e16d8eeac6bfbf 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -132,9 +132,25 @@ void QVLCMenu::createPlMenuBar( QMenuBar *bar, intf_thread_t *p_intf )
 {
     QMenu *manageMenu = new QMenu();
     manageMenu->setTitle( qtr("Operations") );
-    manageMenu->addAction( "Quick &Add File...", THEDP,
-                           SLOT( simpleAppendDialog() ) );
+
+    QMenu *subPlaylist = new QMenu();
+    subPlaylist->setTitle( qtr("Add to current playlist") );
+    subPlaylist->addAction( "&File...", THEDP,
+                           SLOT( simplePLAppendDialog() ) );
+    subPlaylist->addAction( "&Advanced add...", THEDP,
+                           SLOT( PLAppendDialog() ) );
+    manageMenu->addMenu( subPlaylist );
+    manageMenu->addSeparator();
+
+    QMenu *subML = new QMenu();
+    subML->setTitle( qtr("Add to Media library") );
+    subML->addAction( "&File...", THEDP,
+                           SLOT( simpleMLAppendDialog() ) );
+    subML->addAction( "&Advanced add...", THEDP,
+                           SLOT( MLAppendDialog() ) );
+    manageMenu->addMenu( subML );
     manageMenu->addSeparator();
+
 //    manageMenu->addMenu( SDMenu( p_intf ) );
 
     bar->addMenu( manageMenu );

diff --git a/modules/gui/qt4/playlist_model.cpp b/modules/gui/qt4/playlist_model.cpp
index 291bf6fcd5241b53fc11b9ba3214abe7e4024042..3e295310ce48ec4015cdf13074762cf5536aa244 100644 (file)
--- a/modules/gui/qt4/playlist_model.cpp
+++ b/modules/gui/qt4/playlist_model.cpp
@@ -480,9 +480,9 @@ 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;
 
-    PL_LOCK;
     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 == 1 && p_item->p_parent &&

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 9c0d6361066781c42b8d002d43b4e925497739c9..7666ecc4a065f9db5cf58404c79999055e290189 100644 (file)
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -23,6 +23,7 @@
 #include <QApplication>
 #include "qt4.hpp"
 #include "dialogs_provider.hpp"
+#include "input_manager.hpp"
 #include "main_interface.hpp"
 
 /*****************************************************************************
@@ -141,6 +142,7 @@ static void Init( intf_thread_t *p_intf )
 
     app->setQuitOnLastWindowClosed( false );
     app->exec();
+    MainInputManager::killInstance();
     delete p_intf->p_sys->p_mi;
 }