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

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.cpp (modified) (6 diffs)

smplayer/trunk/src/mplayerwindow.cpp

@@ -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
@@ -48 +48 @@
         setMinimumSize( QSize(0,0) );
 
-#if NEW_MOUSE_CHECK_POS
         mouse_last_position = QPoint(0,0);
-#else
-        cursor_pos = QPoint(0,0);
-        last_cursor_pos = QPoint(0,0);
-#endif
 
         check_mouse_timer = new QTimer(this);
         connect( check_mouse_timer, SIGNAL(timeout()), this, SLOT(checkMousePos()) );
-#if !NEW_MOUSE_CHECK_POS
-        check_mouse_timer->start(2000);
-#endif
 
         // Change attributes
@@ -69 +61 @@
         //setAttribute(Qt::WA_PaintOutsidePaintEvent);
 
-#if NEW_MOUSE_CHECK_POS
         setAutoHideInterval(1000);
         setAutoHideCursor(false);
-#endif
 }
 
@@ -85 +75 @@
 }
 
-#if NEW_MOUSE_CHECK_POS
 void Screen::setAutoHideCursor(bool b) {
         qDebug("Screen::setAutoHideCursor: %d", b);
@@ -117 +106 @@
         mouse_last_position = pos;
 }
-#else
-void Screen::checkMousePos() {
-        //qDebug("Screen::checkMousePos");
-        
-        if ( cursor_pos == last_cursor_pos ) {
-                //qDebug(" same pos");
-                if (cursor().shape() != Qt::BlankCursor) {
-                        //qDebug(" hiding mouse cursor");
-                        setCursor(QCursor(Qt::BlankCursor));
-                }
-        } else {
-                last_cursor_pos = cursor_pos;
-        }
-}
 
 void Screen::mouseMoveEvent( QMouseEvent * e ) {
-        //qDebug("Screen::mouseMoveEvent");
-        //qDebug(" pos: x: %d y: %d", e->pos().x(), e->pos().y() );
-        cursor_pos = e->pos();
-
         if (cursor().shape() != Qt::ArrowCursor) {
                 //qDebug(" showing mouse cursor" );
@@ -142 +113 @@
         }
 }
-#endif
 
 void Screen::playingStarted() {
-#if NEW_MOUSE_CHECK_POS
         qDebug("Screen::playingStarted");
         setAutoHideCursor(true);
-#endif
 }
 
 void Screen::playingStopped() {
-#if NEW_MOUSE_CHECK_POS
         qDebug("Screen::playingStopped");
         setAutoHideCursor(false);
-#endif
 }