X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fmain_interface.hpp;h=b4d25f3ebbeaa92ebc28d1a61d013cd2290dff31;hb=6fa897afdd9799155c76e3fd4812e5304a51d766;hp=4253fb7b5fdd0008e5eb21fca0765efb7aa7c25d;hpb=bd808b064d8a54e9c1003bf36f5e03d8d725a36b;p=vlc

diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index 4253fb7b5f..b4d25f3ebb 100644
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -45,10 +45,11 @@ class PlaylistWidget;
 class VisualSelector;
 class AdvControlsWidget;
 class ControlsWidget;
+class FullscreenControllerWidget;
 class SpeedControlWidget;
 class QMenu;
 class QSize;
-class QDockWidet;
+//class QDockWidet;
 class QProgressBar;
 
 enum{
@@ -72,16 +73,19 @@ public:
     void *requestVideo( vout_thread_t *p_nvout, int *pi_x,
                         int *pi_y, unsigned int *pi_width,
                         unsigned int *pi_height );
-    void releaseVideo( void * );
+    void releaseVideo( vout_thread_t *, void * );
     int controlVideo( void *p_window, int i_query, va_list args );
 
+    void requestLayoutUpdate();
+
     /* Getters */
     QSystemTrayIcon *getSysTray() { return sysTray; };
     QMenu *getSysTrayMenu() { return systrayMenu; };
     int getControlsVisibilityStatus();
 
-    /* Sizehint() */
+#if 0    /* Sizehint() */
     QSize sizeHint() const;
+#endif
 protected:
 //    void resizeEvent( QResizeEvent * );
     void dropEvent( QDropEvent *);
@@ -97,18 +101,22 @@ private:
     QString              input_name;
     QVBoxLayout         *mainLayout;
     ControlsWidget      *controls;
+    FullscreenControllerWidget *fullscreenControls;
     QMenu               *speedControlMenu;
     SpeedControlWidget  *speedControl;
     QProgressBar        *pgBar;
 
     void handleMainUi( QSettings* );
-    void privacy();
+    void askForPrivacy();
     int  privacyDialog( QList<ConfigControl *> controls );
 
     /* Systray */
     void handleSystray();
     void createSystray();
 
+    void createStatusBar();
+    void initSystray();
+
     /* Video */
     VideoWidget         *videoWidget;
     //    QSize                savedVideoSize;
@@ -116,15 +124,16 @@ private:
     BackgroundWidget    *bgWidget;
     VisualSelector      *visualSelector;
     PlaylistWidget      *playlistWidget;
-    QDockWidget         *dockPL;
+//    QDockWidget         *dockPL;
 
     bool                 videoIsActive; ///< Having a video now / THEMIM->hasV
     bool                 videoEmbeddedFlag; ///< Want an external Video Window
     bool                 playlistVisible; ///< Is the playlist visible ?
-    bool                 alwaysVideoFlag; ///< Always show the background
     bool                 visualSelectorEnabled;
     bool                 notificationEnabled; /// Systray Notifications
-    bool                 b_remainingTime; /* showing elapsed or remaining time */
+    bool                 b_remainingTime; /* Show elapsed or remaining time */
+    bool                 bgWasVisible;
+    int                  i_visualmode; ///< Visual Mode
 
     input_thread_t      *p_input;    ///< Main input associated to the playlist