comparison main/OSCHandler.cpp @ 940:440ead77632b

Merge from branch cxx11

     } else if (message.getMethod() == "jump" ||
                message.getMethod() == "play") {
 
         if (getMainModel()) {
 
-            int frame = m_viewManager->getPlaybackFrame();
+            sv_frame_t frame = m_viewManager->getPlaybackFrame();
             bool selection = false;
             bool play = (message.getMethod() == "play");
 
             if (message.getArgCount() == 1) {
 

     } else if (message.getMethod() == "select" ||
                message.getMethod() == "addselect") {
 
         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;
 
             if (message.getArgCount() == 2 &&
                 message.getArg(0).canConvert(QVariant::Double) &&

                 zoomToFit();
             } else if (message.getArg(0).canConvert(QVariant::Double)) {
                 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)));
             }
         }
 
     } else if (message.getMethod() == "zoomvertical") {