Prevent spinlock copy construction

[ardour.git] / gtk2_ardour / generic_pluginui.cc

diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc
index 6926a29b7855722888c0463dbd5fc84601f1a970..6e51d605dd0703213954fd516d329ca715373e79 100644 (file)
--- a/gtk2_ardour/generic_pluginui.cc
+++ b/gtk2_ardour/generic_pluginui.cc
@@ -224,6 +224,7 @@ GenericPluginUI::~GenericPluginUI ()
        if (output_controls.size() > 0) {
                screen_update_connection.disconnect();
        }
+       delete automation_menu;
        delete _pianomm;
 }
 
@@ -304,8 +305,9 @@ std::size_t s1pos, s2pos, n = 0;
        s1pos = s1.length();
        s2pos = s2.length();
        while (s1pos-- > 0 && s2pos-- > 0) {
-               if (!match_or_digit(s1[s1pos], s2[s2pos])       )
+               if (!match_or_digit(s1[s1pos], s2[s2pos])) {
                        break;
+               }
                n++;
        }
        return n;
@@ -901,32 +903,6 @@ GenericPluginUI::automation_state_changed (ControlUI* cui)
        }
 }
 
-bool
-GenericPluginUI::integer_printer (char buf[32], Adjustment &adj, ControlUI* cui)
-{
-       float const        v   = cui->control->interface_to_internal(adj.get_value ());
-       const std::string& str = ARDOUR::value_as_string(cui->control->desc(), Variant(v));
-       const size_t       len = str.copy(buf, 31);
-       buf[len] = '\0';
-       return true;
-}
-
-bool
-GenericPluginUI::midinote_printer (char buf[32], Adjustment &adj, ControlUI* cui)
-{
-       float const        v   = cui->control->interface_to_internal(adj.get_value ());
-       const std::string& str = ARDOUR::value_as_string(cui->control->desc(), Variant(v));
-       const size_t       len = str.copy(buf, 31);
-       buf[len] = '\0';
-       return true;
-}
-
-void
-GenericPluginUI::print_parameter (char *buf, uint32_t len, uint32_t param)
-{
-       plugin->print_parameter (param, buf, len);
-}
-
 /** Build a ControlUI for a parameter/property.
  * Note that mcontrol may be NULL for outputs.
  */
@@ -961,6 +937,7 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter&             param,
                        // Create/add controller
                        control_ui->file_button = manage(new Gtk::FileChooserButton(Gtk::FILE_CHOOSER_ACTION_OPEN));
                        control_ui->file_button->set_title(desc.label);
+                       Gtkmm2ext::add_volume_shortcuts (*control_ui->file_button);
 
                        if (use_knob) {
                                control_ui->knobtable = manage (new Table());