X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgeneric_pluginui.cc;h=b1d3b8c49d105d57f4dffef1870dcf3e13894643;hb=f72c8190354b662a93d30c7de4ffdc460a21ea20;hp=cba2cc24d9fafebc7128d776ce7aa111472576b2;hpb=9a7fbd53a2ef9158a397b865fe7e7e19659e9325;p=ardour.git diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc index cba2cc24d9..b1d3b8c49d 100644 --- a/gtk2_ardour/generic_pluginui.cc +++ b/gtk2_ardour/generic_pluginui.cc @@ -27,46 +27,47 @@ #include #include +#include + #include "pbd/stl_delete.h" +#include "pbd/unwind.h" #include "pbd/xml++.h" #include "pbd/failed_constructor.h" -#include -#include -#include -#include -#include -#include - #include "ardour/plugin.h" #include "ardour/plugin_insert.h" #include "ardour/session.h" #include "ardour/value_as_string.h" -#include "prompter.h" +#include "gtkmm2ext/utils.h" +#include "gtkmm2ext/doi.h" + +#include "widgets/ardour_knob.h" +#include "widgets/click_box.h" +#include "widgets/fastmeter.h" +#include "widgets/slider_controller.h" +#include "widgets/tooltips.h" + #include "plugin_ui.h" +#include "plugin_display.h" #include "gui_thread.h" #include "automation_controller.h" +#include "gain_meter.h" #include "timers.h" -#include "tooltips.h" #include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; using namespace PBD; using namespace Gtkmm2ext; +using namespace ArdourWidgets; using namespace Gtk; using namespace ARDOUR_UI_UTILS; GenericPluginUI::GenericPluginUI (boost::shared_ptr pi, bool scrollable) : PlugUIBase (pi) - , button_table (initial_button_rows, initial_button_cols) - , output_table (initial_output_rows, initial_output_cols) - , hAdjustment(0.0, 0.0, 0.0) - , vAdjustment(0.0, 0.0, 0.0) - , scroller_view(hAdjustment, vAdjustment) , automation_menu (0) , is_scrollable(scrollable) { @@ -89,6 +90,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); @@ -136,25 +138,31 @@ GenericPluginUI::GenericPluginUI (boost::shared_ptr pi, bool scrol main_contents.pack_start (*constraint_hbox, false, false); - if (is_scrollable ) { - scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC); - scroller.set_name ("PluginEditor"); - scroller_view.set_name("PluginEditor"); - scroller_view.add (hpacker); - scroller.add (scroller_view); - - main_contents.pack_start (scroller, true, true); - + if (is_scrollable) { + Gtk::ScrolledWindow *scroller = manage (new Gtk::ScrolledWindow()); + scroller->set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC); + scroller->set_name ("PluginEditor"); + scroller->add (hpacker); + main_contents.pack_start (*scroller, true, true); } else { main_contents.pack_start (hpacker, false, false); } pi->ActiveChanged.connect (active_connection, invalidator (*this), boost::bind (&GenericPluginUI::processor_active_changed, this, boost::weak_ptr(pi)), gui_context()); - bypass_button.set_active (!pi->active()); + bypass_button.set_active (!pi->enabled()); 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 (); } GenericPluginUI::~GenericPluginUI () @@ -212,62 +220,16 @@ std::size_t s1pos, s2pos, n = 0; static const guint32 min_controls_per_column = 17, max_controls_per_column = 24; static const float default_similarity_threshold = 0.3; +static const guint32 max_columns_for_big_autostate = 2; void GenericPluginUI::build () { - guint32 i = 0; - guint32 x = 0; - Frame* frame; - Frame* bt_frame; - VBox* box; - int output_row, output_col; - int button_row, button_col; - int output_rows, output_cols; - int button_rows, button_cols; - - hpacker.set_spacing (10); - - output_rows = initial_output_rows; - output_cols = initial_output_cols; - button_rows = initial_button_rows; - button_cols = initial_button_cols; - output_row = 0; - button_row = 0; - output_col = 0; - button_col = 0; - - button_table.set_homogeneous (false); - button_table.set_row_spacings (2); - button_table.set_col_spacings (2); - output_table.set_homogeneous (true); - output_table.set_row_spacings (2); - output_table.set_col_spacings (2); - button_table.set_border_width (5); - output_table.set_border_width (5); - - hpacker.set_border_width (10); - - bt_frame = manage (new Frame); - bt_frame->set_name ("BaseFrame"); - bt_frame->set_label (_("Switches")); - bt_frame->add (button_table); - hpacker.pack_start(*bt_frame, true, true); - - box = manage (new VBox); - box->set_border_width (5); - box->set_spacing (1); - - frame = manage (new Frame); - frame->set_name ("BaseFrame"); - frame->set_label (_("Controls")); - frame->add (*box); - hpacker.pack_start(*frame, true, true); - std::vector control_uis; + bool grid = plugin->parameter_count() > 0; // Build a ControlUI for each control port - for (i = 0; i < plugin->parameter_count(); ++i) { + for (size_t i = 0; i < plugin->parameter_count(); ++i) { if (plugin->parameter_is_control (i)) { @@ -285,6 +247,11 @@ GenericPluginUI::build () const float value = plugin->get_parameter(i); ControlUI* cui; + Plugin::UILayoutHint hint; + + if (!plugin->get_layout(i, hint)) { + grid = false; + } boost::shared_ptr c = boost::dynamic_pointer_cast( @@ -292,18 +259,24 @@ GenericPluginUI::build () ParameterDescriptor desc; plugin->get_parameter_descriptor(i, desc); - if ((cui = build_control_ui (param, desc, c, value, plugin->parameter_is_input(i))) == 0) { + if ((cui = build_control_ui (param, desc, c, value, plugin->parameter_is_input(i), hint.knob)) == 0) { error << string_compose(_("Plugin Editor: could not build control element for port %1"), i) << endmsg; continue; } + if (grid) { + cui->x0 = hint.x0; + cui->x1 = hint.x1; + cui->y0 = hint.y0; + cui->y1 = hint.y1; + } + const std::string param_docs = plugin->get_parameter_docs(i); if (!param_docs.empty()) { set_tooltip(cui, param_docs.c_str()); } control_uis.push_back(cui); - input_controls_with_automation.push_back (cui); } } @@ -335,39 +308,117 @@ GenericPluginUI::build () plugin->announce_property_values(); } + if (grid) { + custom_layout (control_uis); + } else { + automatic_layout (control_uis); + } + + output_update (); + + 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)); + + /* 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 ()); +} + + +void +GenericPluginUI::automatic_layout (const std::vector& control_uis) +{ + guint32 x = 0; + + static const int32_t initial_button_rows = 12; + static const int32_t initial_button_cols = 1; + static const int32_t initial_output_rows = 1; + static const int32_t initial_output_cols = 4; + + Gtk::Table* button_table = manage (new Gtk::Table (initial_button_rows, initial_button_cols)); + Gtk::Table* output_table = manage (new Gtk::Table (initial_output_rows, initial_output_cols)); + + Frame* frame; + Frame* bt_frame; + VBox* box; + int output_row, output_col; + int button_row, button_col; + int output_rows, output_cols; + int button_rows, button_cols; + + hpacker.set_spacing (10); + hpacker.set_border_width (10); + + output_rows = initial_output_rows; + output_cols = initial_output_cols; + button_rows = initial_button_rows; + button_cols = initial_button_cols; + output_row = 0; + button_row = 0; + output_col = 0; + button_col = 0; + + button_table->set_homogeneous (false); + button_table->set_row_spacings (2); + button_table->set_col_spacings (2); + output_table->set_homogeneous (true); + output_table->set_row_spacings (2); + output_table->set_col_spacings (2); + button_table->set_border_width (5); + output_table->set_border_width (5); + + + bt_frame = manage (new Frame); + bt_frame->set_name ("BaseFrame"); + bt_frame->set_label (_("Switches")); + bt_frame->add (*button_table); + hpacker.pack_start(*bt_frame, true, true); + + box = manage (new VBox); + box->set_border_width (5); + box->set_spacing (1); + + frame = manage (new Frame); + frame->set_name ("BaseFrame"); + frame->set_label (_("Controls")); + frame->add (*box); + hpacker.pack_start(*frame, true, true); + // Add special controls to UI, and build list of normal controls to be layed out later std::vector cui_controls_list; - for (i = 0; i < control_uis.size(); ++i) { + for (size_t i = 0; i < control_uis.size(); ++i) { ControlUI* cui = control_uis[i]; - if (cui->controller || cui->clickbox || cui->combo) { - // Get all of the controls into a list, so that - // we can lay them out a bit more nicely later. - cui_controls_list.push_back(cui); - } else if (cui->button || cui->file_button) { + if (cui->button || cui->file_button) { if (!is_scrollable && button_row == button_rows) { button_row = 0; if (++button_col == button_cols) { button_cols += 2; - button_table.resize (button_rows, button_cols); + button_table->resize (button_rows, button_cols); } } - button_table.attach (*cui, button_col, button_col + 1, button_row, button_row+1, + button_table->attach (*cui, button_col, button_col + 1, button_row, button_row+1, FILL|EXPAND, FILL); button_row++; + } else if (cui->controller || cui->clickbox || cui->combo) { + // Get all of the controls into a list, so that + // we can lay them out a bit more nicely later. + cui_controls_list.push_back(cui); + } else if (cui->display) { - output_table.attach (*cui, output_col, output_col + 1, output_row, output_row+1, + output_table->attach (*cui, output_col, output_col + 1, output_row, output_row+1, FILL|EXPAND, FILL); // TODO: The meters should be divided into multiple rows if (++output_col == output_cols) { output_cols ++; - output_table.resize (output_rows, output_cols); + output_table->resize (output_rows, output_cols); } } } @@ -381,7 +432,7 @@ GenericPluginUI::build () std::vector similarity_scores(cui_controls_list.size()); float most_similar = 0.0, least_similar = 1.0; - i = 0; + size_t i = 0; for (vector::iterator cuip = cui_controls_list.begin(); cuip != cui_controls_list.end(); ++cuip, ++i) { label = (*cuip)->label.get_text(); numbers_in_labels[i] = get_number(label); @@ -424,6 +475,7 @@ GenericPluginUI::build () // starting a new column when necessary. i = 0; + size_t columns = 1; for (vector::iterator cuip = cui_controls_list.begin(); cuip != cui_controls_list.end(); ++cuip, ++i) { ControlUI* cui = *cuip; @@ -443,6 +495,7 @@ GenericPluginUI::build () frame->add (*box); hpacker.pack_start(*frame, true, true); x = 0; + ++columns; } else { HSeparator *split = new HSeparator(); split->set_size_request(-1, 5); @@ -453,6 +506,14 @@ GenericPluginUI::build () box->pack_start (*cui, false, false); } + if (columns > max_columns_for_big_autostate) { + for (vector::iterator cuip = cui_controls_list.begin(); + cuip != cui_controls_list.end(); + ++cuip) { + set_short_autostate(*cuip, true); + } + } + if (is_scrollable) { prefheight = 30 * i; } @@ -461,49 +522,73 @@ GenericPluginUI::build () hpacker.remove (*frame); } - if (button_table.children().empty()) { + if (button_table->children().empty()) { hpacker.remove (*bt_frame); + delete button_table; + } else { + button_table->show_all (); } - if (!output_table.children().empty()) { + if (!output_table->children().empty()) { frame = manage (new Frame); frame->set_name ("BaseFrame"); frame->set_label(_("Meters")); - frame->add (output_table); + frame->add (*output_table); hpacker.pack_end (*frame, true, true); + output_table->show_all (); + } else { + delete output_table; } - output_update (); + if (plugin->has_inline_display () && plugin->inline_display_in_gui ()) { + PluginDisplay* pd = manage (new PluginDisplay (plugin, 300)); + hpacker.pack_end (*pd, true, true); + } + show_all(); - 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)); +void +GenericPluginUI::custom_layout (const std::vector& control_uis) +{ + Gtk::Table* layout = manage (new Gtk::Table ()); + + for (vector::const_iterator i = control_uis.begin(); i != control_uis.end(); ++i) { + ControlUI* cui = *i; + if (cui->x0 < 0 || cui->y0 < 0) { + continue; + } + layout->attach (*cui, cui->x0, cui->x1, cui->y0, cui->y1, FILL, SHRINK, 2, 2); + } + hpacker.pack_start (*layout, true, true); + + if (plugin->has_inline_display () && plugin->inline_display_in_gui ()) { + PluginDisplay* pd = manage (new PluginDisplay (plugin, 300)); + hpacker.pack_end (*pd, true, true); + } } GenericPluginUI::ControlUI::ControlUI (const Evoral::Parameter& p) : param(p) , automate_button (X_("")) // force creation of a label - , file_button(NULL) + , combo (0) + , clickbox (0) + , file_button (0) + , spin_box (0) + , display (0) + , hbox (0) + , vbox (0) + , 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 - as the longest automation label (see ::automation_state_changed() - below). be sure to include a descender. - */ - - set_size_request_to_display_given_text (automate_button, _("Mgnual"), 15, 10); + ignore_change = false; + update_pending = false; + button = false; - ignore_change = 0; - display = 0; - button = 0; - clickbox = 0; - meterinfo = 0; + x0 = x1 = y0 = y1 = -1; } GenericPluginUI::ControlUI::~ControlUI() @@ -514,6 +599,21 @@ GenericPluginUI::ControlUI::~ControlUI() } } +void +GenericPluginUI::set_short_autostate (ControlUI* cui, bool value) +{ + cui->short_autostate = value; + if (value) { + cui->automate_button.set_sizing_text("M"); + } else { + /* XXX translators: use a string here that will be at least as long + as the longest automation label (see ::automation_state_changed() + below). be sure to include a descender. */ + cui->automate_button.set_sizing_text(_("Mgnual")); + } + automation_state_changed(cui); +} + void GenericPluginUI::automation_state_changed (ControlUI* cui) { @@ -521,21 +621,32 @@ 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 - switch (insert->get_parameter_automation_state (cui->parameter()) & (ARDOUR::Off|Play|Touch|Write)) { + + AutoState state = insert->get_parameter_automation_state (cui->parameter()); + + cui->automate_button.set_active((state != ARDOUR::Off)); + + if (cui->short_autostate) { + cui->automate_button.set_text ( + GainMeterBase::astate_string (state)); + return; + } + + switch (state & (ARDOUR::Off|Play|Touch|Write)) { case ARDOUR::Off: - cui->automate_button.set_label (S_("Automation|Manual")); + cui->automate_button.set_text (S_("Automation|Manual")); break; case Play: - cui->automate_button.set_label (_("Play")); + cui->automate_button.set_text (_("Play")); break; case Write: - cui->automate_button.set_label (_("Write")); + cui->automate_button.set_text (_("Write")); break; case Touch: - cui->automate_button.set_label (_("Touch")); + cui->automate_button.set_text (_("Touch")); break; default: - cui->automate_button.set_label (_("???")); + cui->automate_button.set_text (_("???")); break; } } @@ -574,24 +685,58 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter& param, const ParameterDescriptor& desc, boost::shared_ptr mcontrol, float value, - bool is_input) + bool is_input, + bool use_knob) { ControlUI* control_ui = 0; control_ui = manage (new ControlUI (param)); control_ui->combo = 0; control_ui->control = mcontrol; - control_ui->update_pending = false; control_ui->label.set_text (desc.label); control_ui->label.set_alignment (0.0, 0.5); control_ui->label.set_name ("PluginParameterLabel"); - control_ui->set_spacing (5); - - Gtk::Requisition req (control_ui->automate_button.size_request()); + set_short_autostate(control_ui, false); if (is_input) { + 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 + control_ui->file_button = manage(new Gtk::FileChooserButton(Gtk::FILE_CHOOSER_ACTION_OPEN)); + control_ui->file_button->set_title(desc.label); + + 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->file_button, 0, 1, 1, 2); + } else { + control_ui->pack_start (control_ui->label, false, true); + control_ui->pack_start (*control_ui->file_button, true, true); + } + + // Monitor changes from the user. + control_ui->file_button->signal_file_set().connect( + sigc::bind(sigc::mem_fun(*this, &GenericPluginUI::set_path_property), + desc, 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; + } + + assert(mcontrol); + /* See if there any named values for our input value */ control_ui->scale_points = desc.scale_points; @@ -607,148 +752,152 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter& param, * 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); + 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))); } - 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()); - control_ui->pack_start(control_ui->label, true, true); - control_ui->pack_start(*control_ui->combo, false, true); + control_ui->combo->set_controllable (mcontrol); update_control_display(control_ui); - return control_ui; - } + } else { - if (desc.toggled) { + /* create the controller */ - /* Build a button */ + /* 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->button = manage (new ToggleButton ()); - control_ui->button->set_name ("PluginEditorButton"); - control_ui->button->set_size_request (20, 20); + /* Control UI's don't need the rapid timer workaround */ + control_ui->controller->stop_updating (); - 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); + /* XXX this code is not right yet, because it doesn't handle + the absence of bounds in any sensible fashion. + */ - if (mcontrol->flags () & Controllable::NotAutomatable) { - control_ui->automate_button.set_sensitive (false); - set_tooltip(control_ui->automate_button, _("This control cannot be automated")); + Adjustment* adj = control_ui->controller->adjustment(); + + if (desc.integer_step && !desc.toggled) { + control_ui->clickbox = new ArdourWidgets::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->clickbox->set_controllable (mcontrol); + } 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->automate_button.signal_clicked().connect (bind (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->controller->set_size_request (200, -1); + control_ui->controller->set_name (X_("ProcessorControlSlider")); } - control_ui->button->signal_clicked().connect (sigc::bind (sigc::mem_fun(*this, &GenericPluginUI::control_port_toggled), control_ui)); - - mcontrol->Changed.connect (control_connections, invalidator (*this), boost::bind (&GenericPluginUI::toggle_parameter_changed, this, control_ui), gui_context()); - - if (value > 0.5){ - control_ui->button->set_active(true); + if (!desc.integer_step && !desc.toggled && use_knob) { + control_ui->spin_box = manage (new ArdourSpinner (mcontrol, adj)); } - automation_state_changed (control_ui); - - return control_ui; - } - - if (desc.datatype == Variant::PATH) { - - /* Build a file selector button */ - - // Create/add controller - 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, false, true); - control_ui->pack_start (*control_ui->file_button, true, true); + adj->set_value (mcontrol->internal_to_interface(value)); - // Connect signals (TODO: do this via the Control) - control_ui->file_button->signal_file_set().connect( - sigc::bind(sigc::mem_fun(*this, &GenericPluginUI::set_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; - - return control_ui; - } - - /* create the controller */ - - if (mcontrol) { - control_ui->controller = AutomationController::create(insert, mcontrol->parameter(), desc, mcontrol); } - /* 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) { - 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 (use_knob) { + set_short_autostate(control_ui, true); + + 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->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 + ": "); + 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); + control_ui->knobtable->attach (*control_ui->spin_box, 0, 2, 1, 2); + control_ui->knobtable->attach (control_ui->automate_button, 1, 2, 0, 1, SHRINK, SHRINK, 2, 0); + } else if (desc.toggled) { + Alignment *align = manage (new Alignment (.5, .5, 0, 0)); + align->add (*control_ui->controller); + control_ui->knobtable->attach (*align, 0, 2, 0, 1, EXPAND, SHRINK, 2, 2); + 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 { - control_ui->clickbox->set_printer (sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::integer_printer), control_ui)); + control_ui->knobtable->attach (*control_ui->controller, 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 { - //sigc::slot pslot = sigc::bind (sigc::mem_fun(*this, &GenericPluginUI::print_parameter), (uint32_t) port_index); - - control_ui->controller->set_size_request (200, req.height); - control_ui->controller->set_name (X_("ProcessorControlSlider")); - - } - - adj->set_value (mcontrol->internal_to_interface(value)); - /* XXX memory leak: SliderController not destroyed by ControlUI - destructor, and manage() reports object hierarchy - ambiguity. - */ - - control_ui->pack_start (control_ui->label, true, true); - if (desc.integer_step) { - control_ui->pack_start (*control_ui->clickbox, false, false); } else { - control_ui->pack_start (*control_ui->controller, false, false); + + control_ui->pack_start (control_ui->label, true, true); + 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); + control_ui->pack_start (*control_ui->controller, false, false); + } else { + control_ui->pack_start (*control_ui->controller, false, false); + } + control_ui->pack_start (control_ui->automate_button, false, false); } - control_ui->pack_start (control_ui->automate_button, false, false); if (mcontrol->flags () & Controllable::NotAutomatable) { 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 && !control_ui->combo) { + control_ui->button = true; + ArdourButton* but = dynamic_cast(control_ui->controller->widget ()); + assert (but); + but->set_name ("pluginui toggle"); + update_control_display(control_ui); } 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"); @@ -765,7 +914,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 { @@ -786,12 +938,6 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter& param, UIConfiguration::instance().color ("meter background top") ); - info->min_unbound = desc.min_unbound; - info->max_unbound = desc.max_unbound; - - info->min = desc.lower; - info->max = desc.upper; - control_ui->label.set_angle(90); HBox* center = manage (new HBox); @@ -816,20 +962,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()); @@ -844,16 +1007,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)); } } @@ -863,22 +1027,6 @@ GenericPluginUI::set_automation_state (AutoState state, ControlUI* cui) insert->set_parameter_automation_state (cui->parameter(), state); } -void -GenericPluginUI::toggle_parameter_changed (ControlUI* cui) -{ - float val = cui->control->get_value(); - - if (!cui->ignore_change) { - if (val > 0.5) { - cui->button->set_active (true); - cui->button->set_name ("PluginEditorButton-active"); - } else { - cui->button->set_active (false); - cui->button->set_name ("PluginEditorButton"); - } - } -} - void GenericPluginUI::ui_parameter_changed (ControlUI* cui) { @@ -897,22 +1045,17 @@ GenericPluginUI::update_control_display (ControlUI* cui) float val = cui->control->get_value(); - cui->ignore_change++; + PBD::Unwinder (cui->ignore_change, true); 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; } } } else if (cui->button) { - - if (val > 0.5) { - cui->button->set_active (true); - } else { - cui->button->set_active (false); - } + // AutomationController handles this } if( cui->controller ) { @@ -928,29 +1071,25 @@ GenericPluginUI::update_control_display (ControlUI* cui) cui->adjustment->set_value (val); } }*/ - cui->ignore_change--; } void -GenericPluginUI::control_port_toggled (ControlUI* cui) +GenericPluginUI::update_input_displays () { - cui->ignore_change++; - const bool active = cui->button->get_active(); - if (active) { - cui->button->set_name ("PluginEditorButton-active"); - } else { - cui->button->set_name ("PluginEditorButton"); + /* 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); } - insert->automation_control (cui->parameter())->set_value (active, Controllable::NoGroup); - cui->ignore_change--; + return; } void -GenericPluginUI::control_combo_changed (ControlUI* cui) +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); } } @@ -967,14 +1106,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; } @@ -984,46 +1118,30 @@ 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 */ if ((*i)->meterinfo && (*i)->meterinfo->packed) { - - if (val < (*i)->meterinfo->min) { - if ((*i)->meterinfo->min_unbound) - (*i)->meterinfo->min = val; - else - val = (*i)->meterinfo->min; - } - - if (val > (*i)->meterinfo->max) { - if ((*i)->meterinfo->max_unbound) - (*i)->meterinfo->max = val; - else - val = (*i)->meterinfo->max; - } - - if ((*i)->meterinfo->max > (*i)->meterinfo->min ) { - float lval = (val - (*i)->meterinfo->min) / ((*i)->meterinfo->max - (*i)->meterinfo->min) ; - (*i)->meterinfo->meter->set (lval ); - } + (*i)->meterinfo->meter->set (c->desc().to_interface (val)); } } } 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;