comparison main/MainWindow.cpp @ 147:140ea2569bcc

* Make ffwd/rewind constrained to the selection if Play Selection is on

 
     size_t resolution = 0;
     if (!layer->snapToFeatureFrame(pane, frame, resolution, Layer::SnapRight)) {
         frame = getMainModel()->getEndFrame();
     }
+
+    if (m_viewManager->getPlaySelectionMode()) {
+        MultiSelection::SelectionList sl = m_viewManager->getSelections();
+        if (!sl.empty()) {
+            MultiSelection::SelectionList::iterator i = sl.end();
+            --i;
+            size_t selectionEndFrame = i->getEndFrame();
+            if (frame > selectionEndFrame) frame = selectionEndFrame;
+        }
+    }
     
     m_viewManager->setPlaybackFrame(frame);
 }
 
 void
 MainWindow::ffwdEnd()
 {
     if (!getMainModel()) return;
-    m_viewManager->setPlaybackFrame(getMainModel()->getEndFrame());
+
+    size_t frame = getMainModel()->getEndFrame();
+
+    if (m_viewManager->getPlaySelectionMode()) {
+        MultiSelection::SelectionList sl = m_viewManager->getSelections();
+        if (!sl.empty()) {
+            MultiSelection::SelectionList::iterator i = sl.end();
+            --i;
+            size_t selectionEndFrame = i->getEndFrame();
+            if (frame > selectionEndFrame) frame = selectionEndFrame;
+        }
+    }
+
+    m_viewManager->setPlaybackFrame(frame);
 }
 
 void
 MainWindow::rewind()
 {

 
     size_t resolution = 0;
     if (!layer->snapToFeatureFrame(pane, frame, resolution, Layer::SnapLeft)) {
         frame = getMainModel()->getEndFrame();
     }
-    
+
+    if (m_viewManager->getPlaySelectionMode()) {
+        MultiSelection::SelectionList sl = m_viewManager->getSelections();
+        if (!sl.empty()) {
+            size_t selectionStartFrame = sl.begin()->getStartFrame();
+            if (frame < selectionStartFrame) frame = selectionStartFrame;
+        }
+    }
+
     m_viewManager->setPlaybackFrame(frame);
 }
 
 void
 MainWindow::rewindStart()
 {
     if (!getMainModel()) return;
-    m_viewManager->setPlaybackFrame(getMainModel()->getStartFrame());
+
+    size_t frame = getMainModel()->getStartFrame();
+
+    if (m_viewManager->getPlaySelectionMode()) {
+        MultiSelection::SelectionList sl = m_viewManager->getSelections();
+        if (!sl.empty()) {
+            size_t selectionStartFrame = sl.begin()->getStartFrame();
+            if (frame < selectionStartFrame) frame = selectionStartFrame;
+        }
+    }
+
+    m_viewManager->setPlaybackFrame(frame);
 }
 
 void
 MainWindow::stop()
 {