open un-writable sessions without complaining, and desensitize all/most actions that...

[ardour.git] / gtk2_ardour / generic_pluginui.cc

diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc
index 3a6c74fe914c5ab72b0717303a4cbbdf97c514dd..2a8738f8188cdd7ab40aa7e1ba9738fee0ca3b31 100644 (file)
--- a/gtk2_ardour/generic_pluginui.cc
+++ b/gtk2_ardour/generic_pluginui.cc
@@ -304,7 +304,7 @@ GenericPluginUI::ControlUI::ControlUI ()
           below). be sure to include a descender.
        */
 
-       set_size_request_to_display_given_text (*automate_button.get_child(), _("Mgnual"), 5, 5);
+       set_size_request_to_display_given_text (automate_button, _("Mgnual"), 15, 10);
 
        ignore_change = 0;
        display = 0;
@@ -448,7 +448,7 @@ GenericPluginUI::build_control_ui (guint32 port_index, PBD::Controllable* mcontr
 
                        control_ui->pack_start (control_ui->label, true, true);
                        control_ui->pack_start (*control_ui->button, false, true);
-                       //control_ui->pack_start (control_ui->automate_button, false, false);
+                       control_ui->pack_start (control_ui->automate_button, false, false);
 
                        if(plugin->get_parameter (port_index) > 0.5){
                                control_ui->button->set_active(true);
@@ -458,6 +458,11 @@ GenericPluginUI::build_control_ui (guint32 port_index, PBD::Controllable* mcontr
                
                        plugin->ParameterChanged.connect (bind (mem_fun(*this, &GenericPluginUI::toggle_parameter_changed), control_ui));
        
+                       control_ui->automate_button.signal_clicked().connect (bind (mem_fun(*this, &GenericPluginUI::astate_clicked), control_ui, (uint32_t) port_index));
+                       automation_state_changed (control_ui);
+                       insert->automation_list (port_index).automation_state_changed.connect 
+                               (bind (mem_fun(*this, &GenericPluginUI::automation_state_changed), control_ui));
+
                        return control_ui;
                }
        
@@ -479,9 +484,6 @@ GenericPluginUI::build_control_ui (guint32 port_index, PBD::Controllable* mcontr
                        control_ui->adjustment->set_lower (log(control_ui->adjustment->get_lower()));
                }
        
-               float delta = desc.upper - desc.lower;
-
-               control_ui->adjustment->set_page_size (delta/100.0);
                control_ui->adjustment->set_step_increment (desc.step);
                control_ui->adjustment->set_page_increment (desc.largestep);
 
@@ -497,6 +499,7 @@ GenericPluginUI::build_control_ui (guint32 port_index, PBD::Controllable* mcontr
                        control_ui->control->set_name (X_("PluginSlider"));
                        control_ui->control->set_style (BarController::LeftToRight);
                        control_ui->control->set_use_parent (true);
+                       control_ui->control->set_logarithmic (control_ui->logarithmic);
 
                        control_ui->control->StartGesture.connect (bind (mem_fun(*this, &GenericPluginUI::start_touch), control_ui));
                        control_ui->control->StopGesture.connect (bind (mem_fun(*this, &GenericPluginUI::stop_touch), control_ui));