comparison Source/Mappings/Control/TouchkeyControlMappingFactory.cpp @ 41:85577160a0d4

Many changes: implement global application preferences on devices etc.; extended editor window support with Control mapping features for now

   OSC control message.
 */
 
 #include "TouchkeyControlMappingFactory.h"
 #include "TouchkeyControlMappingShortEditor.h"
+#include "TouchkeyControlMappingExtendedEditor.h"
 
 const int TouchkeyControlMappingFactory::kDefaultController = 1;
 const float TouchkeyControlMappingFactory::kDefaultOutputRangeMin = 0.0;
 const float TouchkeyControlMappingFactory::kDefaultOutputRangeMax = 127.0;
 const float TouchkeyControlMappingFactory::kDefaultOutputDefault = 0.0;

 TouchkeyControlMappingFactory::~TouchkeyControlMappingFactory() {
 
 }
 
 // ***** Accessors / Modifiers *****
+
+int TouchkeyControlMappingFactory::getDirection() {
+    // Get the direction of motion. This is always positive for
+    if(inputType_ == TouchkeyControlMapping::kTypeAbsolute)
+        return TouchkeyControlMapping::kDirectionPositive;
+    return direction_;
+}
 
 void TouchkeyControlMappingFactory::setInputParameter(int inputParameter) {
     inputParameter_ = inputParameter;
 }
 

         else
             outputDefault_ = outputDefault_ * 128.0;
     }
 
     setMidiParameters(controller, inputRangeMin_, inputRangeMax_, inputRangeCenter_,
-                      outputDefault_, outputRangeMin_, outputRangeMax_);
+                      outputDefault_, outputRangeMin_, outputRangeMax_,
+                      -1, use14BitControl_, outOfRangeBehavior_);
     
     // Listen to incoming controls from the keyboard too, if this is enabled
     // in MidiKeyboardSegment
     if(midiConverter_ != 0) {
         midiConverter_->listenToIncomingControl(midiControllerNumber_);

     // Update control
     //if(midiConverter_ == 0)
     //    return;
     //midiConverter_->setControlMinValue(controlName_.c_str(), inputRangeMin_);
     setMidiParameters(midiControllerNumber_, inputRangeMin_, inputRangeMax_, inputRangeCenter_,
-                      outputDefault_, outputRangeMin_, outputRangeMax_);
+                      outputDefault_, outputRangeMin_, outputRangeMax_,
+                      -1, use14BitControl_, outOfRangeBehavior_);
 }
 
 void TouchkeyControlMappingFactory::setRangeInputMax(float inputMax) {
     if(inputMax < -1.0)
         inputRangeMax_ = -1.0;

     // Update control
     //if(midiConverter_ == 0)
     //    return;
     //midiConverter_->setControlMaxValue(controlName_.c_str(), inputRangeMax_);
     setMidiParameters(midiControllerNumber_, inputRangeMin_, inputRangeMax_, inputRangeCenter_,
-                      outputDefault_, outputRangeMin_, outputRangeMax_);
+                      outputDefault_, outputRangeMin_, outputRangeMax_,
+                      -1, use14BitControl_, outOfRangeBehavior_);
 }
 
 void TouchkeyControlMappingFactory::setRangeInputCenter(float inputCenter) {
     if(inputCenter < -1.0)
         inputRangeCenter_ = -1.0;

     // Update control
     //if(midiConverter_ == 0)
     //    return;
     //midiConverter_->setControlCenterValue(controlName_.c_str(), inputRangeCenter_);
     setMidiParameters(midiControllerNumber_, inputRangeMin_, inputRangeMax_, inputRangeCenter_,
-                      outputDefault_, outputRangeMin_, outputRangeMax_);
+                      outputDefault_, outputRangeMin_, outputRangeMax_,
+                      -1, use14BitControl_, outOfRangeBehavior_);
 }
 
 void TouchkeyControlMappingFactory::setRangeOutputMin(float outputMin) {
     outputRangeMin_ = outputMin;
     
     setMidiParameters(midiControllerNumber_, inputRangeMin_, inputRangeMax_, inputRangeCenter_,
-                      outputDefault_, outputRangeMin_, outputRangeMax_);
+                      outputDefault_, outputRangeMin_, outputRangeMax_,
+                      -1, use14BitControl_, outOfRangeBehavior_);
 }
 
 void TouchkeyControlMappingFactory::setRangeOutputMax(float outputMax) {
     outputRangeMax_ = outputMax;
     
     setMidiParameters(midiControllerNumber_, inputRangeMin_, inputRangeMax_, inputRangeCenter_,
-                      outputDefault_, outputRangeMin_, outputRangeMax_);
+                      outputDefault_, outputRangeMin_, outputRangeMax_,
+                      -1, use14BitControl_, outOfRangeBehavior_);
 }
 
 void TouchkeyControlMappingFactory::setRangeOutputDefault(float outputDefault) {
     outputDefault_ = outputDefault;
     
     setMidiParameters(midiControllerNumber_, inputRangeMin_, inputRangeMax_, inputRangeCenter_,
-                      outputDefault_, outputRangeMin_, outputRangeMax_);
+                      outputDefault_, outputRangeMin_, outputRangeMax_,
+                      -1, use14BitControl_, outOfRangeBehavior_);
 }
 
 void TouchkeyControlMappingFactory::setThreshold(float threshold) {
     threshold_ = threshold;
 }

     ignoresThreeFingers_ = ignoresThree;
 }
 
 void TouchkeyControlMappingFactory::setDirection(int direction) {
     direction_ = direction;
+}
+
+void TouchkeyControlMappingFactory::setOutOfRangeBehavior(int behavior) {
+    outOfRangeBehavior_ = behavior;
+    
+    setMidiParameters(midiControllerNumber_, inputRangeMin_, inputRangeMax_, inputRangeCenter_,
+                      outputDefault_, outputRangeMin_, outputRangeMax_,
+                      -1, use14BitControl_, outOfRangeBehavior_);
+}
+
+void TouchkeyControlMappingFactory::setUses14BitControl(bool use) {
+    use14BitControl_ = use;
+
+    setMidiParameters(midiControllerNumber_, inputRangeMin_, inputRangeMax_, inputRangeCenter_,
+                      outputDefault_, outputRangeMin_, outputRangeMax_,
+                      -1, use14BitControl_, outOfRangeBehavior_);
 }
 
 // ***** GUI Support *****
 MappingEditorComponent* TouchkeyControlMappingFactory::createBasicEditor() {
     return new TouchkeyControlMappingShortEditor(*this);
 }
+
+MappingEditorComponent* TouchkeyControlMappingFactory::createExtendedEditor() {
+    return new TouchkeyControlMappingExtendedEditor(*this);
+}
+
 
 // ****** Preset Save/Load ******
 XmlElement* TouchkeyControlMappingFactory::getPreset() {
     PropertySet properties;