comparison view/ViewManager.cpp @ 211:e2baee498ec8

* Rejig handling of scrolling views.  Ensures, among other things, that playing
  when there is a scroll mode view present (e.g. a spectrum) does not drag
  any page mode views into scroll mode with it.

 
 #include "ViewManager.h"
 #include "base/AudioPlaySource.h"
 #include "data/model/Model.h"
 #include "base/CommandHistory.h"
+#include "View.h"
 
 #include <QSettings>
 
 #include <iostream>
 

     m_zoomWheelsEnabled =
         settings.value("zoom-wheels-enabled", m_zoomWheelsEnabled).toBool();
     settings.endGroup();
 
     connect(this, 
-	    SIGNAL(centreFrameChanged(void *, unsigned long, bool)),
-	    SLOT(considerSeek(void *, unsigned long, bool)));
-
-    connect(this, 
 	    SIGNAL(zoomLevelChanged(void *, unsigned long, bool)),
 	    SLOT(considerZoomChange(void *, unsigned long, bool)));
 }
 
 ViewManager::~ViewManager()

 {
 #ifdef DEBUG_VIEW_MANAGER
     std::cout << "ViewManager::setGlobalCentreFrame to " << f << std::endl;
 #endif
     m_globalCentreFrame = f;
+    emit globalCentreFrameChanged(f);
 }
 
 unsigned long
 ViewManager::getGlobalZoom() const
 {

 {
     return m_playSource && m_playSource->isPlaying();
 }
 
 void
-ViewManager::considerSeek(void *p, unsigned long f, bool locked)
-{
+ViewManager::viewCentreFrameChanged(unsigned long f, bool locked,
+                                    PlaybackFollowMode mode)
+{
+    View *v = dynamic_cast<View *>(sender());
+
     if (locked) {
-	m_globalCentreFrame = f;
-    }
-
+        m_globalCentreFrame = f;
+        emit globalCentreFrameChanged(f);
+    } else {
+        if (v) emit viewCentreFrameChanged(v, f);
+    }
+
+    if (mode == PlaybackIgnore) {
+        return;
+    }
+
+    seek(f);
+}
+
+void
+ViewManager::seek(unsigned long f)
+{
 #ifdef DEBUG_VIEW_MANAGER 
-    std::cout << "ViewManager::considerSeek(" << p << ", " << f << ", " << locked << ")" << std::endl;
-#endif
-
-    if (p == this || !locked) return;
+    std::cout << "ViewManager::seek(" << f << ")" << std::endl;
+#endif
 
     if (m_playSource && m_playSource->isPlaying()) {
 	unsigned long playFrame = m_playSource->getCurrentPlayingFrame();
 	unsigned long diff = std::max(f, playFrame) - std::min(f, playFrame);
 	if (diff > 20000) {
 	    m_playbackFrame = f;
 	    m_playSource->play(f);
 #ifdef DEBUG_VIEW_MANAGER 
 	    std::cout << "ViewManager::considerSeek: reseeking from " << playFrame << " to " << f << std::endl;
 #endif
+            emit playbackFrameChanged(f);
 	}
     } else {
-	m_playbackFrame = f; //!!! only if that view is in scroll mode?
+        if (m_playbackFrame != f) {
+            m_playbackFrame = f;
+            emit playbackFrameChanged(f);
+        }
     }
 }
 
 void
 ViewManager::considerZoomChange(void *p, unsigned long z, bool locked)