diff options
author | Robin Gareus <robin@gareus.org> | 2017-06-19 12:33:43 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2017-06-21 18:12:16 +0200 |
commit | 555fcb89e541a8aaf1beb3df234e60569a667876 (patch) | |
tree | d8997206cbea82d2a9f9da88f272ba4a15b108a3 /gtk2_ardour/generic_pluginui.cc | |
parent | fe83e1e2ed450814dfec0ffed7a2c2559c6fa8b6 (diff) |
GUI: prepare for API changes
remove use of
- unbound_min/max
- list->default_value and min/max_y
Diffstat (limited to 'gtk2_ardour/generic_pluginui.cc')
-rw-r--r-- | gtk2_ardour/generic_pluginui.cc | 31 |
1 files changed, 5 insertions, 26 deletions
diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc index a655203920..4267d30a43 100644 --- a/gtk2_ardour/generic_pluginui.cc +++ b/gtk2_ardour/generic_pluginui.cc @@ -902,12 +902,6 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter& param, UIConfiguration::instance().color ("meter background top") ); - info->min_unbound = desc.min_unbound; - info->max_unbound = desc.max_unbound; - - info->min = desc.lower; - info->max = desc.upper; - control_ui->label.set_angle(90); HBox* center = manage (new HBox); @@ -1094,27 +1088,12 @@ GenericPluginUI::output_update () buf[len] = '\0'; (*i)->display_label->set_text (buf); - /* autoscaling for the meter */ if ((*i)->meterinfo && (*i)->meterinfo->packed) { - - if (val < (*i)->meterinfo->min) { - if ((*i)->meterinfo->min_unbound) - (*i)->meterinfo->min = val; - else - val = (*i)->meterinfo->min; - } - - if (val > (*i)->meterinfo->max) { - if ((*i)->meterinfo->max_unbound) - (*i)->meterinfo->max = val; - else - val = (*i)->meterinfo->max; - } - - if ((*i)->meterinfo->max > (*i)->meterinfo->min ) { - float lval = (val - (*i)->meterinfo->min) / ((*i)->meterinfo->max - (*i)->meterinfo->min) ; - (*i)->meterinfo->meter->set (lval ); - } + const float upper = c->desc().upper; + const float lower = c->desc().lower; + val = std::min (upper, std::max (lower, val)); + float lval = (val - lower / (upper - lower)); + (*i)->meterinfo->meter->set (lval); } } } |