Do not read directory twice. This solves #1761 but this may not be the real solution...

[vlc] / modules / gui / qt4 / dialogs_provider.hpp

diff --git a/modules/gui/qt4/dialogs_provider.hpp b/modules/gui/qt4/dialogs_provider.hpp
index 4776b002b1ef20d5faf5a485022e2fd03627540d..d86e24eea48819e3ac4be98472d468cc680d0e67 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.hpp
+++ b/modules/gui/qt4/dialogs_provider.hpp
@@ -25,11 +25,17 @@
 #ifndef _DIALOGS_PROVIDER_H_
 #define _DIALOGS_PROVIDER_H_
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <assert.h>
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 
+#include "qt4.hpp"
 #include "dialogs/interaction.hpp"
+#include "dialogs/open.hpp"
 
 #include <QObject>
 #include <QTimer>
@@ -72,22 +78,6 @@ enum {
     EXT_FILTER_SUBTITLE  =  0x10,
 };
 
-enum {
-    OPEN_FILE_TAB,
-    OPEN_DISC_TAB,
-    OPEN_NETWORK_TAB,
-    OPEN_CAPTURE_TAB,
-    OPEN_TAB_MAX
-};
-
-enum {
-    OPEN_AND_PLAY,
-    OPEN_AND_STREAM,
-    OPEN_AND_SAVE,
-    OPEN_AND_ENQUEUE,
-    SELECT
-};
-
 class QEvent;
 class QSignalMapper;
 class QVLCMenu;
@@ -114,6 +104,10 @@ public:
         if( instance ) delete instance;
         instance = NULL;
     }
+    static bool isAlive()
+    {
+        return ( instance != NULL );
+    }
     virtual ~DialogsProvider();
     QTimer *fixed_timer;
 
@@ -164,6 +158,7 @@ public slots:
 
     void openDialog();
     void openDialog( int );
+    void openFileGenericDialog( intf_dialog_args_t * );
     void openDiscDialog();
     void openFileDialog();
     void openNetDialog();
@@ -171,6 +166,7 @@ public slots:
 
     void PLAppendDialog();
     void MLAppendDialog();
+    void PLOpenDir();
     void PLAppendDir();
     void MLAppendDir();
 
@@ -182,7 +178,8 @@ public slots:
     void openAPlaylist();
     void saveAPlaylist();
 
-    void switchToSkins();
+    void loadSubtitlesFile();
+
     void quit();
 };