comparison framework/MainWindowBase.cpp @ 60:7b71da2d0631

* Some work on correct alignment when moving panes during playback
* Overhaul alignment for playback frame values (view manager now always
  refers to reference-timeline values, only the play source deals in
  playback model timeline values)
* When making a selection, ensure the selection regions shown in other
  panes (and used for playback constraints if appropriate) are aligned
  correctly.  This may be the coolest feature ever implemented in any
  program ever.

         if (m_viewManager) m_viewManager->setPlaybackModel(0);
         return;
     }
 
     Model *prevPlaybackModel = m_viewManager->getPlaybackModel();
+    int frame = m_playSource->getCurrentPlayingFrame();
+
+    std::cerr << "playing frame (in ref model) = " << frame << std::endl;
 
     View::ModelSet soloModels = p->getModels();
     
     View::ModelSet sources;
     for (View::ModelSet::iterator mi = soloModels.begin();

     for (View::ModelSet::iterator mi = sources.begin();
          mi != sources.end(); ++mi) {
         soloModels.insert(*mi);
     }
 
+    //!!! Need an "atomic" way of telling the play source that the
+    //playback model has changed, and changing it on ViewManager --
+    //the play source should be making the setPlaybackModel call to
+    //ViewManager
+
     for (View::ModelSet::iterator mi = soloModels.begin();
          mi != soloModels.end(); ++mi) {
         if (dynamic_cast<RangeSummarisableTimeValueModel *>(*mi)) {
             m_viewManager->setPlaybackModel(*mi);
         }

                                                         getPlaybackModel());
 
     m_playSource->setSoloModelSet(soloModels);
 
     if (a && b && (a != b)) {
-        int frame = m_playSource->getCurrentPlayingFrame();
-        //!!! I don't really believe that these functions are the right way around
-        int rframe = a->alignFromReference(frame);
-        int bframe = b->alignToReference(rframe);
+/*!!!
+        int rframe = a->alignToReference(frame);
+        int bframe = b->alignFromReference(rframe);
         if (m_playSource->isPlaying()) m_playSource->play(bframe);
+*/
+        if (m_playSource->isPlaying()) m_playSource->play(frame);
     }
 }
 
 void
 MainWindowBase::currentLayerChanged(Pane *p, Layer *)

     Model *model = getMainModel();
     if (!model) return;
     
     size_t start = model->getStartFrame();
     size_t end = model->getEndFrame();
+    if (m_playSource) end = std::max(end, m_playSource->getPlayEndFrame());
     size_t pixels = currentPane->width();
 
     size_t sw = currentPane->getVerticalScaleWidth();
     if (pixels > sw * 2) pixels -= sw * 2;
     else pixels = 1;