Mercurial > hg > sonic-visualiser

diff main/OSCHandler.cpp @ 940:440ead77632b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch cxx11
author Chris Cannam
date Mon, 20 Apr 2015 09:22:46 +0100
parents a16456ca5e71
children 28ccb621d1af
line wrap: on
line diff
--- a/main/OSCHandler.cpp	Mon Apr 20 09:22:27 2015 +0100
+++ b/main/OSCHandler.cpp	Mon Apr 20 09:22:46 2015 +0100
@@ -123,7 +123,7 @@
 
         if (getMainModel()) {
 
-            int frame = m_viewManager->getPlaybackFrame();
+            sv_frame_t frame = m_viewManager->getPlaybackFrame();
             bool selection = false;
             bool play = (message.getMethod() == "play");
 
@@ -233,8 +233,8 @@
 
         if (getMainModel()) {
 
-            int f0 = getMainModel()->getStartFrame();
-            int f1 = getMainModel()->getEndFrame();
+            sv_frame_t f0 = getMainModel()->getStartFrame();
+            sv_frame_t f1 = getMainModel()->getEndFrame();
 
             bool done = false;
 
@@ -452,7 +452,7 @@
                 double level = message.getArg(0).toDouble();
                 Pane *currentPane = m_paneStack->getCurrentPane();
                 if (level < 1.0) level = 1.0;
-                if (currentPane) currentPane->setZoomLevel(lrint(level));
+                if (currentPane) currentPane->setZoomLevel(int(lrint(level)));
             }
         }