comparison 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.

   which triggers different actions or pitches depending on where the key
   was struck.
 */
 
 #include "TouchkeyKeyDivisionMappingFactory.h"
-
-const float TouchkeyKeyDivisionMappingFactory::kDefaultPitchWheelRangeSemitones = 2.0;
 
 // Yarman-24 Turkish microtonal tuning:
 /*      1/1	RAST		C
  84.360	Nim Zengule	C#/Db
  145.112	Zengule		Cᵻ/Dƀ

  *   C   C#   D   D#   E   F   F#   G   G#   A   A#   B
  */
 
 TouchkeyKeyDivisionMappingFactory::TouchkeyKeyDivisionMappingFactory(PianoKeyboard &keyboard, MidiKeyboardSegment& segment)
 : TouchkeyBaseMappingFactory<TouchkeyKeyDivisionMapping>(keyboard, segment),
-  pitchWheelRangeSemitones_(kDefaultPitchWheelRangeSemitones),
   numSegmentsPerKey_(TouchkeyKeyDivisionMapping::kDefaultNumberOfSegments),
   timeout_(TouchkeyKeyDivisionMapping::kDefaultDetectionTimeout),
   detectionParameter_(TouchkeyKeyDivisionMapping::kDefaultDetectionParameter),
   retriggerable_(false),
   retriggerNumFrames_(TouchkeyKeyDivisionMapping::kDefaultRetriggerNumFrames),
   retriggerKeepsVelocity_(true),
   referenceNote_(0), globalOffsetCents_(0)
 {
     //setName("/touchkeys/segmentpitch");
-    setBendParameters();
-}
-
-void TouchkeyKeyDivisionMappingFactory::setMIDIPitchWheelRange(float maxBendSemitones) {
-    if(maxBendSemitones <= 0)
-        return;
-    pitchWheelRangeSemitones_ = maxBendSemitones;
-    
     setBendParameters();
 }
 
 void TouchkeyKeyDivisionMappingFactory::setName(const string& name) {
     TouchkeyBaseMappingFactory<TouchkeyKeyDivisionMapping>::setName(name);

     mapping->setDetectionParameter(detectionParameter_);
     mapping->setRetriggerable(retriggerable_, retriggerNumFrames_, retriggerKeepsVelocity_);
 }
 
 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);
     }
 }