bgWidget fix. Close #1743

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

diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index 159b4ca481219e33f0fe2427095eecbeddb6bb39..b4d25f3ebbeaa92ebc28d1a61d013cd2290dff31 100644 (file)
--- 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,8 +73,9 @@ 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 */
@@ -81,7 +83,6 @@ public:
     QMenu *getSysTrayMenu() { return systrayMenu; };
     int getControlsVisibilityStatus();
 
-    bool b_toUpdate;
 #if 0    /* Sizehint() */
     QSize sizeHint() const;
 #endif
@@ -100,6 +101,7 @@ private:
     QString              input_name;
     QVBoxLayout         *mainLayout;
     ControlsWidget      *controls;
+    FullscreenControllerWidget *fullscreenControls;
     QMenu               *speedControlMenu;
     SpeedControlWidget  *speedControl;
     QProgressBar        *pgBar;
@@ -122,14 +124,15 @@ 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                 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