comparison main/OSCHandler.cpp @ 730:73a5884a0975 warnfix_no_size_t

Various size_t etc removals, and compiler warning fixes
author Chris Cannam
date Tue, 17 Jun 2014 16:42:51 +0100
parents 9cc2027d388b
children a824fe3f9f45
comparison
equal deleted inserted replaced
728:b959148258a4 730:73a5884a0975
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 unsigned long frame = m_viewManager->getPlaybackFrame(); 126 int 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
253 253
254 Pane *pane = m_paneStack->getCurrentPane(); 254 Pane *pane = m_paneStack->getCurrentPane();
255 Layer *layer = 0; 255 Layer *layer = 0;
256 if (pane) layer = pane->getSelectedLayer(); 256 if (pane) layer = pane->getSelectedLayer();
257 if (layer) { 257 if (layer) {
258 size_t resolution; 258 int resolution;
259 layer->snapToFeatureFrame(pane, f0, resolution, 259 layer->snapToFeatureFrame(pane, f0, resolution,
260 Layer::SnapLeft); 260 Layer::SnapLeft);
261 layer->snapToFeatureFrame(pane, f1, resolution, 261 layer->snapToFeatureFrame(pane, f1, resolution,
262 Layer::SnapRight); 262 Layer::SnapRight);
263 } 263 }