comparison base/View.cpp @ 107:f258fd1f74b4

* win32 fixes
* Attempt to make playback pointer movement smoother under load

     bool visible = (getXForFrame(m_playPointerFrame) != getXForFrame(f));
     size_t oldPlayPointerFrame = m_playPointerFrame;
     m_playPointerFrame = f;
     if (!visible) return;
 
-    bool modifierPressed = // we only care about these ones
-	((QApplication::keyboardModifiers() & Qt::ShiftModifier)
-#ifndef Q_WS_MAC
-         /* OS/X reports that CtrlModifier is pressed after we've
-            imported a file with Apple+I even though we then released it */
-         || (QApplication::keyboardModifiers() & Qt::ControlModifier)
-#endif
-            );
-
     switch (m_followPlay) {
 
     case PlaybackScrollContinuous:
-	if (QApplication::mouseButtons() == Qt::NoButton &&
-	    !modifierPressed) {
+	if (QApplication::mouseButtons() == Qt::NoButton) {
 	    setCentreFrame(f, false);
 	}
 	break;
 
     case PlaybackScrollPage:
     { 
 	int xold = getXForFrame(oldPlayPointerFrame);
-	repaint(xold - 1, 0, 3, height());
+	update(xold - 1, 0, 3, height());
 
 	long w = getEndFrame() - getStartFrame();
 	w -= w/5;
 	long sf = (f / w) * w - w/8;
 

 #ifdef DEBUG_VIEW_WIDGET_PAINT
 	std::cerr << "xnew = " << xnew << ", width = " << width() << std::endl;
 #endif
 
 	if (xnew < width()/8 || xnew > (width()*7)/8) {
-	    if (QApplication::mouseButtons() == Qt::NoButton &&
-		!modifierPressed) {
+	    if (QApplication::mouseButtons() == Qt::NoButton) {
 		long offset = getFrameForX(width()/2) - getStartFrame();
 		long newCentre = sf + offset;
 		bool changed = setCentreFrame(newCentre, false);
 		if (changed) {
 		    xold = getXForFrame(oldPlayPointerFrame);