Mercurial > hg > sonic-visualiser

changeset 109:e6c4b27cba2c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* 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.
author Chris Cannam
date Thu, 01 Mar 2007 11:55:46 +0000
parents 58f21cf235c7
children d25ea0c2af5c
files document/SVFileReader.cpp main/MainWindow.cpp
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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);
--- 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 &&