# HG changeset patch
# User Chris Cannam
# Date 1172750146 0
# Node ID e6c4b27cba2cef29acc4e4222de1cc118c44d253
# Parent  58f21cf235c7c330c79816f2aaa8dd5254ff549e
* 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.

diff -r 58f21cf235c7 -r e6c4b27cba2c document/SVFileReader.cpp
--- a/document/SVFileReader.cpp	Tue Feb 27 12:51:38 2007 +0000
+++ b/document/SVFileReader.cpp	Thu Mar 01 11:55:46 2007 +0000
@@ -679,9 +679,9 @@
     // Specify the follow modes before we set the actual values
     view->setFollowGlobalPan(followPan);
     view->setFollowGlobalZoom(followZoom);
-    view->setPlaybackFollow(tracking == "scroll" ? View::PlaybackScrollContinuous :
-			    tracking == "page" ? View::PlaybackScrollPage
-			    : View::PlaybackIgnore);
+    view->setPlaybackFollow(tracking == "scroll" ? PlaybackScrollContinuous :
+			    tracking == "page" ? PlaybackScrollPage
+			    : PlaybackIgnore);
 
     // Then set these values
     view->setCentreFrame(centre);
diff -r 58f21cf235c7 -r e6c4b27cba2c main/MainWindow.cpp
--- a/main/MainWindow.cpp	Tue Feb 27 12:51:38 2007 +0000
+++ b/main/MainWindow.cpp	Thu Mar 01 11:55:46 2007 +0000
@@ -3223,7 +3223,7 @@
     Pane *pane = command->getPane();
 
     if (configuration.layer == LayerFactory::Spectrum) {
-        pane->setPlaybackFollow(View::PlaybackScrollContinuous);
+        pane->setPlaybackFollow(PlaybackScrollContinuous);
     }
 
     if (configuration.layer != LayerFactory::TimeRuler &&