a few more Location related lua bindings

[ardour.git] / libs / ardour / ardour / value_as_string.h

diff --git a/libs/ardour/ardour/value_as_string.h b/libs/ardour/ardour/value_as_string.h
index 6c17ace5d3baba3f0140ae99e684701ab193a47c..9e042b78fa2acf39d9420cfcbe715d17ef52b3d4 100644 (file)
--- a/libs/ardour/ardour/value_as_string.h
+++ b/libs/ardour/ardour/value_as_string.h
@@ -46,22 +46,15 @@ value_as_string(const ARDOUR::ParameterDescriptor& desc,
 
        // Value is not a scale point, print it normally
        if (desc.unit == ARDOUR::ParameterDescriptor::MIDI_NOTE) {
-               if (v >= 0 && v <= 127) {
-                       const int         num          = rint(v);
-                       static const char names[12][3] = {
-                               "C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B"
-                       };
-                       snprintf(buf, sizeof(buf), "%s %d", names[num % 12], (num / 12) - 2);
-               } else {
-                       // Odd, invalid range, just print the number
-                       snprintf(buf, sizeof(buf), "%.0f", v);
-               }
+               snprintf(buf, sizeof(buf), "%s", ParameterDescriptor::midi_note_name (rint(v)).c_str());
+       } else if (!desc.print_fmt.empty()) {
+               snprintf(buf, sizeof(buf), desc.print_fmt.c_str(), v);
        } else if (desc.integer_step) {
                snprintf(buf, sizeof(buf), "%d", (int)v);
        } else {
-               snprintf(buf, sizeof(buf), "%.2f", v);
+               snprintf(buf, sizeof(buf), "%.3f", v);
        }
-       if (desc.unit == ARDOUR::ParameterDescriptor::DB) {
+       if (desc.print_fmt.empty() && desc.unit == ARDOUR::ParameterDescriptor::DB) {
                // TODO: Move proper dB printing from AutomationLine here
                return std::string(buf) + " dB";
        }