Mercurial > hg > touchkeys
changeset 14:a84edec23a0c
Add octave selection to TouchKeys OSC emulator
| author | Andrew McPherson <andrewm@eecs.qmul.ac.uk> |
|---|---|
| date | Sat, 23 Nov 2013 18:01:33 +0000 |
| parents | c0c62ccf4bfd |
| children | b9038a983e11 |
| files | Builds/MacOSX/TouchKeys.xcodeproj/project.xcworkspace/xcuserdata/apm.xcuserdatad/UserInterfaceState.xcuserstate Source/MainApplicationController.h Source/TouchKeys/TouchkeyDevice.cpp |
| diffstat | 3 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
Binary file Builds/MacOSX/TouchKeys.xcodeproj/project.xcworkspace/xcuserdata/apm.xcuserdatad/UserInterfaceState.xcuserstate has changed
--- a/Source/MainApplicationController.h Sat Nov 23 17:47:29 2013 +0000 +++ b/Source/MainApplicationController.h Sat Nov 23 18:01:33 2013 +0000 @@ -127,6 +127,7 @@ // Set the lowest MIDI note for the TouchKeys void touchkeyDeviceSetLowestMidiNote(int note) { keyboardDisplay_.clearAllTouches(); + touchkeyEmulator_.setLowestMidiNote(note); touchkeyController_.setLowestMidiNote(note); } // Attempt to autodetect the correct TouchKey octave from MIDI data
--- a/Source/TouchKeys/TouchkeyDevice.cpp Sat Nov 23 17:47:29 2013 +0000 +++ b/Source/TouchKeys/TouchkeyDevice.cpp Sat Nov 23 18:01:33 2013 +0000 @@ -34,8 +34,8 @@ ioThread_(boost::bind(&TouchkeyDevice::runLoop, this, _1), "TouchKeyDevice::ioThread"), rawDataThread_(boost::bind(&TouchkeyDevice::rawDataRunLoop, this, _1), "TouchKeyDevice::rawDataThread"), autoGathering_(false), shouldStop_(false), sendRawOscMessages_(false), -verbose_(0), numOctaves_(0), lowestMidiNote_(12), lowestKeyPresentMidiNote_(12), -updatedLowestMidiNote_(12), deviceSoftwareVersion_(-1), deviceHardwareVersion_(-1), +verbose_(0), numOctaves_(0), lowestMidiNote_(48), lowestKeyPresentMidiNote_(48), +updatedLowestMidiNote_(48), deviceSoftwareVersion_(-1), deviceHardwareVersion_(-1), expectedLengthWhite_(kTransmissionLengthWhiteNewHardware), expectedLengthBlack_(kTransmissionLengthBlackNewHardware), deviceHasRGBLEDs_(false), ledThread_(boost::bind(&TouchkeyDevice::ledUpdateLoop, this, _1), "TouchKeyDevice::ledThread"),