From 66bf92f11c11160cf78fc411624391e493c1d96d Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Wed, 30 Oct 2019 01:17:12 +0100 Subject: [PATCH] Fix note-selection octave range (10 octaves: -1..9) --- gui/tuna.c | 5 ++++- lv2ttl/tuna.lv2.ttl.in | 2 +- lv2ttl/tuna1.h | 2 +- lv2ttl/tuna2.h | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gui/tuna.c b/gui/tuna.c index 2d89a44..3ba49d8 100644 --- a/gui/tuna.c +++ b/gui/tuna.c @@ -762,6 +762,9 @@ static bool cb_set_mode (RobWidget* handle, void *data) { mode = -1 - rintf(robtk_spin_get_value(ui->spb_octave)+1) * 12. - robtk_select_get_value(ui->sel_note); + if (mode < -128) { + mode = -128; + } break; } if (!ui->disable_signals) { @@ -864,7 +867,7 @@ static RobWidget * toplevel(TunaUI* ui, void * const top) robtk_sep_set_linewidth(ui->sep[2], 1); ui->spb_tuning = robtk_spin_new(220, 880, .5); - ui->spb_octave = robtk_spin_new(-1, 10, 1); + ui->spb_octave = robtk_spin_new(-1, 9, 1); ui->spb_freq = robtk_spin_new(20, 1000, .5); // TODO log-map ui->sel_mode = robtk_select_new(); ui->sel_note = robtk_select_new(); diff --git a/lv2ttl/tuna.lv2.ttl.in b/lv2ttl/tuna.lv2.ttl.in index b44c9f3..10c8cc6 100644 --- a/lv2ttl/tuna.lv2.ttl.in +++ b/lv2ttl/tuna.lv2.ttl.in @@ -54,7 +54,7 @@ lv2:symbol "mode" ; lv2:name "Mode" ; lv2:default 0 ; - lv2:minimum 0 ; + lv2:minimum -128 ; lv2:maximum 8000 ; lv2:portProperty lv2:integer; lv2:scalePoint [ rdfs:label "auto"; rdf:value 0 ; ] ; diff --git a/lv2ttl/tuna1.h b/lv2ttl/tuna1.h index 117678d..bba5e77 100644 --- a/lv2ttl/tuna1.h +++ b/lv2ttl/tuna1.h @@ -16,7 +16,7 @@ static const RtkLv2Description _plugin_tuna_one = { { "sysex", MIDI_OUT, nan, nan, nan, "MTS/SysEx output and Plugin to GUI communication"}, { "in", AUDIO_IN, nan, nan, nan, "Audio Input"}, { "out", AUDIO_OUT, nan, nan, nan, "Audio output"}, - { "mode", CONTROL_IN, 0.000000, 0.000000, 8000.000000, "Mode"}, + { "mode", CONTROL_IN, 0.000000, -128.000000, 8000.000000, "Mode"}, { "tuning", CONTROL_IN, 440.000000, 220.000000, 880.000000, "Tuning A440"}, { "rms", CONTROL_OUT, nan, -100.000000, -0.000000, "Signal Level (RMS)"}, { "freq_out", CONTROL_OUT, nan, 0.000000, 10000.000000, "Detected Frequency"}, diff --git a/lv2ttl/tuna2.h b/lv2ttl/tuna2.h index 28902ff..77731aa 100644 --- a/lv2ttl/tuna2.h +++ b/lv2ttl/tuna2.h @@ -16,7 +16,7 @@ static const RtkLv2Description _plugin_tuna_two = { { "sysex", MIDI_OUT, nan, nan, nan, "MTS/SysEx output and Plugin to GUI communication"}, { "in", AUDIO_IN, nan, nan, nan, "Audio Input"}, { "out", AUDIO_OUT, nan, nan, nan, "Audio output"}, - { "mode", CONTROL_IN, 0.000000, 0.000000, 8000.000000, "Mode"}, + { "mode", CONTROL_IN, 0.000000, -128.000000, 8000.000000, "Mode"}, { "tuning", CONTROL_IN, 440.000000, 220.000000, 880.000000, "Tuning A440"}, { "rms", CONTROL_OUT, nan, -100.000000, -0.000000, "Signal Level (RMS)"}, { "freq_out", CONTROL_OUT, nan, 0.000000, 10000.000000, "Detected Frequency"},