Fix another crash at exit.

[ardour.git] / gtk2_ardour / generic_pluginui.cc

diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc
index 066aa95fa88b366b4fbfc568b406c2c7c302b9e0..bcc91a673d6a8af43febb1b510f55f496fc784aa 100644 (file)
--- a/gtk2_ardour/generic_pluginui.cc
+++ b/gtk2_ardour/generic_pluginui.cc
@@ -730,6 +730,8 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter&             param,
                                                           i->second)));
                        }
 
+                       control_ui->combo->set_controllable (mcontrol);
+
                        update_control_display(control_ui);
 
                } else {
@@ -740,7 +742,7 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter&             param,
                         * destructor, and manage() reports object hierarchy
                         * ambiguity.
                         */
-                       control_ui->controller = AutomationController::create(insert, mcontrol->parameter(), desc, mcontrol, use_knob);
+                       control_ui->controller = AutomationController::create(mcontrol->parameter(), desc, mcontrol, use_knob);
 
                        /* Control UI's don't need the rapid timer workaround */
                        control_ui->controller->stop_updating ();
@@ -759,6 +761,7 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter&             param,
                                } else {
                                        control_ui->clickbox->set_printer (sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::integer_printer), control_ui));
                                }
+                               control_ui->clickbox->set_controllable (mcontrol);
                        } else if (desc.toggled) {
                                ArdourButton* but = dynamic_cast<ArdourButton*> (control_ui->controller->widget());
                                assert(but);
@@ -773,7 +776,7 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter&             param,
                        }
 
                        if (!desc.integer_step && !desc.toggled && use_knob) {
-                               control_ui->spin_box = manage (new ArdourSpinner (mcontrol, adj, insert));
+                               control_ui->spin_box = manage (new ArdourSpinner (mcontrol, adj));
                        }
 
                        adj->set_value (mcontrol->internal_to_interface(value));
@@ -797,7 +800,6 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter&             param,
                        } else if (control_ui->spin_box) {
                                ArdourKnob* knob = dynamic_cast<ArdourKnob*>(control_ui->controller->widget ());
                                knob->set_tooltip_prefix (desc.label + ": ");
-                               knob->set_printer (insert);
                                Alignment *align = manage (new Alignment (.5, .5, 0, 0));
                                align->add (*control_ui->controller);
                                control_ui->knobtable->attach (*align, 0, 1, 0, 1, EXPAND, SHRINK, 1, 2);
@@ -879,7 +881,10 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter&             param,
                control_ui->vbox = manage (new VBox);
                control_ui->vbox->set_spacing(3);
 
-               if (desc.integer_step || desc.enumeration) {
+               if (desc.unit == ParameterDescriptor::MIDI_NOTE) {
+                       control_ui->vbox->pack_end (*control_ui->display, false, false);
+                       control_ui->vbox->pack_end (control_ui->label, false, false);
+               } else if (desc.integer_step || desc.enumeration) {
                        control_ui->vbox->pack_end (*control_ui->display, false, false);
                        control_ui->vbox->pack_end (control_ui->label, false, false);
                } else {
@@ -900,12 +905,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);
@@ -1086,30 +1085,14 @@ GenericPluginUI::output_update ()
        for (vector<ControlUI*>::iterator i = output_controls.begin(); i != output_controls.end(); ++i) {
                float val = plugin->get_parameter ((*i)->parameter().id());
                char buf[32];
-               snprintf (buf, sizeof(buf), "%.2f", val);
+               boost::shared_ptr<ReadOnlyControl> c = insert->control_output ((*i)->parameter().id());
+               const std::string& str = ARDOUR::value_as_string(c->desc(), Variant(val));
+               size_t len = str.copy(buf, 31);
+               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 );
-                       }
+                       (*i)->meterinfo->meter->set (c->desc().to_interface (val));
                }
        }
 }