comparison view/Overview.cpp @ 817:24f18a7dd26d tonioni

Merge from default branch, and update to make sure we retain the DAW-style scrolling (page without moving playhead on scroll)

 	std::min(m_centreFrame, newCentreFrame) > int(m_zoomLevel)) {
         int rf = alignToReference(newCentreFrame);
 #ifdef DEBUG_OVERVIEW
         cerr << "Overview::mouseMoveEvent: x " << e->x() << " and click x " << m_clickPos.x() << " -> frame " << newCentreFrame << " -> rf " << rf << endl;
 #endif
-	emit centreFrameChanged(rf, true, PlaybackScrollContinuous);
+        if (m_followPlay == PlaybackScrollContinuous ||
+            m_followPlay == PlaybackScrollPageWithCentre) {
+            emit centreFrameChanged(rf, true, PlaybackScrollContinuous);
+        } else {
+            emit centreFrameChanged(rf, true, PlaybackIgnore);
+        }            
     }
 }
 
 void
 Overview::mouseDoubleClickEvent(QMouseEvent *e)