From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Tue, 10 Jun 2008 23:07:53 +0000 (-0700)
Subject: Try to fix the win32 compile.
X-Git-Tag: 0.9.0-test0~227
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=a39be0837a5252caf944638e898b96369492c73e;p=vlc

Try to fix the win32 compile.
---

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index 4413a6e3f5..d90ef7693c 100644
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -23,6 +23,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
@@ -860,10 +861,10 @@ FullscreenControllerWidget::FullscreenControllerWidget( intf_thread_t *_p_i,
     p_hideTimer->setSingleShot( true );
 
     /* slow hiding timer */
-    #ifdef TRANSPARENCY
+#if HAVE_TRANSPARENCY
     p_slowHideTimer = new QTimer( this );
     CONNECT( p_slowHideTimer, timeout(), this, slowHideFSC() );
-    #endif
+#endif
 
     adjustSize ();  /* need to get real width and height for moving */
 
@@ -899,7 +900,6 @@ void FullscreenControllerWidget::hideFSControllerWidget()
     #endif
 }
 
-#ifdef TRANSPARENCY
 /**
  * Hidding fullscreen controller slowly
  * Linux: need composite manager
@@ -907,6 +907,7 @@ void FullscreenControllerWidget::hideFSControllerWidget()
  */
 void FullscreenControllerWidget::slowHideFSC()
 {
+#if HAVE_TRANSPARENCY
     static bool first_call = true;
 
     if ( first_call )
@@ -933,8 +934,8 @@ void FullscreenControllerWidget::slowHideFSC()
              p_slowHideTimer->stop();
          }
     }
-}
 #endif
+}
 
 /**
  * Get state of visibility of FS controller on screen
@@ -973,9 +974,9 @@ void FullscreenControllerWidget::customEvent( QEvent *event )
         show();
         #endif
 
-        #ifdef TRANSPARENCY
+#if HAVE_TRANSPARENCY
         setWindowOpacity( 0.75 );
-        #endif
+#endif
     }
     else if ( type == FullscreenControlHide_Type )
     {
@@ -984,9 +985,9 @@ void FullscreenControllerWidget::customEvent( QEvent *event )
     else if ( type == FullscreenControlPlanHide_Type && !b_mouseIsOver )
     {
         p_hideTimer->start( i_hideTimeout );
-        #ifdef TRANSPARENCY
+#if HAVE_TRANSPARENCY
         p_slowHideTimer->start( i_hideTimeout / 2 );
-        #endif
+#endif
     }
 }
 
@@ -1024,9 +1025,9 @@ void FullscreenControllerWidget::mousePressEvent( QMouseEvent *event )
 void FullscreenControllerWidget::enterEvent( QEvent *event )
 {
     p_hideTimer->stop();
-    #ifdef TRANSPARENCY
+#if HAVE_TRANSPARENCY
     p_slowHideTimer->stop();
-    #endif
+#endif
     b_mouseIsOver = true;
 }
 
@@ -1036,9 +1037,9 @@ void FullscreenControllerWidget::enterEvent( QEvent *event )
 void FullscreenControllerWidget::leaveEvent( QEvent *event )
 {
     p_hideTimer->start( i_hideTimeout );
-    #ifdef TRANSPARENCY
+#if HAVE_TRANSPARENCY
     p_slowHideTimer->start( i_hideTimeout / 2 );
-    #endif
+#endif
     b_mouseIsOver = false;
 }
 
diff --git a/modules/gui/qt4/components/interface_widgets.hpp b/modules/gui/qt4/components/interface_widgets.hpp
index 8bec903e11..512e15f5e3 100644
--- a/modules/gui/qt4/components/interface_widgets.hpp
+++ b/modules/gui/qt4/components/interface_widgets.hpp
@@ -40,6 +40,7 @@
 
 #include <QWidget>
 #include <QFrame>
+
 #define VOLUME_MAX 200
 
 /* on WIN32 hide() for fullscreen controller doesnt work, so it have to be
@@ -49,15 +50,13 @@
 #endif
 
 /* to trying transparency with fullscreen controller on windows enable that */
-/* #define TRANSPARENCY */
-
-/* it can be enabled on non windows systems,
+#define HAVE_TRANSPARENCY 0
+/* it can be enabled on-non windows systems,
    but it will be transparent only with composite manager */
 #ifndef WIN32
-    #define TRANSPARENCY
+    #define HAVE_TRANSPARENCY 1
 #endif
 
-
 class ResizeEvent;
 class QPalette;
 class QPixmap;
@@ -254,26 +253,23 @@ protected:
 
 private slots:
     void hideFSControllerWidget();
-
-    #ifdef TRANSPARENCY
     void slowHideFSC();
-    #endif
 
 private:
     QTimer *p_hideTimer;
 
-    #ifdef TRANSPARENCY
+#if HAVE_TRANSPARENCY
     QTimer *p_slowHideTimer;
-    #endif
+#endif
 
     int i_lastPosX;
     int i_lastPosY;
     int i_hideTimeout;  /* FSC hiding timeout, same as mouse hiding timeout */
     bool b_mouseIsOver;
 
-    #ifdef WIN32TRICK
+#ifdef WIN32TRICK
     bool fscHidden;
-    #endif
+#endif
 
     virtual void customEvent( QEvent *event );
 };