comparison main/MainWindow.cpp @ 2031:4db75d584e5a

Merge from branch zoom
author Chris Cannam
date Wed, 10 Oct 2018 08:58:20 +0100
parents c669b40a8d56 262c656ec78f
children 8529a60df1b4
comparison
equal deleted inserted replaced
2029:d70122abd746 2031:4db75d584e5a
3865 Pane *pane = command->getPane(); 3865 Pane *pane = command->getPane();
3866 3866
3867 if (configuration.layer == LayerFactory::Spectrum) { 3867 if (configuration.layer == LayerFactory::Spectrum) {
3868 pane->setPlaybackFollow(PlaybackScrollContinuous); 3868 pane->setPlaybackFollow(PlaybackScrollContinuous);
3869 pane->setFollowGlobalZoom(false); 3869 pane->setFollowGlobalZoom(false);
3870 pane->setZoomLevel(512); 3870 pane->setZoomLevel(ZoomLevel(ZoomLevel::FramesPerPixel, 512));
3871 } 3871 }
3872 3872
3873 if (configuration.layer != LayerFactory::TimeRuler && 3873 if (configuration.layer != LayerFactory::TimeRuler &&
3874 configuration.layer != LayerFactory::Spectrum) { 3874 configuration.layer != LayerFactory::Spectrum) {
3875 3875