X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgeneric_pluginui.cc;h=ef2de43309948078f52083f052901cea149d956e;hb=9e5b7db89f381c70232fab35dc21fd885863f998;hp=dbb86277e0a19b69c647ebb13308e11d7c125eef;hpb=8eb18fdd76fb54447795b792df5adb3fa5746be5;p=ardour.git diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc index dbb86277e0..ef2de43309 100644 --- a/gtk2_ardour/generic_pluginui.cc +++ b/gtk2_ardour/generic_pluginui.cc @@ -43,11 +43,13 @@ #include "ardour/session.h" #include "ardour/value_as_string.h" -#include "ardour_ui.h" #include "prompter.h" #include "plugin_ui.h" #include "gui_thread.h" #include "automation_controller.h" +#include "timers.h" +#include "tooltips.h" +#include "ui_config.h" #include "i18n.h" @@ -56,6 +58,7 @@ using namespace ARDOUR; using namespace PBD; using namespace Gtkmm2ext; using namespace Gtk; +using namespace ARDOUR_UI_UTILS; GenericPluginUI::GenericPluginUI (boost::shared_ptr pi, bool scrollable) : PlugUIBase (pi) @@ -78,31 +81,34 @@ GenericPluginUI::GenericPluginUI (boost::shared_ptr pi, bool scrol HBox* smaller_hbox = manage (new HBox); HBox* automation_hbox = manage (new HBox); smaller_hbox->set_spacing (4); - automation_hbox->set_spacing (4); + automation_hbox->set_spacing (6); Label* combo_label = manage (new Label (_("Presets"))); combo_label->set_use_markup (true); - latency_button.add (latency_label); - latency_button.signal_clicked().connect (sigc::mem_fun (*this, &PlugUIBase::latency_button_clicked)); + latency_button.signal_clicked.connect (sigc::mem_fun (*this, &PlugUIBase::latency_button_clicked)); set_latency_label (); - smaller_hbox->pack_start (latency_button, false, false, 10); + smaller_hbox->pack_start (latency_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); smaller_hbox->pack_start (save_button, false, false); smaller_hbox->pack_start (delete_button, false, false); - smaller_hbox->pack_start (bypass_button, false, true); - - automation_manual_all_button.set_label(_("Manual All")); - automation_play_all_button.set_label(_("Play All")); - automation_write_all_button.set_label(_("Write All")); - automation_touch_all_button.set_label(_("Touch All")); - - Gtk::Alignment *al = Gtk::manage(new Gtk::Alignment()); - al->set_size_request(6, 2); - automation_hbox->pack_start(*al, false, true); - + smaller_hbox->pack_start (reset_button, false, false, 4); + smaller_hbox->pack_start (bypass_button, false, true, 4); + + automation_manual_all_button.set_text(_("Manual")); + automation_manual_all_button.set_name (X_("generic button")); + automation_play_all_button.set_text(_("Play")); + automation_play_all_button.set_name (X_("generic button")); + automation_write_all_button.set_text(_("Write")); + automation_write_all_button.set_name (X_("generic button")); + automation_touch_all_button.set_text(_("Touch")); + automation_touch_all_button.set_name (X_("generic button")); + + Label* l = manage (new Label (_("All Automation"))); + l->set_alignment (1.0, 0.5); + automation_hbox->pack_start (*l, true, true); automation_hbox->pack_start (automation_manual_all_button, false, false); automation_hbox->pack_start (automation_play_all_button, false, false); automation_hbox->pack_start (automation_write_all_button, false, false); @@ -118,6 +124,7 @@ GenericPluginUI::GenericPluginUI (boost::shared_ptr pi, bool scrol pack_end (description_expander, false, false); } + v1_box->set_spacing (6); v1_box->pack_start (*smaller_hbox, false, true); v1_box->pack_start (*automation_hbox, false, true); v2_box->pack_start (focus_button, false, true); @@ -176,7 +183,7 @@ int value = -1; static int match_or_digit(char c1, char c2) { return c1 == c2 || (isdigit(c1) && isdigit(c2)); -} +} static std::size_t matching_chars_at_head(const string s1, const string s2) { std::size_t length, n = 0; @@ -186,7 +193,7 @@ std::size_t length, n = 0; if (!match_or_digit(s1[n], s2[n])) break; n++; - } + } return n; } @@ -199,7 +206,7 @@ std::size_t s1pos, s2pos, n = 0; if (!match_or_digit(s1[s1pos], s2[s2pos]) ) break; n++; - } + } return n; } @@ -292,10 +299,11 @@ GenericPluginUI::build () const std::string param_docs = plugin->get_parameter_docs(i); if (!param_docs.empty()) { - ARDOUR_UI::instance()->set_tip(cui, param_docs.c_str()); + set_tooltip(cui, param_docs.c_str()); } control_uis.push_back(cui); + input_controls_with_automation.push_back (cui); } } @@ -326,12 +334,6 @@ GenericPluginUI::build () if (!descs.empty()) { plugin->announce_property_values(); } - - // Connect automation *_all buttons - automation_manual_all_button.signal_clicked().connect(boost::bind(&GenericPluginUI::automation_manual_all, this, control_uis)); - automation_play_all_button.signal_clicked().connect(boost::bind(&GenericPluginUI::automation_play_all, this, control_uis)); - automation_write_all_button.signal_clicked().connect(boost::bind(&GenericPluginUI::automation_write_all, this, control_uis)); - automation_touch_all_button.signal_clicked().connect(boost::bind(&GenericPluginUI::automation_touch_all, this, control_uis)); // Add special controls to UI, and build list of normal controls to be layed out later std::vector cui_controls_list; @@ -372,13 +374,13 @@ GenericPluginUI::build () // Iterate over the list of controls to find which adjacent controls // are similar enough to be grouped together. - + string label, previous_label = ""; std::vector numbers_in_labels(cui_controls_list.size()); - + std::vector similarity_scores(cui_controls_list.size()); float most_similar = 0.0, least_similar = 1.0; - + i = 0; for (vector::iterator cuip = cui_controls_list.begin(); cuip != cui_controls_list.end(); ++cuip, ++i) { label = (*cuip)->label.get_text(); @@ -387,12 +389,12 @@ GenericPluginUI::build () if (i > 0) { // A hand-wavy calculation of how similar this control's // label is to the previous. - similarity_scores[i] = - (float) ( - ( matching_chars_at_head(label, previous_label) + + similarity_scores[i] = + (float) ( + ( matching_chars_at_head(label, previous_label) + matching_chars_at_tail(label, previous_label) + - 1 - ) + 1 + ) ) / (label.length() + previous_label.length()); if (numbers_in_labels[i] >= 0) { similarity_scores[i] += (numbers_in_labels[i] == numbers_in_labels[i-1]); @@ -404,32 +406,32 @@ GenericPluginUI::build () } // cerr << "label: " << label << " sim: " << fixed << setprecision(3) << similarity_scores[i] << " num: " << numbers_in_labels[i] << endl; - previous_label = label; + previous_label = label; } - + // cerr << "most similar: " << most_similar << ", least similar: " << least_similar << endl; float similarity_threshold; - + if (most_similar > 1.0) { similarity_threshold = default_similarity_threshold; } else { similarity_threshold = most_similar - (1 - default_similarity_threshold); } - + // Now iterate over the list of controls to display them, placing an - // HSeparator between controls of less than a certain similarity, and + // HSeparator between controls of less than a certain similarity, and // starting a new column when necessary. - + i = 0; for (vector::iterator cuip = cui_controls_list.begin(); cuip != cui_controls_list.end(); ++cuip, ++i) { ControlUI* cui = *cuip; - + if (!is_scrollable) { x++; } - + if (x > max_controls_per_column || similarity_scores[i] <= similarity_threshold) { if (x > min_controls_per_column) { frame = manage (new Frame); @@ -475,6 +477,11 @@ GenericPluginUI::build () output_table.show_all (); button_table.show_all (); + + automation_manual_all_button.signal_clicked.connect(sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::set_all_automation), ARDOUR::Off)); + 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)); } GenericPluginUI::ControlUI::ControlUI (const Evoral::Parameter& p) @@ -483,7 +490,7 @@ GenericPluginUI::ControlUI::ControlUI (const Evoral::Parameter& p) , file_button(NULL) { automate_button.set_name ("PluginAutomateButton"); - ARDOUR_UI::instance()->set_tip (automate_button, _("Automation control")); + set_tooltip (automate_button, _("Automation control")); /* XXX translators: use a string here that will be at least as long as the longest automation label (see ::automation_state_changed() @@ -594,7 +601,7 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter& param, 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. @@ -605,7 +612,7 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter& param, ARDOUR::ScalePoints::const_iterator i = control_ui->scale_points->begin(); i != control_ui->scale_points->end(); ++i) { - + labels.push_back(i->first); } @@ -661,7 +668,7 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter& param, control_ui->file_button = manage(new Gtk::FileChooserButton(Gtk::FILE_CHOOSER_ACTION_OPEN)); control_ui->file_button->set_title(desc.label); - control_ui->pack_start (control_ui->label, true, true); + control_ui->pack_start (control_ui->label, false, true); control_ui->pack_start (*control_ui->file_button, true, true); // Connect signals (TODO: do this via the Control) @@ -691,7 +698,7 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter& param, Adjustment* adj = control_ui->controller->adjustment(); if (desc.integer_step) { - control_ui->clickbox = new ClickBox (adj, "PluginUIClickBox", desc.enumeration); + 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)); @@ -704,9 +711,6 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter& param, control_ui->controller->set_size_request (200, req.height); control_ui->controller->set_name (X_("ProcessorControlSlider")); - control_ui->controller->StartGesture.connect (sigc::bind (sigc::mem_fun(*this, &GenericPluginUI::start_touch), control_ui)); - control_ui->controller->StopGesture.connect (sigc::bind (sigc::mem_fun(*this, &GenericPluginUI::stop_touch), control_ui)); - } adj->set_value (mcontrol->internal_to_interface(value)); @@ -728,10 +732,10 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter& param, automation_state_changed (control_ui); - mcontrol->Changed.connect (control_connections, invalidator (*this), boost::bind (&GenericPluginUI::ui_parameter_changed, this, control_ui), gui_context()); mcontrol->alist()->automation_state_changed.connect (control_connections, invalidator (*this), boost::bind (&GenericPluginUI::automation_state_changed, this, control_ui), gui_context()); input_controls.push_back (control_ui); + input_controls_with_automation.push_back (control_ui); } else if (!is_input) { @@ -761,8 +765,8 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter& param, 0xcccc00ff, 0xcccc00ff, 0xffaa00ff, 0xffaa00ff, 0xff0000ff, - ARDOUR_UI::config()->get_MeterBackgroundBot(), - ARDOUR_UI::config()->get_MeterBackgroundTop() + UIConfiguration::instance().color ("meter background bottom"), + UIConfiguration::instance().color ("meter background top") ); info->min_unbound = desc.min_unbound; @@ -800,18 +804,6 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter& param, return control_ui; } -void -GenericPluginUI::start_touch (GenericPluginUI::ControlUI* cui) -{ - cui->control->start_touch (cui->control->session().transport_frame()); -} - -void -GenericPluginUI::stop_touch (GenericPluginUI::ControlUI* cui) -{ - cui->control->stop_touch (false, cui->control->session().transport_frame()); -} - void GenericPluginUI::astate_clicked (ControlUI* cui) { @@ -837,40 +829,14 @@ GenericPluginUI::astate_clicked (ControlUI* cui) automation_menu->popup (1, gtk_get_current_event_time()); } -void -GenericPluginUI::automation_manual_all(std::vector& controls) -{ - for (std::vector::iterator control_it = controls.begin(); control_it != controls.end(); ++control_it) - { - set_automation_state((AutoState) ARDOUR::Off, (*control_it)); - } -} - -void -GenericPluginUI::automation_play_all(std::vector& controls) -{ - for (std::vector::iterator control_it = controls.begin(); control_it != controls.end(); ++control_it) - { - set_automation_state((AutoState) Play, (*control_it)); - } -} - -void -GenericPluginUI::automation_write_all(std::vector& controls) -{ - for (std::vector::iterator control_it = controls.begin(); control_it != controls.end(); ++control_it) - { - set_automation_state((AutoState) Write, (*control_it)); - } -} - -void -GenericPluginUI::automation_touch_all(std::vector& controls) +void +GenericPluginUI::set_all_automation (AutoState as) { - for (std::vector::iterator control_it = controls.begin(); control_it != controls.end(); ++control_it) - { - set_automation_state((AutoState) Touch, (*control_it)); - } + 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)); + } + } } void @@ -957,7 +923,7 @@ GenericPluginUI::control_port_toggled (ControlUI* cui) } else { cui->button->set_name ("PluginEditorButton"); } - insert->automation_control (cui->parameter())->set_value (active); + insert->automation_control (cui->parameter())->set_value (active, Controllable::NoGroup); cui->ignore_change--; } @@ -966,7 +932,7 @@ GenericPluginUI::control_combo_changed (ControlUI* cui) { 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]); + insert->automation_control (cui->parameter())->set_value ((*cui->scale_points)[value], Controllable::NoGroup); } } @@ -975,8 +941,7 @@ GenericPluginUI::start_updating (GdkEventAny*) { if (output_controls.size() > 0 ) { screen_update_connection.disconnect(); - screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect - (sigc::mem_fun(*this, &GenericPluginUI::output_update)); + screen_update_connection = Timers::super_rapid_connect (sigc::mem_fun(*this, &GenericPluginUI::output_update)); } return false; }