Changeset 142 for smplayer/trunk/src/mplayerwindow.h

Timestamp:

May 27, 2013, 3:28:05 PM (12 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update trunk to 0.8.5

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/mplayerwindow.h (modified) (6 diffs)

smplayer/trunk/src/mplayerwindow.h

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -42 +42 @@
 
 #define DELAYED_RESIZE 0
-#define NEW_MOUSE_CHECK_POS 1
 
 //! Screen is a widget that hides the mouse cursor after some seconds if not moved.
@@ -54 +53 @@
         ~Screen();
 
-#if NEW_MOUSE_CHECK_POS
         void setAutoHideCursor(bool b);
         bool autoHideCursor() { return autohide_cursor; };
@@ -60 +58 @@
         void setAutoHideInterval(int milliseconds) { autohide_interval = milliseconds; };
         int autoHideInterval() { return autohide_interval; };
-#endif
 
 public slots:
@@ -70 +67 @@
 
 protected:
-#if !NEW_MOUSE_CHECK_POS
         virtual void mouseMoveEvent( QMouseEvent * e );
-#endif
         virtual void paintEvent ( QPaintEvent * e );
 
@@ -80 +75 @@
 private:
         QTimer * check_mouse_timer;
-#if NEW_MOUSE_CHECK_POS
         QPoint mouse_last_position;
         bool autohide_cursor;
         int autohide_interval;
-#else
-        QPoint cursor_pos, last_cursor_pos;
-#endif
 };