comparison framework/MainWindowBase.cpp @ 708:721eb532840d

Fix to avoid ffwd/rwd getting stuck at a single point if it translates to the playback frame again on alignment

 void
 MainWindowBase::ffwd()
 {
     if (!getMainModel()) return;
 
-    sv_frame_t frame = m_viewManager->getPlaybackFrame();
-    ++frame;
+    sv_frame_t playbackFrame = m_viewManager->getPlaybackFrame();
+    sv_frame_t frame = playbackFrame + 1;
 
     Pane *pane = m_paneStack->getCurrentPane();
     Layer *layer = getSnapLayer();
     sv_samplerate_t sr = getMainModel()->getSampleRate();
 
-    if (!layer) {
+    if (!pane || !layer) {
 
         frame = RealTime::realTime2Frame
             (RealTime::frame2RealTime(frame, sr) + m_defaultFfwdRwdStep, sr);
         if (frame > getMainModel()->getEndFrame()) {
             frame = getMainModel()->getEndFrame();
         }
 
     } else {
 
+        sv_frame_t pframe = pane->alignFromReference(frame);
         int resolution = 0;
-        if (pane) frame = pane->alignFromReference(frame);
-        if (layer->snapToFeatureFrame(m_paneStack->getCurrentPane(),
-                                      frame, resolution, Layer::SnapRight)) {
-            if (pane) frame = pane->alignToReference(frame);
+        bool success = false;
+
+        while (layer->snapToFeatureFrame(pane, pframe, resolution,
+                                         Layer::SnapRight)) {
+            if (pane->alignToReference(pframe) > playbackFrame) {
+                success = true;
+                break;
+            } else {
+                ++pframe;
+            }
+        }
+
+        if (success) {
+            frame = pane->alignToReference(pframe);
         } else {
             frame = getMainModel()->getEndFrame();
         }
     }
         

         frame = m_viewManager->constrainFrameToSelection(frame);
     }
     
     m_viewManager->setPlaybackFrame(frame);
 
-    if (frame == getMainModel()->getEndFrame() &&
+    if (frame >= getMainModel()->getEndFrame() &&
         m_playSource &&
         m_playSource->isPlaying() &&
         !m_viewManager->getPlayLoopMode()) {
         stop();
     }

 void
 MainWindowBase::rewind()
 {
     if (!getMainModel()) return;
 
-    sv_frame_t frame = m_viewManager->getPlaybackFrame();
+    sv_frame_t playbackFrame = m_viewManager->getPlaybackFrame();
+    sv_frame_t frame = playbackFrame;
     if (frame > 0) --frame;
 
     Pane *pane = m_paneStack->getCurrentPane();
     Layer *layer = getSnapLayer();
     sv_samplerate_t sr = getMainModel()->getSampleRate();

         ct = ct - RealTime::fromSeconds(0.15);
         if (ct < RealTime::zeroTime) ct = RealTime::zeroTime;
         frame = RealTime::realTime2Frame(ct, sr);
     }
 
-    if (!layer) {
+    if (!pane || !layer) {
         
         frame = RealTime::realTime2Frame
             (RealTime::frame2RealTime(frame, sr) - m_defaultFfwdRwdStep, sr);
         if (frame < getMainModel()->getStartFrame()) {
             frame = getMainModel()->getStartFrame();
         }
 
     } else {
 
+        sv_frame_t pframe = pane->alignFromReference(frame);
         int resolution = 0;
-        if (pane) frame = pane->alignFromReference(frame);
-        if (layer->snapToFeatureFrame(m_paneStack->getCurrentPane(),
-                                      frame, resolution, Layer::SnapLeft)) {
-            if (pane) frame = pane->alignToReference(frame);
+        bool success = false;
+
+        while (layer->snapToFeatureFrame(pane, pframe, resolution,
+                                         Layer::SnapLeft)) {
+            if (pane->alignToReference(pframe) < playbackFrame ||
+                pframe <= 0) {
+                success = true;
+                break;
+            } else {
+                --pframe;
+            }
+        }
+
+        if (success) {
+            frame = pane->alignToReference(pframe);
         } else {
             frame = getMainModel()->getStartFrame();
         }
     }