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 a5bfc3853183ab23cda0f0cc09d67306fceb060d..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;
@@ -450,12 +450,19 @@ GenericPluginUI::build_control_ui (guint32 port_index, PBD::Controllable* mcontr
                        control_ui->pack_start (*control_ui->button, false, true);
                        control_ui->pack_start (control_ui->automate_button, false, false);
 
-                       control_ui->button->signal_clicked().connect (bind (mem_fun(*this, &GenericPluginUI::control_port_toggled), control_ui));
-               
-                       if(plugin->get_parameter (port_index) == 1){
+                       if(plugin->get_parameter (port_index) > 0.5){
                                control_ui->button->set_active(true);
                        }
 
+                       control_ui->button->signal_clicked().connect (bind (mem_fun(*this, &GenericPluginUI::control_port_toggled), control_ui));
+               
+                       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;
                }
        
@@ -477,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);
 
@@ -495,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));
@@ -574,9 +579,10 @@ GenericPluginUI::build_control_ui (guint32 port_index, PBD::Controllable* mcontr
                control_ui->meterinfo->packed = true;
                
                output_controls.push_back (control_ui);
+
+               plugin->ParameterChanged.connect (bind (mem_fun(*this, &GenericPluginUI::parameter_changed), control_ui));
        }
        
-       plugin->ParameterChanged.connect (bind (mem_fun(*this, &GenericPluginUI::parameter_changed), control_ui));
        return control_ui;
 }
 
@@ -639,6 +645,18 @@ GenericPluginUI::control_adjustment_changed (ControlUI* cui)
        insert->set_parameter (cui->port_index, (float) value);
 }
 
+void
+GenericPluginUI::toggle_parameter_changed (uint32_t abs_port_id, float val, ControlUI* cui)
+{
+       if (!cui->ignore_change && cui->port_index == abs_port_id) {
+               if (val > 0.5) {
+                       cui->button->set_active (true);
+               } else {
+                       cui->button->set_active (false);
+               }
+       }
+}
+
 void
 GenericPluginUI::parameter_changed (uint32_t abs_port_id, float val, ControlUI* cui)
 {
@@ -668,14 +686,6 @@ GenericPluginUI::update_control_display (ControlUI* cui)
                                break;
                        }
                }
-       } else if (cui->adjustment == 0) {
-
-               if (val > 0.5) {
-                       cui->button->set_active (true);
-               } else {
-                       cui->button->set_active (false);
-               }
-
        } else {
                if (cui->logarithmic) {
                        val = log(val);
@@ -690,9 +700,9 @@ GenericPluginUI::update_control_display (ControlUI* cui)
 void
 GenericPluginUI::control_port_toggled (ControlUI* cui)
 {
-       if (!cui->ignore_change) {
-               insert->set_parameter (cui->port_index, cui->button->get_active());
-       }
+       cui->ignore_change++;
+       insert->set_parameter (cui->port_index, cui->button->get_active());
+       cui->ignore_change--;
 }
 
 void