Mercurial > hg > svapp
diff framework/SVFileReader.cpp @ 380:d8bde801ebd4 tonioni
Merge from default branch
author | Chris Cannam |
---|---|
date | Wed, 02 Jul 2014 17:31:48 +0100 |
parents | 6a84102c006a |
children | 7657075ecfca |
line wrap: on
line diff
--- a/framework/SVFileReader.cpp Wed Jun 18 17:33:00 2014 +0100 +++ b/framework/SVFileReader.cpp Wed Jul 02 17:31:48 2014 +0100 @@ -767,7 +767,8 @@ view->setFollowGlobalPan(followPan); view->setFollowGlobalZoom(followZoom); view->setPlaybackFollow(tracking == "scroll" ? PlaybackScrollContinuous : - tracking == "page" ? PlaybackScrollPage + tracking == "page" ? PlaybackScrollPageWithCentre : + tracking == "daw" ? PlaybackScrollPage : PlaybackIgnore); // Then set these values