X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fprocessor_box.cc;h=265f94c53b0659c48c74a1b493b2bd5f5794335e;hb=2277da6e6c83c2933f4452239a78910967ecba4e;hp=6b09addf79790e9aa509f1db086a4e900218d62f;hpb=744c8f572f334b488f7713b32bd6e412c4102b68;p=ardour.git diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index 6b09addf79..265f94c53b 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -40,13 +40,10 @@ #include #include "ardour/amp.h" -#include "ardour/ardour.h" #include "ardour/audio_track.h" #include "ardour/audioengine.h" -#include "ardour/internal_send.h" #include "ardour/internal_return.h" -#include "ardour/ladspa_plugin.h" -#include "ardour/meter.h" +#include "ardour/internal_send.h" #include "ardour/plugin_insert.h" #include "ardour/port_insert.h" #include "ardour/profile.h" @@ -54,7 +51,7 @@ #include "ardour/route.h" #include "ardour/send.h" #include "ardour/session.h" -#include "ardour/dB.h" +#include "ardour/types.h" #include "actions.h" #include "ardour_dialog.h" @@ -92,12 +89,12 @@ RefPtr ProcessorBox::paste_action; RefPtr ProcessorBox::cut_action; RefPtr ProcessorBox::rename_action; RefPtr ProcessorBox::edit_action; -RefPtr ProcessorBox::controls_action; -Glib::RefPtr SendProcessorEntry::_slider; +RefPtr ProcessorBox::edit_generic_action; -ProcessorEntry::ProcessorEntry (boost::shared_ptr p, Width w) +ProcessorEntry::ProcessorEntry (ProcessorBox* parent, boost::shared_ptr p, Width w) : _button (ArdourButton::led_default_elements) , _position (PreFader) + , _parent (parent) , _processor (p) , _width (w) , _visual_state (Gtk::STATE_NORMAL) @@ -111,16 +108,32 @@ ProcessorEntry::ProcessorEntry (boost::shared_ptr p, Width w) _button.set_text (name (_width)); if (_processor) { + _vbox.pack_start (_button, true, true); - if (_processor->active()) { - _button.set_active_state (Gtkmm2ext::Active); - } - + _button.set_active (_processor->active()); _button.show (); - + _processor->ActiveChanged.connect (active_connection, invalidator (*this), boost::bind (&ProcessorEntry::processor_active_changed, this), gui_context()); - _processor->PropertyChanged.connect (name_connection, invalidator (*this), ui_bind (&ProcessorEntry::processor_property_changed, this, _1), gui_context()); + _processor->PropertyChanged.connect (name_connection, invalidator (*this), boost::bind (&ProcessorEntry::processor_property_changed, this, _1), gui_context()); + + set p = _processor->what_can_be_automated (); + for (set::iterator i = p.begin(); i != p.end(); ++i) { + + Control* c = new Control (_processor->automation_control (*i), _processor->describe_parameter (*i)); + + _controls.push_back (c); + + if (boost::dynamic_pointer_cast (_processor) == 0) { + /* Add non-Amp controls to the processor box */ + _vbox.pack_start (c->box); + } + + if (boost::dynamic_pointer_cast (_processor)) { + /* Don't label send faders */ + c->hide_label (); + } + } setup_tooltip (); setup_visuals (); @@ -129,6 +142,13 @@ ProcessorEntry::ProcessorEntry (boost::shared_ptr p, Width w) } } +ProcessorEntry::~ProcessorEntry () +{ + for (list::iterator i = _controls.begin(); i != _controls.end(); ++i) { + delete *i; + } +} + EventBox& ProcessorEntry::action_widget () { @@ -199,7 +219,7 @@ void ProcessorEntry::led_clicked() { if (_processor) { - if (_button.active_state() == Gtkmm2ext::Active) { + if (_button.get_active ()) { _processor->deactivate (); } else { _processor->activate (); @@ -211,11 +231,7 @@ void ProcessorEntry::processor_active_changed () { if (_processor) { - if (_processor->active()) { - _button.set_active_state (Gtkmm2ext::Active); - } else { - _button.unset_active_state (); - } + _button.set_active (_processor->active()); } } @@ -231,7 +247,20 @@ ProcessorEntry::processor_property_changed (const PropertyChange& what_changed) void ProcessorEntry::setup_tooltip () { - ARDOUR_UI::instance()->set_tip (_button, name (Wide)); + if (_processor) { + boost::shared_ptr pi = boost::dynamic_pointer_cast (_processor); + if (pi) { + if (pi->plugin()->has_editor()) { + ARDOUR_UI::instance()->set_tip (_button, + string_compose (_("%1\nDouble-click to show GUI.\nAlt+double-click to show generic GUI."), name (Wide))); + } else { + ARDOUR_UI::instance()->set_tip (_button, + string_compose (_("%1\nDouble-click to show generic GUI."), name (Wide))); + } + return; + } + } + ARDOUR_UI::instance()->set_tip (_button, string_compose ("%1", name (Wide))); } string @@ -280,129 +309,300 @@ ProcessorEntry::name (Width w) const return name_display; } -BlankProcessorEntry::BlankProcessorEntry (Width w) - : ProcessorEntry (boost::shared_ptr(), w) +void +ProcessorEntry::show_all_controls () { + for (list::iterator i = _controls.begin(); i != _controls.end(); ++i) { + (*i)->set_visible (true); + } + + _parent->update_gui_object_state (this); } -SendProcessorEntry::SendProcessorEntry (boost::shared_ptr s, Width w) - : ProcessorEntry (s, w) - , _send (s) - , _adjustment (gain_to_slider_position_with_max (1.0, Config->get_max_gain()), 0, 1, 0.01, 0.1) - , _fader (_slider, &_adjustment, 0, false) - , _ignore_gain_change (false) - , _data_type (DataType::AUDIO) +void +ProcessorEntry::hide_all_controls () +{ + for (list::iterator i = _controls.begin(); i != _controls.end(); ++i) { + (*i)->set_visible (false); + } + + _parent->update_gui_object_state (this); +} + +void +ProcessorEntry::add_control_state (XMLNode* node) const +{ + for (list::const_iterator i = _controls.begin(); i != _controls.end(); ++i) { + (*i)->add_state (node); + } +} + +void +ProcessorEntry::set_control_state (XMLNode const * node) +{ + for (list::const_iterator i = _controls.begin(); i != _controls.end(); ++i) { + (*i)->set_state (node); + } +} + +string +ProcessorEntry::state_id () const +{ + return string_compose ("processor %1", _processor->id().to_s()); +} + +void +ProcessorEntry::hide_things () { - _fader.set_name ("SendFader"); - _fader.set_controllable (_send->amp()->gain_control ()); - _vbox.pack_start (_fader); + for (list::iterator i = _controls.begin(); i != _controls.end(); ++i) { + (*i)->hide_things (); + } +} - _fader.show (); - _adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &SendProcessorEntry::gain_adjusted)); +Menu * +ProcessorEntry::build_controls_menu () +{ + using namespace Menu_Helpers; + Menu* menu = manage (new Menu); + MenuList& items = menu->items (); - _send->amp()->gain_control()->Changed.connect ( - _send_connections, invalidator (*this), boost::bind (&SendProcessorEntry::show_gain, this), gui_context() + items.push_back ( + MenuElem (_("Show All Controls"), sigc::mem_fun (*this, &ProcessorEntry::show_all_controls)) ); - - _send->amp()->ConfigurationChanged.connect ( - _send_connections, invalidator (*this), ui_bind (&SendProcessorEntry::setup_gain_adjustment, this), gui_context () + + items.push_back ( + MenuElem (_("Hide All Controls"), sigc::mem_fun (*this, &ProcessorEntry::hide_all_controls)) ); - setup_gain_adjustment (); - show_gain (); + if (!_controls.empty ()) { + items.push_back (SeparatorElem ()); + } + + for (list::iterator i = _controls.begin(); i != _controls.end(); ++i) { + items.push_back (CheckMenuElem ((*i)->name ())); + CheckMenuItem* c = dynamic_cast (&items.back ()); + c->set_active ((*i)->visible ()); + c->signal_toggled().connect (sigc::bind (sigc::mem_fun (*this, &ProcessorEntry::toggle_control_visibility), *i)); + } + + return menu; } void -SendProcessorEntry::setup_gain_adjustment () +ProcessorEntry::toggle_control_visibility (Control* c) { - if (_send->amp()->output_streams().n_midi() == 0) { - _data_type = DataType::AUDIO; - _adjustment.set_lower (0); - _adjustment.set_upper (1); - _adjustment.set_step_increment (0.01); - _adjustment.set_page_increment (0.1); - _fader.set_default_value (gain_to_slider_position (1)); + c->set_visible (!c->visible ()); + _parent->update_gui_object_state (this); +} + +ProcessorEntry::Control::Control (boost::shared_ptr c, string const & n) + : _control (c) + , _adjustment (gain_to_slider_position_with_max (1.0, Config->get_max_gain()), 0, 1, 0.01, 0.1) + , _slider (&_adjustment, 0, 13, false) + , _slider_persistant_tooltip (&_slider) + , _button (ArdourButton::Element (ArdourButton::Text | ArdourButton::Indicator)) + , _ignore_ui_adjustment (false) + , _visible (false) + , _name (n) +{ + _slider.set_controllable (c); + + if (c->toggled()) { + _button.set_text (_name); + _button.set_led_left (true); + _button.set_name ("processor control button"); + box.pack_start (_button); + _button.show (); + + _button.signal_clicked.connect (sigc::mem_fun (*this, &Control::button_clicked)); + _button.signal_led_clicked.connect (sigc::mem_fun (*this, &Control::button_clicked)); + c->Changed.connect (_connection, MISSING_INVALIDATOR, boost::bind (&Control::control_changed, this), gui_context ()); + } else { - _data_type = DataType::MIDI; - _adjustment.set_lower (0); - _adjustment.set_upper (2); - _adjustment.set_step_increment (0.05); - _adjustment.set_page_increment (0.1); - _fader.set_default_value (1); + + _slider.set_name ("PluginSlider"); + _slider.set_text (_name); + + box.pack_start (_slider); + _slider.show (); + + double const lo = c->internal_to_interface (c->lower ()); + double const up = c->internal_to_interface (c->upper ()); + + _adjustment.set_lower (lo); + _adjustment.set_upper (up); + _adjustment.set_step_increment ((up - lo) / 100); + _adjustment.set_page_increment ((up - lo) / 10); + _slider.set_default_value (c->internal_to_interface (c->normal ())); + + _adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &Control::slider_adjusted)); + c->Changed.connect (_connection, MISSING_INVALIDATOR, boost::bind (&Control::control_changed, this), gui_context ()); } + + ARDOUR_UI::RapidScreenUpdate.connect (sigc::mem_fun (*this, &Control::control_changed)); + + control_changed (); + set_tooltip (); + + /* We're providing our own PersistentTooltip */ + set_no_tooltip_whatsoever (_slider); } void -SendProcessorEntry::setup_slider_pix () +ProcessorEntry::Control::set_tooltip () { - _slider = ::get_icon ("fader_belt_h_thin"); - assert (_slider); + boost::shared_ptr c = _control.lock (); + + if (!c) { + return; + } + + stringstream s; + s << _name << ": "; + if (c->toggled ()) { + s << (c->get_value() > 0.5 ? _("on") : _("off")); + } else { + s << setprecision(2) << fixed; + s << c->internal_to_user (c->get_value ()); + } + + string sm = Glib::Markup::escape_text (s.str()); + + ARDOUR_UI::instance()->set_tip (_label, sm); + _slider_persistant_tooltip.set_tip (sm); + ARDOUR_UI::instance()->set_tip (_button, sm); } void -SendProcessorEntry::show_gain () +ProcessorEntry::Control::slider_adjusted () { - gain_t value = 0; + if (_ignore_ui_adjustment) { + return; + } - switch (_data_type) { - case DataType::AUDIO: - value = gain_to_slider_position_with_max (_send->amp()->gain (), Config->get_max_gain()); - break; - case DataType::MIDI: - value = _send->amp()->gain (); - break; + boost::shared_ptr c = _control.lock (); + + if (!c) { + return; + } + + c->set_value (c->interface_to_internal (_adjustment.get_value ())); + set_tooltip (); +} + +void +ProcessorEntry::Control::button_clicked () +{ + boost::shared_ptr c = _control.lock (); + + if (!c) { + return; + } + + bool const n = _button.get_active (); + + c->set_value (n ? 0 : 1); + _button.set_active (!n); +} + +void +ProcessorEntry::Control::control_changed () +{ + boost::shared_ptr c = _control.lock (); + if (!c) { + return; } - if (_adjustment.get_value() != value) { - _ignore_gain_change = true; - _adjustment.set_value (value); - _ignore_gain_change = false; + _ignore_ui_adjustment = true; + + if (c->toggled ()) { + + _button.set_active (c->get_value() > 0.5); + + } else { + _adjustment.set_value (c->internal_to_interface (c->get_value ())); + stringstream s; s.precision (1); s.setf (ios::fixed, ios::floatfield); - s << accurate_coefficient_to_dB (_send->amp()->gain ()); - if (_data_type == DataType::AUDIO) { - s << _("dB"); - } - - _fader.set_tooltip_text (s.str ()); + s << c->internal_to_user (c->get_value ()); } + + _ignore_ui_adjustment = false; } void -SendProcessorEntry::gain_adjusted () +ProcessorEntry::Control::add_state (XMLNode* node) const { - if (_ignore_gain_change) { - return; - } + XMLNode* c = new XMLNode (X_("Object")); + c->add_property (X_("id"), state_id ()); + c->add_property (X_("visible"), _visible); + node->add_child_nocopy (*c); +} - gain_t value = 0; +void +ProcessorEntry::Control::set_state (XMLNode const * node) +{ + XMLNode* n = GUIObjectState::get_node (node, state_id ()); + if (n) { + XMLProperty* p = n->property (X_("visible")); + set_visible (p && string_is_affirmative (p->value ())); + } else { + set_visible (false); + } +} - switch (_data_type) { - case DataType::AUDIO: - value = slider_position_to_gain_with_max (_adjustment.get_value(), Config->get_max_gain()); - break; - case DataType::MIDI: - value = _adjustment.get_value (); +void +ProcessorEntry::Control::set_visible (bool v) +{ + if (v) { + box.show (); + } else { + box.hide (); } - _send->amp()->set_gain (value, this); + _visible = v; +} + +/** Called when the Editor might have re-shown things that + we want hidden. +*/ +void +ProcessorEntry::Control::hide_things () +{ + if (!_visible) { + box.hide (); + } } void -SendProcessorEntry::set_pixel_width (int p) +ProcessorEntry::Control::hide_label () +{ + _label.hide (); +} + +string +ProcessorEntry::Control::state_id () const +{ + boost::shared_ptr c = _control.lock (); + assert (c); + + return string_compose (X_("control %1"), c->id().to_s ()); +} + +BlankProcessorEntry::BlankProcessorEntry (ProcessorBox* b, Width w) + : ProcessorEntry (b, boost::shared_ptr(), w) { - _fader.set_fader_length (p); } -PluginInsertProcessorEntry::PluginInsertProcessorEntry (boost::shared_ptr p, Width w) - : ProcessorEntry (p, w) +PluginInsertProcessorEntry::PluginInsertProcessorEntry (ProcessorBox* b, boost::shared_ptr p, Width w) + : ProcessorEntry (b, p, w) , _plugin_insert (p) { p->SplittingChanged.connect ( - _splitting_connection, invalidator (*this), ui_bind (&PluginInsertProcessorEntry::plugin_insert_splitting_changed, this), gui_context() + _splitting_connection, invalidator (*this), boost::bind (&PluginInsertProcessorEntry::plugin_insert_splitting_changed, this), gui_context() ); _splitting_icon.set_size_request (-1, 12); @@ -426,6 +626,7 @@ PluginInsertProcessorEntry::plugin_insert_splitting_changed () void PluginInsertProcessorEntry::hide_things () { + ProcessorEntry::hide_things (); plugin_insert_splitting_changed (); } @@ -488,6 +689,8 @@ ProcessorBox::ProcessorBox (ARDOUR::Session* sess, boost::functionDeliveryChanged.connect ( - _mixer_strip_connections, invalidator (*this), ui_bind (&ProcessorBox::mixer_strip_delivery_changed, this, _1), gui_context () + _mixer_strip_connections, invalidator (*this), boost::bind (&ProcessorBox::mixer_strip_delivery_changed, this, _1), gui_context () ); } @@ -553,7 +756,7 @@ ProcessorBox::set_route (boost::shared_ptr r) _route = r; _route->processors_changed.connect ( - _route_connections, invalidator (*this), ui_bind (&ProcessorBox::route_processors_changed, this, _1), gui_context() + _route_connections, invalidator (*this), boost::bind (&ProcessorBox::route_processors_changed, this, _1), gui_context() ); _route->DropReferences.connect ( @@ -561,7 +764,7 @@ ProcessorBox::set_route (boost::shared_ptr r) ); _route->PropertyChanged.connect ( - _route_connections, invalidator (*this), ui_bind (&ProcessorBox::route_property_changed, this, _1), gui_context() + _route_connections, invalidator (*this), boost::bind (&ProcessorBox::route_property_changed, this, _1), gui_context() ); redisplay_processors (); @@ -581,6 +784,21 @@ ProcessorBox::object_drop(DnDVBox* source, ProcessorEntry* posit boost::shared_ptr p; if (position) { p = position->processor (); + if (!p) { + /* dropped on the blank entry (which will be before the + fader), so use the first non-blank child as our + `dropped on' processor */ + list c = processor_display.children (); + list::iterator i = c.begin (); + while (dynamic_cast (*i)) { + assert (i != c.end ()); + ++i; + } + + assert (i != c.end ()); + p = (*i)->processor (); + assert (p); + } } list children = source->selection (); @@ -611,12 +829,6 @@ ProcessorBox::object_drop(DnDVBox* source, ProcessorEntry* posit } } -void -ProcessorBox::update() -{ - redisplay_processors (); -} - void ProcessorBox::set_width (Width w) { @@ -631,7 +843,7 @@ ProcessorBox::set_width (Width w) (*i)->set_enum_width (w); } - redisplay_processors (); + queue_resize (); } Gtk::Menu* @@ -640,6 +852,7 @@ ProcessorBox::build_possible_aux_menu () boost::shared_ptr rl = _session->get_routes_with_internal_returns(); if (rl->empty()) { + /* No aux sends if there are no busses */ return 0; } @@ -688,6 +901,28 @@ ProcessorBox::show_processor_menu (int arg) } } + ProcessorEntry* single_selection = 0; + if (processor_display.selection().size() == 1) { + single_selection = processor_display.selection().front(); + } + + /* And the controls submenu */ + + Gtk::MenuItem* controls_menu_item = dynamic_cast(ActionManager::get_widget("/ProcessorMenu/controls")); + + if (controls_menu_item) { + if (single_selection) { + Menu* m = single_selection->build_controls_menu (); + if (m && !m->items().empty()) { + controls_menu_item->set_submenu (*m); + controls_menu_item->set_sensitive (true); + } else { + gtk_menu_item_set_submenu (controls_menu_item->gobj(), 0); + controls_menu_item->set_sensitive (false); + } + } + } + /* Sensitise actions as approprioate */ cut_action->set_sensitive (can_cut()); @@ -696,22 +931,18 @@ ProcessorBox::show_processor_menu (int arg) const bool sensitive = !processor_display.selection().empty(); ActionManager::set_sensitive (ActionManager::plugin_selection_sensitive_actions, sensitive); edit_action->set_sensitive (one_processor_can_be_edited ()); - - boost::shared_ptr single_selection; - if (processor_display.selection().size() == 1) { - single_selection = processor_display.selection().front()->processor (); - } + edit_generic_action->set_sensitive (one_processor_can_be_edited ()); boost::shared_ptr pi; if (single_selection) { - pi = boost::dynamic_pointer_cast (single_selection); + pi = boost::dynamic_pointer_cast (single_selection->processor ()); } - /* enable gui for plugin inserts with editors */ - controls_action->set_sensitive(pi && pi->plugin()->has_editor()); + /* allow editing with an Ardour-generated UI for plugin inserts with editors */ + edit_action->set_sensitive (pi && pi->plugin()->has_editor ()); /* disallow rename for multiple selections, for plugin inserts and for the fader */ - rename_action->set_sensitive (single_selection && !pi && !boost::dynamic_pointer_cast (single_selection)); + rename_action->set_sensitive (single_selection && !pi && !boost::dynamic_pointer_cast (single_selection->processor ())); processor_menu->popup (1, arg); @@ -722,10 +953,8 @@ ProcessorBox::show_processor_menu (int arg) processor_display.get_pointer (x, y); _placement = processor_display.add_placeholder (y); - if (_visible_prefader_processors == 0) { - if (_placement == 1) { - _placement = 0; - } + if (_visible_prefader_processors == 0 && _placement > 0) { + --_placement; } } @@ -737,7 +966,7 @@ ProcessorBox::enter_notify (GdkEventCrossing*) } bool -ProcessorBox::leave_notify (GdkEventCrossing* ev) +ProcessorBox::leave_notify (GdkEventCrossing*) { return false; } @@ -805,6 +1034,22 @@ ProcessorBox::processor_operation (ProcessorOperation op) } } +ProcessorWindowProxy* +ProcessorBox::find_window_proxy (boost::shared_ptr processor) const +{ + for (list::const_iterator i = _processor_window_info.begin(); i != _processor_window_info.end(); ++i) { + boost::shared_ptr p = (*i)->processor().lock(); + + if (p && p == processor) { + return (*i); + } + } + + return 0; +} + + + bool ProcessorBox::processor_button_press_event (GdkEventButton *ev, ProcessorEntry* child) { @@ -820,8 +1065,16 @@ ProcessorBox::processor_button_press_event (GdkEventButton *ev, ProcessorEntry* if (_session->engine().connected()) { /* XXX giving an error message here is hard, because we may be in the midst of a button press */ - toggle_edit_processor (processor); + + if (!one_processor_can_be_edited ()) return true; + + if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) { + generic_edit_processor (processor); + } else { + edit_processor (processor); + } } + ret = true; } else if (processor && ev->button == 1 && selected) { @@ -964,7 +1217,6 @@ ProcessorBox::weird_plugin_dialog (Plugin& p, Route::ProcessorStreams streams) dialog.add_button (Stock::OK, RESPONSE_ACCEPT); dialog.set_name (X_("PluginIODialog")); - dialog.set_position (Gtk::WIN_POS_MOUSE); dialog.set_modal (true); dialog.show_all (); @@ -991,7 +1243,7 @@ ProcessorBox::choose_send () /* XXX need processor lock on route */ try { - Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock()); + Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock()); send->output()->ensure_io (outs, false, this); } catch (AudioEngine::PortRegistrationFailure& err) { error << string_compose (_("Cannot set up new send: %1"), err.what()) << endmsg; @@ -1088,10 +1340,7 @@ ProcessorBox::choose_aux (boost::weak_ptr wr) return; } - boost::shared_ptr rlist (new RouteList); - rlist->push_back (_route); - - _session->add_internal_sends (target, PreFader, rlist); + _session->add_internal_send (target, _placement, _route); } void @@ -1124,14 +1373,13 @@ ProcessorBox::redisplay_processors () &_visible_prefader_processors, &fader_seen)); if (_visible_prefader_processors == 0) { // fader only - BlankProcessorEntry* bpe = new BlankProcessorEntry (_width); - bpe->set_pixel_width (get_allocation().get_width()); + BlankProcessorEntry* bpe = new BlankProcessorEntry (this, _width); processor_display.add_child (bpe); } _route->foreach_processor (sigc::mem_fun (*this, &ProcessorBox::add_processor_to_display)); - for (list::iterator i = _processor_window_proxies.begin(); i != _processor_window_proxies.end(); ++i) { + for (list::iterator i = _processor_window_info.begin(); i != _processor_window_info.end(); ++i) { (*i)->marked = false; } @@ -1139,15 +1387,15 @@ ProcessorBox::redisplay_processors () /* trim dead wood from the processor window proxy list */ - list::iterator i = _processor_window_proxies.begin(); - while (i != _processor_window_proxies.end()) { + list::iterator i = _processor_window_info.begin(); + while (i != _processor_window_info.end()) { list::iterator j = i; ++j; if (!(*i)->marked) { - ARDOUR_UI::instance()->remove_window_proxy (*i); + WM::Manager::instance().remove (*i); delete *i; - _processor_window_proxies.erase (i); + _processor_window_info.erase (i); } i = j; @@ -1167,8 +1415,8 @@ ProcessorBox::maybe_add_processor_to_ui_list (boost::weak_ptr w) return; } - list::iterator i = _processor_window_proxies.begin (); - while (i != _processor_window_proxies.end()) { + list::iterator i = _processor_window_info.begin (); + while (i != _processor_window_info.end()) { boost::shared_ptr t = (*i)->processor().lock (); @@ -1196,10 +1444,15 @@ ProcessorBox::maybe_add_processor_to_ui_list (boost::weak_ptr w) ProcessorWindowProxy* wp = new ProcessorWindowProxy ( string_compose ("%1-%2-%3", loc, _route->id(), p->id()), - _session->extra_xml (X_("UI")), this, w); + const XMLNode* ui_xml = _session->extra_xml (X_("UI")); + + if (ui_xml) { + wp->set_state (*ui_xml); + } + wp->marked = true; /* if the processor already has an existing UI, @@ -1209,11 +1462,11 @@ ProcessorBox::maybe_add_processor_to_ui_list (boost::weak_ptr w) void* existing_ui = p->get_ui (); if (existing_ui) { - wp->set (static_cast(existing_ui)); + wp->use_window (*(reinterpret_cast(existing_ui))); } - _processor_window_proxies.push_back (wp); - ARDOUR_UI::instance()->add_window_proxy (wp); + _processor_window_info.push_back (wp); + WM::Manager::instance().register_window (wp); } void @@ -1242,19 +1495,25 @@ ProcessorBox::add_processor_to_display (boost::weak_ptr p) return; } - - boost::shared_ptr send = boost::dynamic_pointer_cast (processor); boost::shared_ptr plugin_insert = boost::dynamic_pointer_cast (processor); ProcessorEntry* e = 0; - if (send) { - e = new SendProcessorEntry (send, _width); - } else if (plugin_insert) { - e = new PluginInsertProcessorEntry (plugin_insert, _width); + if (plugin_insert) { + e = new PluginInsertProcessorEntry (this, plugin_insert, _width); } else { - e = new ProcessorEntry (processor, _width); + e = new ProcessorEntry (this, processor, _width); + } + + /* Set up this entry's state from the GUIObjectState */ + XMLNode* proc = entry_gui_object_state (e); + if (proc) { + e->set_control_state (proc); + } + + if (boost::dynamic_pointer_cast (processor)) { + /* Always show send controls */ + e->show_all_controls (); } - e->set_pixel_width (get_allocation().get_width()); processor_display.add_child (e); } @@ -1329,7 +1588,6 @@ outputs will not work correctly.")); dialog.add_button (Stock::OK, RESPONSE_ACCEPT); dialog.set_name (X_("PluginIODialog")); - dialog.set_position (Gtk::WIN_POS_MOUSE); dialog.set_modal (true); dialog.show_all (); @@ -1435,19 +1693,6 @@ ProcessorBox::copy_processors (const ProcSelection& to_be_copied) _rr_selection.set (node); } -void -ProcessorBox::processors_up () -{ - /* unimplemented */ -} - -void -ProcessorBox::processors_down () -{ - /* unimplemented */ -} - - void ProcessorBox::delete_processors (const ProcSelection& targets) { @@ -1591,6 +1836,7 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr for (niter = nlist.begin(); niter != nlist.end(); ++niter) { XMLProperty const * type = (*niter)->property ("type"); + XMLProperty const * role = (*niter)->property ("role"); assert (type); boost::shared_ptr p; @@ -1598,15 +1844,42 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr if (type->value() == "meter" || type->value() == "main-outs" || type->value() == "amp" || - type->value() == "intsend" || type->value() == "intreturn") { - /* do not paste meter, main outs, amp or internal send/returns */ + type->value() == "intreturn") { + /* do not paste meter, main outs, amp or internal returns */ continue; + } else if (type->value() == "intsend") { + + /* aux sends are OK, but those used for + * other purposes, are not. + */ + + assert (role); + + if (role->value() != "Aux") { + continue; + } + + XMLNode n (**niter); + InternalSend* s = new InternalSend (*_session, _route->pannable(), _route->mute_master(), + boost::shared_ptr(), Delivery::Aux); + + IOProcessor::prepare_for_reset (n, s->name()); + + if (s->set_state (n, Stateful::loading_state_version)) { + delete s; + return; + } + + p.reset (s); + } else if (type->value() == "send") { XMLNode n (**niter); - Send::make_unique (n, *_session); Send* s = new Send (*_session, _route->pannable(), _route->mute_master()); + + IOProcessor::prepare_for_reset (n, s->name()); + if (s->set_state (n, Stateful::loading_state_version)) { delete s; return; @@ -1614,13 +1887,13 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr p.reset (s); - } else if (type->value() == "return") { XMLNode n (**niter); - Return::make_unique (n, *_session); Return* r = new Return (*_session); + IOProcessor::prepare_for_reset (n, r->name()); + if (r->set_state (n, Stateful::loading_state_version)) { delete r; return; @@ -1631,10 +1904,15 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr } else if (type->value() == "port") { XMLNode n (**niter); - p.reset (new PortInsert (*_session, _route->pannable (), _route->mute_master ())); - if (p->set_state (n, Stateful::loading_state_version)) { + PortInsert* pi = new PortInsert (*_session, _route->pannable (), _route->mute_master ()); + + IOProcessor::prepare_for_reset (n, pi->name()); + + if (pi->set_state (n, Stateful::loading_state_version)) { return; } + + p.reset (pi); } else { /* XXX its a bit limiting to assume that everything else @@ -1649,7 +1927,7 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr } catch (...) { - cerr << "plugin insert constructor failed\n"; + error << _("plugin insert constructor failed") << endmsg; } } @@ -1668,18 +1946,6 @@ could not match the configuration of this track."); } } -void -ProcessorBox::activate_processor (boost::shared_ptr r) -{ - r->activate (); -} - -void -ProcessorBox::deactivate_processor (boost::shared_ptr r) -{ - r->deactivate (); -} - void ProcessorBox::get_selected_processors (ProcSelection& processors) const { @@ -1788,8 +2054,8 @@ ProcessorBox::one_processor_can_be_edited () return (i != selection.end()); } -void -ProcessorBox::toggle_edit_processor (boost::shared_ptr processor) +Gtk::Window* +ProcessorBox::get_editor_window (boost::shared_ptr processor, bool use_custom) { boost::shared_ptr send; boost::shared_ptr internal_send; @@ -1801,7 +2067,7 @@ ProcessorBox::toggle_edit_processor (boost::shared_ptr processor) if (boost::dynamic_pointer_cast(_route) != 0) { if (boost::dynamic_pointer_cast (_route)->freeze_state() == AudioTrack::Frozen) { - return; + return 0; } } @@ -1814,14 +2080,16 @@ ProcessorBox::toggle_edit_processor (boost::shared_ptr processor) } else if ((send = boost::dynamic_pointer_cast (processor)) != 0) { if (!_session->engine().connected()) { - return; + return 0; } if (boost::dynamic_pointer_cast (processor) == 0) { - SendUIWindow* w = new SendUIWindow (send, _session); - w->show (); + + gidget = new SendUIWindow (send, _session); + } else { /* assign internal send to main fader */ + if (_parent_strip) { if (_parent_strip->current_delivery() == send) { _parent_strip->revert_to_default_display (); @@ -1835,11 +2103,11 @@ ProcessorBox::toggle_edit_processor (boost::shared_ptr processor) if (boost::dynamic_pointer_cast (retrn)) { /* no GUI for these */ - return; + return 0; } if (!_session->engine().connected()) { - return; + return 0; } boost::shared_ptr retrn = boost::dynamic_pointer_cast (processor); @@ -1865,20 +2133,15 @@ ProcessorBox::toggle_edit_processor (boost::shared_ptr processor) /* these are both allowed to be null */ - Container* toplevel = get_toplevel(); - Window* win = dynamic_cast(toplevel); - Window* w = get_processor_ui (plugin_insert); if (w == 0) { - - plugin_ui = new PluginUIWindow (win, plugin_insert); + plugin_ui = new PluginUIWindow (plugin_insert, false, use_custom); plugin_ui->set_title (generate_processor_title (plugin_insert)); set_processor_ui (plugin_insert, plugin_ui); } else { plugin_ui = dynamic_cast (w); - plugin_ui->set_parent (win); } gidget = plugin_ui; @@ -1888,7 +2151,7 @@ ProcessorBox::toggle_edit_processor (boost::shared_ptr processor) if (!_session->engine().connected()) { MessageDialog msg ( _("Not connected to JACK - no I/O changes are possible")); msg.run (); - return; + return 0; } PortInsertWindow *io_selector; @@ -1906,36 +2169,23 @@ ProcessorBox::toggle_edit_processor (boost::shared_ptr processor) gidget = io_selector; } - if (gidget) { - if (gidget->is_visible()) { - gidget->hide (); - } else { - gidget->show_all (); - gidget->present (); - } - } + return gidget; } -void -ProcessorBox::toggle_processor_controls (boost::shared_ptr processor) +Gtk::Window* +ProcessorBox::get_generic_editor_window (boost::shared_ptr processor) { boost::shared_ptr plugin_insert = boost::dynamic_pointer_cast(processor); + if (!plugin_insert) { - return; + return 0; } - Container* toplevel = get_toplevel(); - Window* win = dynamic_cast(toplevel); - PluginUIWindow* plugin_ui = new PluginUIWindow(win, plugin_insert, true, false); - plugin_ui->set_title(generate_processor_title (plugin_insert)); + PluginUIWindow* win = new PluginUIWindow (plugin_insert, true, false); + win->set_title (generate_processor_title (plugin_insert)); - if (plugin_ui->is_visible()) { - plugin_ui->hide(); - } else { - plugin_ui->show_all(); - plugin_ui->present(); - } + return win; } void @@ -1957,6 +2207,8 @@ ProcessorBox::register_actions () ActionManager::register_action (popup_act_grp, X_("newaux"), _("New Aux Send ...")); + ActionManager::register_action (popup_act_grp, X_("controls"), _("Controls")); + ActionManager::register_action (popup_act_grp, X_("clear"), _("Clear (all)"), sigc::ptr_fun (ProcessorBox::rb_clear)); ActionManager::register_action (popup_act_grp, X_("clear_pre"), _("Clear (pre-fader)"), @@ -1999,14 +2251,23 @@ ProcessorBox::register_actions () popup_act_grp, X_("edit"), _("Edit..."), sigc::ptr_fun (ProcessorBox::rb_edit)); - /* show plugin GUI */ - controls_action = ActionManager::register_action ( - popup_act_grp, X_("controls"), _("Controls..."), - sigc::ptr_fun (ProcessorBox::rb_controls)); + edit_generic_action = ActionManager::register_action ( + popup_act_grp, X_("edit-generic"), _("Edit with generic controls..."), + sigc::ptr_fun (ProcessorBox::rb_edit_generic)); ActionManager::add_action_group (popup_act_grp); } +void +ProcessorBox::rb_edit_generic () +{ + if (_current_processor_box == 0) { + return; + } + + _current_processor_box->for_selected_processors (&ProcessorBox::generic_edit_processor); +} + void ProcessorBox::rb_ab_plugins () { @@ -2180,17 +2441,37 @@ ProcessorBox::rb_edit () return; } - _current_processor_box->for_selected_processors (&ProcessorBox::toggle_edit_processor); + _current_processor_box->for_selected_processors (&ProcessorBox::edit_processor); } void -ProcessorBox::rb_controls () +ProcessorBox::edit_processor (boost::shared_ptr processor) { - if (_current_processor_box == 0) { + if (!processor) { + return; + } + + ProcessorWindowProxy* proxy = find_window_proxy (processor); + + if (proxy) { + proxy->set_custom_ui_mode (true); + proxy->toggle (); + } +} + +void +ProcessorBox::generic_edit_processor (boost::shared_ptr processor) +{ + if (!processor) { return; } + + ProcessorWindowProxy* proxy = find_window_proxy (processor); - _current_processor_box->for_selected_processors (&ProcessorBox::toggle_processor_controls); + if (proxy) { + proxy->set_custom_ui_mode (false); + proxy->toggle (); + } } void @@ -2250,25 +2531,14 @@ ProcessorBox::generate_processor_title (boost::shared_ptr pi) return string_compose(_("%1: %2 (by %3)"), _route->name(), pi->name(), maker); } -void -ProcessorBox::on_size_allocate (Allocation& a) -{ - HBox::on_size_allocate (a); - - list children = processor_display.children (); - for (list::const_iterator i = children.begin(); i != children.end(); ++i) { - (*i)->set_pixel_width (a.get_width ()); - } -} - /** @param p Processor. * @return the UI window for \a p. */ Window * ProcessorBox::get_processor_ui (boost::shared_ptr p) const { - list::const_iterator i = _processor_window_proxies.begin (); - while (i != _processor_window_proxies.end()) { + list::const_iterator i = _processor_window_info.begin (); + while (i != _processor_window_info.end()) { boost::shared_ptr t = (*i)->processor().lock (); if (t && t == p) { return (*i)->get (); @@ -2287,14 +2557,14 @@ ProcessorBox::get_processor_ui (boost::shared_ptr p) const void ProcessorBox::set_processor_ui (boost::shared_ptr p, Gtk::Window* w) { - list::iterator i = _processor_window_proxies.begin (); + list::iterator i = _processor_window_info.begin (); p->set_ui (w); - while (i != _processor_window_proxies.end()) { + while (i != _processor_window_info.end()) { boost::shared_ptr t = (*i)->processor().lock (); if (t && t == p) { - (*i)->set (w); + (*i)->use_window (*w); return; } @@ -2328,6 +2598,7 @@ ProcessorBox::mixer_strip_delivery_changed (boost::weak_ptr w) } } +/** Called to repair the damage of Editor::show_window doing a show_all() */ void ProcessorBox::hide_things () { @@ -2343,29 +2614,120 @@ ProcessorBox::processor_menu_unmapped () processor_display.remove_placeholder (); } -ProcessorWindowProxy::ProcessorWindowProxy ( - string const & name, - XMLNode const * node, - ProcessorBox* box, - boost::weak_ptr processor - ) - : WindowProxy (name, node) +XMLNode * +ProcessorBox::entry_gui_object_state (ProcessorEntry* entry) +{ + if (!_parent_strip) { + return 0; + } + + GUIObjectState& st = _parent_strip->gui_object_state (); + + XMLNode* strip = st.get_or_add_node (_parent_strip->state_id ()); + assert (strip); + return st.get_or_add_node (strip, entry->state_id()); +} + +void +ProcessorBox::update_gui_object_state (ProcessorEntry* entry) +{ + XMLNode* proc = entry_gui_object_state (entry); + if (!proc) { + return; + } + + /* XXX: this is a bit inefficient; we just remove all child nodes and re-add them */ + proc->remove_nodes_and_delete (X_("Object")); + entry->add_control_state (proc); +} + +ProcessorWindowProxy::ProcessorWindowProxy (string const & name, ProcessorBox* box, boost::weak_ptr processor) + : WM::ProxyBase (name, string()) , marked (false) , _processor_box (box) , _processor (processor) + , is_custom (false) + , want_custom (false) { } +ARDOUR::SessionHandlePtr* +ProcessorWindowProxy::session_handle() +{ + /* we don't care */ + return 0; +} + +XMLNode& +ProcessorWindowProxy::get_state () const +{ + XMLNode *node; + node = &ProxyBase::get_state(); + node->add_property (X_("custom-ui"), is_custom? X_("yes") : X_("no")); + return *node; +} void -ProcessorWindowProxy::show () +ProcessorWindowProxy::set_state (const XMLNode& node) +{ + XMLNodeList children = node.children (); + XMLNodeList::const_iterator i = children.begin (); + while (i != children.end()) { + XMLProperty* prop = (*i)->property (X_("name")); + if ((*i)->name() == X_("Window") && prop && prop->value() == _name) { + break; + } + ++i; + } + + if (i != children.end()) { + XMLProperty* prop; + if ((prop = (*i)->property (X_("custom-ui"))) != 0) { + want_custom = PBD::string_is_affirmative (prop->value ()); + } + } + + ProxyBase::set_state(node); +} + +Gtk::Window* +ProcessorWindowProxy::get (bool create) { boost::shared_ptr p = _processor.lock (); + if (!p) { - return; + return 0; + } + if (_window && (is_custom != want_custom)) { + /* drop existing window - wrong type */ + drop_window (); + } + + if (!_window) { + if (!create) { + return 0; + } + + is_custom = want_custom; + _window = _processor_box->get_editor_window (p, is_custom); + + if (_window) { + setup (); + } } - _processor_box->toggle_edit_processor (p); + return _window; } +void +ProcessorWindowProxy::toggle () +{ + if (_window && (is_custom != want_custom)) { + /* drop existing window - wrong type */ + drop_window (); + } + is_custom = want_custom; + + WM::ProxyBase::toggle (); +}