summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour
diff options
context:
space:
mode:
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r--libs/ardour/ardour/parameter_descriptor.h2
-rw-r--r--libs/ardour/ardour/value_as_string.h11
2 files changed, 3 insertions, 10 deletions
diff --git a/libs/ardour/ardour/parameter_descriptor.h b/libs/ardour/ardour/parameter_descriptor.h
index 9d219d17af..9a8c559d6e 100644
--- a/libs/ardour/ardour/parameter_descriptor.h
+++ b/libs/ardour/ardour/parameter_descriptor.h
@@ -43,6 +43,8 @@ struct LIBARDOUR_API ParameterDescriptor : public Evoral::ParameterDescriptor
HZ, ///< Frequency in Hertz
};
+ static std::string midi_note_name (uint8_t);
+
ParameterDescriptor(const Evoral::Parameter& parameter);
ParameterDescriptor();
diff --git a/libs/ardour/ardour/value_as_string.h b/libs/ardour/ardour/value_as_string.h
index c2f40fc8c4..9e042b78fa 100644
--- a/libs/ardour/ardour/value_as_string.h
+++ b/libs/ardour/ardour/value_as_string.h
@@ -46,16 +46,7 @@ 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) {