Mercurial > hg > touchkeys

comparison Source/Mappings/Control/TouchkeyControlMappingFactory.cpp @ 35:3f948746885a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Further updates; fix in Control and add save in Vibrato
author Andrew McPherson <andrewm@eecs.qmul.ac.uk>
date Fri, 21 Mar 2014 00:23:32 +0000
parents 20c28a319dee
children 85577160a0d4
comparison
equal deleted inserted replaced
34:20c28a319dee 35:3f948746885a
231 !properties.containsKey("direction")) 231 !properties.containsKey("direction"))
232 return false; 232 return false;
233 233
234 inputParameter_ = properties.getIntValue("inputParameter"); 234 inputParameter_ = properties.getIntValue("inputParameter");
235 inputType_ = properties.getIntValue("inputType"); 235 inputType_ = properties.getIntValue("inputType");
236 outputRangeMin_ = properties.getIntValue("outputRangeMin"); 236 outputRangeMin_ = properties.getDoubleValue("outputRangeMin");
237 outputRangeMax_ = properties.getIntValue("outputRangeMax"); 237 outputRangeMax_ = properties.getDoubleValue("outputRangeMax");
238 outputDefault_ = properties.getIntValue("outputDefault"); 238 outputDefault_ = properties.getDoubleValue("outputDefault");
239 threshold_ = properties.getIntValue("threshold"); 239 threshold_ = properties.getDoubleValue("threshold");
240 ignoresTwoFingers_ = properties.getIntValue("ignoresTwoFingers"); 240 ignoresTwoFingers_ = properties.getBoolValue("ignoresTwoFingers");
241 ignoresThreeFingers_ = properties.getIntValue("ignoresThreeFingers"); 241 ignoresThreeFingers_ = properties.getBoolValue("ignoresThreeFingers");
242 direction_ = properties.getIntValue("direction"); 242 direction_ = properties.getIntValue("direction");
243 243
244 // Update MIDI information; this doesn't actually change the controller 244 // Update MIDI information; this doesn't actually change the controller
245 // (which is already set) but it adds a listener and updates the ranges 245 // (which is already set) but it adds a listener and updates the ranges
246 setController(midiControllerNumber_); 246 setController(midiControllerNumber_);