X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgeneric_pluginui.cc;h=010dfe52376ff5add98592ce161a997eb574cff0;hb=d599be115df673bc5833527491788afa1156c7f5;hp=77a2536b1adde1085f5b40b832e32afa41459c5d;hpb=35a20a8bcc7fb01dbb9f7f04ada5ad6dd4aa268f;p=ardour.git diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc index 77a2536b1a..010dfe5237 100644 --- a/gtk2_ardour/generic_pluginui.cc +++ b/gtk2_ardour/generic_pluginui.cc @@ -87,6 +87,7 @@ GenericPluginUI::GenericPluginUI (boost::shared_ptr pi, bool scrol set_latency_label (); smaller_hbox->pack_start (latency_button, false, false, 4); + smaller_hbox->pack_start (pin_management_button, false, false, 4); smaller_hbox->pack_start (_preset_combo, false, false); smaller_hbox->pack_start (_preset_modified, false, false); smaller_hbox->pack_start (add_button, false, false); @@ -272,7 +273,6 @@ GenericPluginUI::build () } control_uis.push_back(cui); - input_controls_with_automation.push_back (cui); } } @@ -316,6 +316,9 @@ GenericPluginUI::build () automation_play_all_button.signal_clicked.connect(sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::set_all_automation), ARDOUR::Play)); automation_write_all_button.signal_clicked.connect(sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::set_all_automation), ARDOUR::Write)); automation_touch_all_button.signal_clicked.connect(sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::set_all_automation), ARDOUR::Touch)); + + /* XXX This is a workaround for AutomationControl not knowing about preset loads */ + plugin->PresetLoaded.connect (*this, invalidator (*this), boost::bind (&GenericPluginUI::update_input_displays, this), gui_context ()); } @@ -585,15 +588,17 @@ GenericPluginUI::automation_state_changed (ControlUI* cui) // don't lock to avoid deadlock because we're triggered by // AutomationControl::Changed() while the automation lock is taken + AutoState state = insert->get_parameter_automation_state (cui->parameter()); + + cui->automate_button.set_active((state != ARDOUR::Off)); + if (cui->knobtable) { cui->automate_button.set_text ( - GainMeterBase::astate_string ( - insert->get_parameter_automation_state (cui->parameter())) - ); + GainMeterBase::astate_string (state)); return; } - switch (insert->get_parameter_automation_state (cui->parameter()) & (ARDOUR::Off|Play|Touch|Write)) { + switch (state & (ARDOUR::Off|Play|Touch|Write)) { case ARDOUR::Off: cui->automate_button.set_text (S_("Automation|Manual")); break; @@ -697,6 +702,7 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter& param, return control_ui; } + assert(mcontrol); /* See if there any named values for our input value */ control_ui->scale_points = desc.scale_points; @@ -724,65 +730,51 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter& param, i->second))); } - mcontrol->Changed.connect(control_connections, invalidator(*this), - boost::bind(&GenericPluginUI::ui_parameter_changed, - this, control_ui), - gui_context()); - - if (use_knob) { - control_ui->knobtable = manage (new Table()); - control_ui->pack_start(*control_ui->knobtable, true, false); - control_ui->knobtable->attach (control_ui->label, 0, 1, 0, 1); - control_ui->knobtable->attach (*control_ui->combo, 0, 1, 1, 2); - } else { - control_ui->pack_start(control_ui->label, true, true); - control_ui->pack_start(*control_ui->combo, false, true); - } - update_control_display(control_ui); - return control_ui; - } - + } else { - /* create the controller */ + /* create the controller */ - /* XXX memory leak: SliderController not destroyed by ControlUI - * destructor, and manage() reports object hierarchy - * ambiguity. - */ - if (mcontrol) { + /* XXX memory leak: SliderController not destroyed by ControlUI + * destructor, and manage() reports object hierarchy + * ambiguity. + */ control_ui->controller = AutomationController::create(insert, mcontrol->parameter(), desc, mcontrol, use_knob); - } - /* XXX this code is not right yet, because it doesn't handle - the absence of bounds in any sensible fashion. - */ + /* Control UI's don't need the rapid timer workaround */ + control_ui->controller->stop_updating (); + + /* XXX this code is not right yet, because it doesn't handle + the absence of bounds in any sensible fashion. + */ - Adjustment* adj = control_ui->controller->adjustment(); + Adjustment* adj = control_ui->controller->adjustment(); - if (desc.integer_step && !desc.toggled) { - control_ui->clickbox = new ClickBox (adj, "PluginUIClickBox", true); - Gtkmm2ext::set_size_request_to_display_given_text (*control_ui->clickbox, "g9999999", 2, 2); - if (desc.unit == ParameterDescriptor::MIDI_NOTE) { - control_ui->clickbox->set_printer (sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::midinote_printer), control_ui)); + if (desc.integer_step && !desc.toggled) { + control_ui->clickbox = new ClickBox (adj, "PluginUIClickBox", true); + Gtkmm2ext::set_size_request_to_display_given_text (*control_ui->clickbox, "g9999999", 2, 2); + if (desc.unit == ParameterDescriptor::MIDI_NOTE) { + control_ui->clickbox->set_printer (sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::midinote_printer), control_ui)); + } else { + control_ui->clickbox->set_printer (sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::integer_printer), control_ui)); + } + } else if (desc.toggled) { + control_ui->controller->set_size_request (req.height, req.height); + } else if (use_knob) { + control_ui->controller->set_size_request (req.height * 1.5, req.height * 1.5); } else { - control_ui->clickbox->set_printer (sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::integer_printer), control_ui)); + control_ui->controller->set_size_request (200, req.height); + control_ui->controller->set_name (X_("ProcessorControlSlider")); } - } else if (desc.toggled) { - control_ui->controller->set_size_request (req.height, req.height); - } else if (use_knob) { - control_ui->controller->set_size_request (req.height * 1.5, req.height * 1.5); - } else { - control_ui->controller->set_size_request (200, req.height); - control_ui->controller->set_name (X_("ProcessorControlSlider")); - } - if (!desc.integer_step && !desc.toggled && use_knob) { - control_ui->spin_box = manage (new ArdourSpinner (mcontrol, adj, insert)); - } + if (!desc.integer_step && !desc.toggled && use_knob) { + control_ui->spin_box = manage (new ArdourSpinner (mcontrol, adj, insert)); + } - adj->set_value (mcontrol->internal_to_interface(value)); + adj->set_value (mcontrol->internal_to_interface(value)); + + } if (use_knob) { set_size_request_to_display_given_text (control_ui->automate_button, "M", 2, 2); @@ -791,7 +783,10 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter& param, control_ui->knobtable = manage (new Table()); control_ui->pack_start(*control_ui->knobtable, true, true); - if (control_ui->clickbox) { + if (control_ui->combo) { + control_ui->knobtable->attach (control_ui->label, 0, 1, 0, 1); + control_ui->knobtable->attach (*control_ui->combo, 0, 1, 1, 2); + } else if (control_ui->clickbox) { control_ui->knobtable->attach (*control_ui->clickbox, 0, 2, 0, 1); control_ui->knobtable->attach (control_ui->label, 0, 1, 1, 2, FILL, SHRINK); control_ui->knobtable->attach (control_ui->automate_button, 1, 2, 1, 2, SHRINK, SHRINK, 2, 0); @@ -819,7 +814,9 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter& param, } else { control_ui->pack_start (control_ui->label, true, true); - if (control_ui->clickbox) { + if (control_ui->combo) { + control_ui->pack_start(*control_ui->combo, false, true); + } else if (control_ui->clickbox) { control_ui->pack_start (*control_ui->clickbox, false, false); } else if (control_ui->spin_box) { control_ui->pack_start (*control_ui->spin_box, false, false); @@ -835,8 +832,16 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter& param, control_ui->automate_button.set_sensitive (false); set_tooltip(control_ui->automate_button, _("This control cannot be automated")); } else { - control_ui->automate_button.signal_clicked.connect (sigc::bind (sigc::mem_fun(*this, &GenericPluginUI::astate_clicked), control_ui)); - mcontrol->alist()->automation_state_changed.connect (control_connections, invalidator (*this), boost::bind (&GenericPluginUI::automation_state_changed, this, control_ui), gui_context()); + control_ui->automate_button.signal_button_press_event().connect ( + sigc::bind (sigc::mem_fun(*this, &GenericPluginUI::astate_button_event), + control_ui), + false); + mcontrol->alist()->automation_state_changed.connect ( + control_connections, + invalidator (*this), + boost::bind (&GenericPluginUI::automation_state_changed, this, control_ui), + gui_context()); + input_controls_with_automation.push_back (control_ui); } if (desc.toggled) { @@ -849,10 +854,11 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter& param, automation_state_changed (control_ui); + /* Add to the list of CUIs that need manual update to workaround + * AutomationControl not knowing about preset loads */ input_controls.push_back (control_ui); - input_controls_with_automation.push_back (control_ui); - } else if (!is_input) { + } else { control_ui->display = manage (new EventBox); control_ui->display->set_name ("ParameterValueDisplay"); @@ -920,20 +926,28 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter& param, } if (mcontrol) { - mcontrol->Changed.connect (control_connections, invalidator (*this), boost::bind (&GenericPluginUI::ui_parameter_changed, this, control_ui), gui_context()); + mcontrol->Changed.connect(control_connections, invalidator(*this), + boost::bind(&GenericPluginUI::ui_parameter_changed, + this, control_ui), + gui_context()); } return control_ui; } -void -GenericPluginUI::astate_clicked (ControlUI* cui) +bool +GenericPluginUI::astate_button_event (GdkEventButton* ev, ControlUI* cui) { + if (ev->button != 1) { + return true; + } + using namespace Menu_Helpers; if (automation_menu == 0) { automation_menu = manage (new Menu); automation_menu->set_name ("ArdourContextMenu"); + automation_menu->set_reserve_toggle_size(false); } MenuList& items (automation_menu->items()); @@ -948,7 +962,10 @@ GenericPluginUI::astate_clicked (ControlUI* cui) items.push_back (MenuElem (_("Touch"), sigc::bind (sigc::mem_fun(*this, &GenericPluginUI::set_automation_state), (AutoState) Touch, cui))); - automation_menu->popup (1, gtk_get_current_event_time()); + anchored_menu_popup(automation_menu, &cui->automate_button, cui->automate_button.get_text(), + 1, ev->time); + + return true; } void @@ -1013,6 +1030,18 @@ GenericPluginUI::update_control_display (ControlUI* cui) }*/ } +void +GenericPluginUI::update_input_displays () +{ + /* XXX This is a workaround for AutomationControl not knowing about preset loads */ + for (vector::iterator i = input_controls.begin(); + i != input_controls.end(); + ++i) { + update_control_display(*i); + } + return; +} + void GenericPluginUI::control_combo_changed (ControlUI* cui, float value) { @@ -1034,14 +1063,9 @@ GenericPluginUI::start_updating (GdkEventAny*) bool GenericPluginUI::stop_updating (GdkEventAny*) { - for (vector::iterator i = input_controls.begin(); i != input_controls.end(); ++i) { - (*i)->controller->stop_updating (); - } - if (output_controls.size() > 0 ) { screen_update_connection.disconnect(); } - return false; }