Mercurial > hg > sonic-visualiser

diff main/OSCHandler.cpp @ 922:a16456ca5e71 cxx11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More type fixes. We now build with -Wconversion, on this platform (64-bit Linux) at least.
author Chris Cannam
date Tue, 10 Mar 2015 17:23:45 +0000
parents a824fe3f9f45
children 28ccb621d1af
line wrap: on
line diff
--- a/main/OSCHandler.cpp	Tue Mar 10 17:02:52 2015 +0000
+++ b/main/OSCHandler.cpp	Tue Mar 10 17:23:45 2015 +0000
@@ -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");
 
@@ -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)));
             }
         }