diff Source/Mappings/KeyDivision/TouchkeyKeyDivisionMappingFactory.cpp @ 7:353276611036

Move pitch wheel range into a central location in MidiKeyboardSegment, eliminating local copies in OscMidiConverter etc. Also suppress some unneeded debugging messages in TouchkeyDevice.

--- a/Source/Mappings/KeyDivision/TouchkeyKeyDivisionMappingFactory.cpp	Wed Nov 13 23:40:53 2013 +0000
+++ b/Source/Mappings/KeyDivision/TouchkeyKeyDivisionMappingFactory.cpp	Sun Nov 17 13:53:21 2013 +0000
@@ -24,8 +24,6 @@
 
 #include "TouchkeyKeyDivisionMappingFactory.h"
 
-const float TouchkeyKeyDivisionMappingFactory::kDefaultPitchWheelRangeSemitones = 2.0;
-
 // Yarman-24 Turkish microtonal tuning:
 /*      1/1	RAST		C
  84.360	Nim Zengule	C#/Db
@@ -116,7 +114,6 @@
 
 TouchkeyKeyDivisionMappingFactory::TouchkeyKeyDivisionMappingFactory(PianoKeyboard &keyboard, MidiKeyboardSegment& segment)
 : TouchkeyBaseMappingFactory<TouchkeyKeyDivisionMapping>(keyboard, segment),
-  pitchWheelRangeSemitones_(kDefaultPitchWheelRangeSemitones),
   numSegmentsPerKey_(TouchkeyKeyDivisionMapping::kDefaultNumberOfSegments),
   timeout_(TouchkeyKeyDivisionMapping::kDefaultDetectionTimeout),
   detectionParameter_(TouchkeyKeyDivisionMapping::kDefaultDetectionParameter),
@@ -129,14 +126,6 @@
     setBendParameters();
 }
 
-void TouchkeyKeyDivisionMappingFactory::setMIDIPitchWheelRange(float maxBendSemitones) {
-    if(maxBendSemitones <= 0)
-        return;
-    pitchWheelRangeSemitones_ = maxBendSemitones;
-    
-    setBendParameters();
-}
-
 void TouchkeyKeyDivisionMappingFactory::setName(const string& name) {
     TouchkeyBaseMappingFactory<TouchkeyKeyDivisionMapping>::setName(name);
     setBendParameters();
@@ -167,10 +156,10 @@
 }
 
 void TouchkeyKeyDivisionMappingFactory::setBendParameters() {
-    setMidiParameters(MidiKeyboardSegment::kControlPitchWheel, -pitchWheelRangeSemitones_, pitchWheelRangeSemitones_, 0.0);
+    // Range of 0 indicates special case of using global pitch wheel range
+    setMidiParameters(MidiKeyboardSegment::kControlPitchWheel, 0.0, 0.0, 0.0);
     
     if(midiConverter_ != 0) {
-        midiConverter_->setMidiPitchWheelRange(pitchWheelRangeSemitones_);
         midiConverter_->listenToIncomingControl(MidiKeyboardSegment::kControlPitchWheel);
     }
 }
\ No newline at end of file