ardour/livetrax
13
0
Fork 0
Code

Use a AutoSpin rather than a combo box for input

Browse Source 
parameters marked up as scalePoint with fewer labels
than there are possible values for the parameter
(should fix #2612).


git-svn-id: svn://localhost/ardour2/branches/3.0@11744 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2012-03-21 16:39:04 +00:00
parent 05fcf75eaf
commit 0af622521b
2 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gtk2_ardour/generic_pluginui.cc
View File

@ -459,10 +459,24 @@ GenericPluginUI::automation_state_changed (ControlUI* cui)
}
static bool
integer_printer (char buf[32], Adjustment &adj)
bool
GenericPluginUI::integer_printer (char buf[32], Adjustment &adj, ControlUI* cui)
{
snprintf (buf, 32, "%.0f", adj.get_value());
float const v = adj.get_value ();
if (cui->scale_points) {
Plugin::ScalePoints::const_iterator i = cui->scale_points->begin ();
while (i != cui->scale_points->end() && i->second != v) {
++i;
}
if (i != cui->scale_points->end ()) {
snprintf (buf, 32, "%s", i->first.c_str());
return true;
}
}
snprintf (buf, 32, "%.0f", v);
return true;
}
@ -496,11 +510,17 @@ GenericPluginUI::build_control_ui (guint32 port_index, boost::shared_ptr<Automat
if (plugin->parameter_is_input(port_index)) {
/* Build a combo box */
/* See if there any named values for our input value */
control_ui->scale_points = plugin->get_scale_points (port_index);
if (control_ui->scale_points) {
/* If this parameter is an integer, work out the number of distinct values
it can take on (assuming that lower and upper values are allowed).
*/
int const steps = desc.integer_step ? (desc.upper - desc.lower + 1) / desc.step : 0;
if (control_ui->scale_points && steps && control_ui->scale_points->size() == steps) {
/* There is a label for each possible value of this input, so build a combo box */
std::vector<std::string> labels;
for (
ARDOUR::Plugin::ScalePoints::const_iterator i = control_ui->scale_points->begin();
@ -576,7 +596,7 @@ GenericPluginUI::build_control_ui (guint32 port_index, boost::shared_ptr<Automat
if (desc.integer_step) {
control_ui->clickbox = new ClickBox (adj, "PluginUIClickBox");
Gtkmm2ext::set_size_request_to_display_given_text (*control_ui->clickbox, "g9999999", 2, 2);
control_ui->clickbox->set_printer (sigc::ptr_fun (integer_printer));
control_ui->clickbox->set_printer (sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::integer_printer), control_ui));
} else {
//sigc::slot<void,char*,uint32_t> pslot = sigc::bind (sigc::mem_fun(*this, &GenericPluginUI::print_parameter), (uint32_t) port_index);

2
gtk2_ardour/plugin_ui.h
View File

@ -269,7 +269,9 @@ class GenericPluginUI : public PlugUIBase, public Gtk::VBox
void start_touch (ControlUI*);
void stop_touch (ControlUI*);
/* XXX: remove */
void print_parameter (char *buf, uint32_t len, uint32_t param);
bool integer_printer (char* buf, Gtk::Adjustment &, ControlUI *);
};
class PluginUIWindow : public Gtk::Window