]> git.sesse.net Git - vlc/commitdiff
skins2: add support for --[no]-qt-fs-controller
authorErwan Tulou <erwan10@videolan.org>
Wed, 27 Jun 2012 10:03:39 +0000 (12:03 +0200)
committerErwan Tulou <erwan10@videolan.org>
Wed, 27 Jun 2012 16:52:48 +0000 (18:52 +0200)
modules/gui/skins2/src/fsc_window.cpp
modules/gui/skins2/src/fsc_window.hpp

index e8eb60b8cc2e86c2958dacdcf5877cc2bcf96628..6d7df7ebb78a063d40c202936b6fe222dc49db32 100644 (file)
@@ -62,6 +62,9 @@ FscWindow::FscWindow( intf_thread_t *pIntf, int left, int top,
     if( m_delay <= 0 )
         m_delay = FSC_DELAY;
 
+    /// activation overridden by user
+    m_enabled = var_InheritBool( getIntf(), "qt-fs-controller" );
+
     // register Fsc
     VoutManager::instance( getIntf())->registerFSC( this );
 }
@@ -157,6 +160,9 @@ void FscWindow::onUpdate( Subject<VarBool> &rVariable, void *arg  )
 
 void FscWindow::innerShow()
 {
+    if( !m_enabled )
+        return;
+
     TopWindow::innerShow();
 
     m_count = FSC_COUNT;
index 67f9b981ffba7b1c2d4be44561de5ef98430e2f7..7221039aff99bc243e417173fe550805c7251e14 100644 (file)
@@ -69,6 +69,8 @@ private:
     int m_opacity;
     /// delay set by user
     int m_delay;
+    /// activation set by user
+    bool m_enabled;
 
     /// Callback for the timer
     DEFINE_CALLBACK( FscWindow, FscHide )