X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fgeneric_pluginui.cc;h=a655203920743c9cb4f04bbed673e1ce55718d3a;hb=af2ee3c8564c7d60cadb130b8c7ad1f4cddd2216;hp=637eca0bbf8305174826b71a5d11c1067886f461;hpb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;p=ardour.git diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc index 637eca0bbf..a655203920 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); @@ -150,6 +151,14 @@ GenericPluginUI::GenericPluginUI (boost::shared_ptr pi, bool scrol prefheight = 0; build (); + + /* Listen for property changes that are not notified normally because + * AutomationControl has only support for numeric values currently. + * The only case is Variant::PATH for now */ + plugin->PropertyChanged.connect(*this, invalidator(*this), + boost::bind(&GenericPluginUI::path_property_changed, this, _1, _2), + gui_context()); + main_contents.show (); } @@ -213,7 +222,7 @@ void GenericPluginUI::build () { std::vector control_uis; - bool grid = true; + bool grid = plugin->parameter_count() > 0; // Build a ControlUI for each control port for (size_t i = 0; i < plugin->parameter_count(); ++i) { @@ -264,7 +273,6 @@ GenericPluginUI::build () } control_uis.push_back(cui); - input_controls_with_automation.push_back (cui); } } @@ -308,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 ()); } @@ -514,6 +525,8 @@ GenericPluginUI::automatic_layout (const std::vector& control_uis) } else { delete output_table; } + show_all(); + } void @@ -544,7 +557,7 @@ GenericPluginUI::ControlUI::ControlUI (const Evoral::Parameter& p) , meterinfo (0) , knobtable (0) { - automate_button.set_name ("PluginAutomateButton"); + automate_button.set_name ("plugin automation state button"); set_tooltip (automate_button, _("Automation control")); /* XXX translators: use a string here that will be at least as long @@ -552,7 +565,7 @@ GenericPluginUI::ControlUI::ControlUI (const Evoral::Parameter& p) below). be sure to include a descender. */ - set_size_request_to_display_given_text (automate_button, _("Mgnual"), 12, 6); + automate_button.set_sizing_text(_("Mgnual")); ignore_change = false; update_pending = false; @@ -577,15 +590,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; @@ -651,62 +666,13 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter& param, control_ui->label.set_name ("PluginParameterLabel"); control_ui->set_spacing (5); - Gtk::Requisition req (control_ui->automate_button.size_request()); - if (is_input) { - /* See if there any named values for our input value */ - control_ui->scale_points = desc.scale_points; - - /* If this parameter is an integer, work out the number of distinct values - it can take on (assuming that lower and upper values are allowed). - */ - int const steps = desc.integer_step ? (desc.upper - desc.lower + 1) / desc.step : 0; - - if (control_ui->scale_points && ((steps && int (control_ui->scale_points->size()) == steps) || desc.enumeration)) { - - /* Either: - * a) There is a label for each possible value of this input, or - * b) This port is marked as being an enumeration. - */ - - std::vector labels; - for ( - ARDOUR::ScalePoints::const_iterator i = control_ui->scale_points->begin(); - i != control_ui->scale_points->end(); - ++i) { - - labels.push_back(i->first); - } - - // TODO use ArdourDropDown - control_ui->combo = new Gtk::ComboBoxText(); - set_popdown_strings(*control_ui->combo, labels); - control_ui->combo->signal_changed().connect( - sigc::bind (sigc::mem_fun(*this, &GenericPluginUI::control_combo_changed), - control_ui)); - 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; - } - if (desc.datatype == Variant::PATH) { + /* We shouldn't get that type for input ports */ + assert(param.type() == PluginPropertyAutomation); + /* Build a file selector button */ // Create/add controller @@ -723,74 +689,114 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter& param, control_ui->pack_start (*control_ui->file_button, true, true); } - // Connect signals (TODO: do this via the Control) + // Monitor changes from the user. control_ui->file_button->signal_file_set().connect( - sigc::bind(sigc::mem_fun(*this, &GenericPluginUI::set_property), + sigc::bind(sigc::mem_fun(*this, &GenericPluginUI::set_path_property), desc, control_ui->file_button)); - plugin->PropertyChanged.connect(*this, invalidator(*this), - boost::bind(&GenericPluginUI::property_changed, this, _1, _2), - gui_context()); - _property_controls.insert(std::make_pair(desc.key, control_ui->file_button)); - control_ui->file_button = control_ui->file_button; + /* Add the filebutton control to a map so that we can update it when + * the corresponding property changes. This doesn't go through the usual + * AutomationControls, because they don't support non-numeric values. */ + _filepath_controls.insert(std::make_pair(desc.key, control_ui->file_button)); return control_ui; } - /* create the controller */ + assert(mcontrol); - /* XXX memory leak: SliderController not destroyed by ControlUI - * destructor, and manage() reports object hierarchy - * ambiguity. - */ - if (mcontrol) { - control_ui->controller = AutomationController::create(insert, mcontrol->parameter(), desc, mcontrol, use_knob); - } + /* See if there any named values for our input value */ + control_ui->scale_points = desc.scale_points; - /* XXX this code is not right yet, because it doesn't handle - the absence of bounds in any sensible fashion. + /* If this parameter is an integer, work out the number of distinct values + it can take on (assuming that lower and upper values are allowed). */ + int const steps = desc.integer_step ? (desc.upper - desc.lower + 1) / desc.step : 0; + + if (control_ui->scale_points && ((steps && int (control_ui->scale_points->size()) == steps) || desc.enumeration)) { - Adjustment* adj = control_ui->controller->adjustment(); + /* Either: + * a) There is a label for each possible value of this input, or + * b) This port is marked as being an enumeration. + */ - 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)); + control_ui->combo = new ArdourDropdown(); + for (ARDOUR::ScalePoints::const_iterator i = control_ui->scale_points->begin(); + i != control_ui->scale_points->end(); + ++i) { + control_ui->combo->AddMenuElem(Menu_Helpers::MenuElem( + i->first, + sigc::bind(sigc::mem_fun(*this, &GenericPluginUI::control_combo_changed), + control_ui, + i->second))); } - } 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); + + update_control_display(control_ui); + } 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)); - } + /* create the controller */ + + /* XXX memory leak: SliderController not destroyed by ControlUI + * destructor, and manage() reports object hierarchy + * ambiguity. + */ + 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 (); + + /* 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(); + + 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) { + ArdourButton* but = dynamic_cast (control_ui->controller->widget()); + assert(but); + but->set_tweaks(ArdourButton::Square); + } else if (use_knob) { + /* Delay size request so that styles are gotten right */ + control_ui->controller->widget()->signal_size_request().connect( + sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::knob_size_request), control_ui)); + } else { + control_ui->controller->set_size_request (200, -1); + control_ui->controller->set_name (X_("ProcessorControlSlider")); + } + + if (!desc.integer_step && !desc.toggled && use_knob) { + control_ui->spin_box = manage (new ArdourSpinner (mcontrol, adj)); + } + + 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); + control_ui->automate_button.set_sizing_text("M"); control_ui->label.set_alignment (0.5, 0.5); 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); } else if (control_ui->spin_box) { ArdourKnob* knob = dynamic_cast(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); @@ -811,7 +817,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); @@ -827,11 +835,19 @@ 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) { + if (desc.toggled && !control_ui->combo) { control_ui->button = true; ArdourButton* but = dynamic_cast(control_ui->controller->widget ()); assert (but); @@ -841,10 +857,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"); @@ -861,7 +878,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 { @@ -912,20 +932,37 @@ 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) +GenericPluginUI::knob_size_request(Gtk::Requisition* req, ControlUI* cui) { + Gtk::Requisition astate_req (cui->automate_button.size_request()); + const int size = (int) (astate_req.height * 1.5); + req->width = max(req->width, size); + req->height = max(req->height, size); +} + + +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()); @@ -940,16 +977,17 @@ 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 GenericPluginUI::set_all_automation (AutoState as) { for (vector::iterator i = input_controls_with_automation.begin(); i != input_controls_with_automation.end(); ++i) { - if ((*i)->controller || (*i)->button) { - set_automation_state (as, (*i)); - } + set_automation_state (as, (*i)); } } @@ -982,7 +1020,7 @@ GenericPluginUI::update_control_display (ControlUI* cui) if (cui->combo && cui->scale_points) { for (ARDOUR::ScalePoints::iterator it = cui->scale_points->begin(); it != cui->scale_points->end(); ++it) { if (it->second == val) { - cui->combo->set_active_text(it->first); + cui->combo->set_text(it->first); break; } } @@ -1006,11 +1044,22 @@ GenericPluginUI::update_control_display (ControlUI* cui) } void -GenericPluginUI::control_combo_changed (ControlUI* cui) +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) { - if (!cui->ignore_change && cui->scale_points) { - string value = cui->combo->get_active_text(); - insert->automation_control (cui->parameter())->set_value ((*cui->scale_points)[value], Controllable::NoGroup); + if (!cui->ignore_change) { + insert->automation_control (cui->parameter())->set_value (value, Controllable::NoGroup); } } @@ -1027,14 +1076,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; } @@ -1044,7 +1088,10 @@ GenericPluginUI::output_update () for (vector::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 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 */ @@ -1073,17 +1120,17 @@ GenericPluginUI::output_update () } void -GenericPluginUI::set_property (const ParameterDescriptor& desc, - Gtk::FileChooserButton* widget) +GenericPluginUI::set_path_property (const ParameterDescriptor& desc, + Gtk::FileChooserButton* widget) { plugin->set_property(desc.key, Variant(Variant::PATH, widget->get_filename())); } void -GenericPluginUI::property_changed (uint32_t key, const Variant& value) +GenericPluginUI::path_property_changed (uint32_t key, const Variant& value) { - PropertyControls::iterator c = _property_controls.find(key); - if (c != _property_controls.end()) { + FilePathControls::iterator c = _filepath_controls.find(key); + if (c != _filepath_controls.end()) { c->second->set_filename(value.get_path()); } else { std::cerr << "warning: property change for property with no control" << std::endl;