comparison main/OSCHandler.cpp @ 922:a16456ca5e71 cxx11

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
comparison
equal deleted inserted replaced
921:67540751da93 922:a16456ca5e71
121 } else if (message.getMethod() == "jump" || 121 } else if (message.getMethod() == "jump" ||
122 message.getMethod() == "play") { 122 message.getMethod() == "play") {
123 123
124 if (getMainModel()) { 124 if (getMainModel()) {
125 125
126 int frame = m_viewManager->getPlaybackFrame(); 126 sv_frame_t frame = m_viewManager->getPlaybackFrame();
127 bool selection = false; 127 bool selection = false;
128 bool play = (message.getMethod() == "play"); 128 bool play = (message.getMethod() == "play");
129 129
130 if (message.getArgCount() == 1) { 130 if (message.getArgCount() == 1) {
131 131
450 zoomToFit(); 450 zoomToFit();
451 } else if (message.getArg(0).canConvert(QVariant::Double)) { 451 } else if (message.getArg(0).canConvert(QVariant::Double)) {
452 double level = message.getArg(0).toDouble(); 452 double level = message.getArg(0).toDouble();
453 Pane *currentPane = m_paneStack->getCurrentPane(); 453 Pane *currentPane = m_paneStack->getCurrentPane();
454 if (level < 1.0) level = 1.0; 454 if (level < 1.0) level = 1.0;
455 if (currentPane) currentPane->setZoomLevel(lrint(level)); 455 if (currentPane) currentPane->setZoomLevel(int(lrint(level)));
456 } 456 }
457 } 457 }
458 458
459 } else if (message.getMethod() == "zoomvertical") { 459 } else if (message.getMethod() == "zoomvertical") {
460 460