rework design of midi clock ticker to avoid expensive generalization that has turned...

[ardour.git] / libs / surfaces / generic_midi / midicontrollable.cc

diff --git a/libs/surfaces/generic_midi/midicontrollable.cc b/libs/surfaces/generic_midi/midicontrollable.cc
index 33780eea3468e5f03f5a2fb5790a9868dece79b6..226502f0ae2cc4b04a1064fbd1ce681bf312f264 100644 (file)
--- a/libs/surfaces/generic_midi/midicontrollable.cc
+++ b/libs/surfaces/generic_midi/midicontrollable.cc
@@ -17,7 +17,6 @@
 
 */
 
-#define __STDC_FORMAT_MACROS 1
 #include <stdint.h>
 #include <cmath>
 #include <climits>
@@ -49,6 +48,7 @@ MIDIControllable::MIDIControllable (Port& p, bool m)
        _learned = false; /* from URI */
        setting = false;
        last_value = 0; // got a better idea ?
+       last_controllable_value = 0.0f;
        control_type = none;
        _control_description = "MIDI Control: none";
        control_additional = (byte) -1;
@@ -64,6 +64,7 @@ MIDIControllable::MIDIControllable (Port& p, Controllable& c, bool m)
        _learned = true; /* from controllable */
        setting = false;
        last_value = 0; // got a better idea ?
+       last_controllable_value = 0.0f;
        control_type = none;
        _control_description = "MIDI Control: none";
        control_additional = (byte) -1;
@@ -152,17 +153,24 @@ MIDIControllable::control_to_midi (float val)
 float
 MIDIControllable::midi_to_control(float val)
 {
-       const float midi_range = 127.0f; // TODO: NRPN etc.
+        /* fiddle with MIDI value so that we get an odd number of integer steps
+           and can thus represent "middle" precisely as 0.5. this maps to
+           the range 0..+1.0
+
+           TODO: 14bit values
+        */
+
+        val = (val == 0.0f ? 0.0f : (val-1.0f) / 126.0f);
 
         if (controllable->is_gain_like()) {
-                return slider_position_to_gain (val/midi_range);
+                return slider_position_to_gain (val);
         }
 
        float control_min = controllable->lower ();
        float control_max = controllable->upper ();
        const float control_range = control_max - control_min;
 
-       return  val / midi_range * control_range + control_min;
+       return  (val * control_range) + control_min;
 }
 
 void
@@ -211,7 +219,20 @@ MIDIControllable::midi_sense_controller (Parser &, EventTwoBytes *msg)
        if (control_additional == msg->controller_number) {
 
                if (!controllable->is_toggle()) {
-                       controllable->set_value (midi_to_control (msg->value));
+                       float new_value = msg->value;
+                       float max_value = max(last_controllable_value, new_value);
+                       float min_value = min(last_controllable_value, new_value);
+                       float range = max_value - min_value;
+                       float threshold = 10;
+
+                       // prevent jumps when MIDI controller and controllable are "out of sync"
+                       if (range < threshold &&
+                           controllable->get_value() <= midi_to_control(max_value) &&
+                           controllable->get_value() >= midi_to_control(min_value)) {
+                               controllable->set_value (midi_to_control (new_value) );
+                       }
+
+                       last_controllable_value = new_value;
                } else {
                        if (msg->value > 64.0f) {
                                controllable->set_value (1);
@@ -344,7 +365,7 @@ MIDIControllable::send_feedback ()
 {
        byte msg[3];
 
-       if (!_learned || setting || !feedback || control_type == none) {
+       if (!_learned || setting || !feedback || control_type == none || !controllable) {
                return;
        }
 
@@ -363,7 +384,7 @@ MIDIControllable::send_feedback ()
 MIDI::byte*
 MIDIControllable::write_feedback (MIDI::byte* buf, int32_t& bufsize, bool /*force*/)
 {
-       if (control_type != none && feedback && bufsize > 2) {
+       if (controllable && control_type != none && feedback && bufsize > 2) {
 
                MIDI::byte gm;
 
@@ -430,9 +451,11 @@ MIDIControllable::get_state ()
 
        XMLNode* node = new XMLNode ("MIDIControllable");
 
-       if (!_current_uri.empty()) {
+       if (_current_uri.empty()) {
+                node->add_property ("id", controllable->id().to_s());
+       } else {
                node->add_property ("uri", _current_uri);
-       }
+        }
 
        if (controllable) {
                snprintf (buf, sizeof(buf), "0x%x", (int) control_type);