X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fprocessor_box.cc;h=17f548c0e3ce500b563d8261c452e93e4de480ca;hb=3f56abe099cd6978fbf2e1778debd74e771c95cd;hp=c5454d59aab73626590b4057dc632477df05d75e;hpb=8ca49536e78b67c190036bcd17c0f26214ae36ff;p=ardour.git diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index c5454d59aa..17f548c0e3 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" @@ -76,7 +73,7 @@ #include "i18n.h" -#ifdef HAVE_AUDIOUNITS +#ifdef AUDIOUNIT_SUPPORT class AUPluginUI; #endif @@ -92,78 +89,99 @@ RefPtr ProcessorBox::paste_action; RefPtr ProcessorBox::cut_action; RefPtr ProcessorBox::rename_action; RefPtr ProcessorBox::edit_action; -Glib::RefPtr SendProcessorEntry::_slider; +RefPtr ProcessorBox::edit_generic_action; -ProcessorEntry::ProcessorEntry (boost::shared_ptr p, Width w) - : _position (PreFader) +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) { - _hbox.pack_start (_active, false, false); - _event_box.add (_name); - _hbox.pack_start (_event_box, true, true); - _vbox.pack_start (_hbox); - _frame.add (_vbox); + _vbox.show (); + + _button.set_diameter (3); + _button.set_distinct_led_click (true); + _button.set_led_left (true); + _button.signal_led_clicked.connect (sigc::mem_fun (*this, &ProcessorEntry::led_clicked)); + _button.set_text (name (_width)); - /* without this, the border is mis-drawn on some systems */ - _vbox.set_border_width (1); + if (_processor) { - _name.set_alignment (0, 0.5); - _name.set_text (name ()); - _name.set_padding (2, 2); + _vbox.pack_start (_button, true, true); - if (boost::dynamic_pointer_cast (p)) { - /* Fader processor gets a special look */ - _event_box.set_name ("ProcessorFader"); - _frame.set_name ("ProcessorFaderFrame"); - _name.set_padding (2, 4); - } + _button.set_active (_processor->active()); + _button.show (); - _active.set_active (_processor->active ()); - _active.signal_toggled().connect (sigc::mem_fun (*this, &ProcessorEntry::active_toggled)); + _processor->ActiveChanged.connect (active_connection, invalidator (*this), boost::bind (&ProcessorEntry::processor_active_changed, this), gui_context()); + _processor->PropertyChanged.connect (name_connection, invalidator (*this), boost::bind (&ProcessorEntry::processor_property_changed, this, _1), gui_context()); - _frame.show (); - _vbox.show (); - _hbox.show (); - _event_box.show (); - _name.show (); - _active.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()); + 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 (); + } else { + _vbox.set_size_request (-1, _button.size_request().height); + } +} + +ProcessorEntry::~ProcessorEntry () +{ + for (list::iterator i = _controls.begin(); i != _controls.end(); ++i) { + delete *i; + } } EventBox& ProcessorEntry::action_widget () { - return _event_box; + return _button; } Gtk::Widget& ProcessorEntry::widget () { - return _frame; + return _vbox; } string ProcessorEntry::drag_text () const { - return name (); + return name (Wide); } void -ProcessorEntry::set_visual_state (Gtk::StateType t) +ProcessorEntry::set_position (Position p) { - _visual_state = t; + _position = p; setup_visuals (); } void -ProcessorEntry::set_position (Position p) +ProcessorEntry::set_visual_state (Gtkmm2ext::VisualState s, bool yn) { - _position = p; - setup_visuals (); + if (yn) { + _button.set_visual_state (Gtkmm2ext::VisualState (_button.visual_state() | s)); + } else { + _button.set_visual_state (Gtkmm2ext::VisualState (_button.visual_state() & ~s)); + } } void @@ -171,46 +189,19 @@ ProcessorEntry::setup_visuals () { switch (_position) { case PreFader: - _event_box.set_name ("ProcessorPreFader"); - if (_visual_state == Gtk::STATE_NORMAL) { - _frame.set_name ("ProcessorPreFaderFrame"); - } + _button.set_name ("processor prefader"); break; case Fader: - _event_box.set_name ("ProcessorFader"); - if (_visual_state == Gtk::STATE_NORMAL) { - _frame.set_name ("ProcessorFaderFrame"); - } + _button.set_name ("processor fader"); break; case PostFader: - _event_box.set_name ("ProcessorPostFader"); - if (_visual_state == Gtk::STATE_NORMAL) { - _frame.set_name ("ProcessorPostFaderFrame"); - } - break; - } - - switch (_visual_state) { - case Gtk::STATE_NORMAL: - /* _frame has been set up above */ - _event_box.set_state (Gtk::STATE_NORMAL); - break; - case Gtk::STATE_SELECTED: - _frame.set_name ("ProcessorFrameSelected"); - /* don't change the background of the box when it is selected */ - _event_box.set_state (Gtk::STATE_NORMAL); - break; - case Gtk::STATE_ACTIVE: - _frame.set_name ("ProcessorFrameActiveSend"); - _event_box.set_state (Gtk::STATE_ACTIVE); - break; - default: + _button.set_name ("processor postfader"); break; } } - + boost::shared_ptr ProcessorEntry::processor () const @@ -222,18 +213,17 @@ void ProcessorEntry::set_enum_width (Width w) { _width = w; + _button.set_text (name (_width)); } void -ProcessorEntry::active_toggled () +ProcessorEntry::led_clicked() { - if (_active.get_active ()) { - if (!_processor->active ()) { - _processor->activate (); - } - } else { - if (_processor->active ()) { + if (_processor) { + if (_button.get_active ()) { _processor->deactivate (); + } else { + _processor->activate (); } } } @@ -241,8 +231,8 @@ ProcessorEntry::active_toggled () void ProcessorEntry::processor_active_changed () { - if (_active.get_active () != _processor->active ()) { - _active.set_active (_processor->active ()); + if (_processor) { + _button.set_active (_processor->active()); } } @@ -250,28 +240,52 @@ void ProcessorEntry::processor_property_changed (const PropertyChange& what_changed) { if (what_changed.contains (ARDOUR::Properties::name)) { - _name.set_text (name ()); + _button.set_text (name (_width)); + setup_tooltip (); + } +} + +void +ProcessorEntry::setup_tooltip () +{ + 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 -ProcessorEntry::name () const +ProcessorEntry::name (Width w) const { boost::shared_ptr send; string name_display; - + + if (!_processor) { + return string(); + } + if ((send = boost::dynamic_pointer_cast (_processor)) != 0 && !boost::dynamic_pointer_cast(_processor)) { - + name_display += '>'; - + /* grab the send name out of its overall name */ - + string::size_type lbracket, rbracket; lbracket = send->name().find ('['); rbracket = send->name().find (']'); - - switch (_width) { + + switch (w) { case Wide: name_display += send->name().substr (lbracket+1, lbracket-rbracket-1); break; @@ -279,10 +293,10 @@ ProcessorEntry::name () const name_display += PBD::short_version (send->name().substr (lbracket+1, lbracket-rbracket-1), 4); break; } - + } else { - - switch (_width) { + + switch (w) { case Wide: name_display += _processor->display_name(); break; @@ -290,80 +304,306 @@ ProcessorEntry::name () const name_display += PBD::short_version (_processor->display_name(), 5); break; } + + } + + return name_display; +} + +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); +} + +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 () +{ + for (list::iterator i = _controls.begin(); i != _controls.end(); ++i) { + (*i)->hide_things (); + } +} + + +Menu * +ProcessorEntry::build_controls_menu () +{ + using namespace Menu_Helpers; + Menu* menu = manage (new Menu); + MenuList& items = menu->items (); + + items.push_back ( + MenuElem (_("Show All Controls"), sigc::mem_fun (*this, &ProcessorEntry::show_all_controls)) + ); + items.push_back ( + MenuElem (_("Hide All Controls"), sigc::mem_fun (*this, &ProcessorEntry::hide_all_controls)) + ); + + if (!_controls.empty ()) { + items.push_back (SeparatorElem ()); } - return name_display; + 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; } -SendProcessorEntry::SendProcessorEntry (boost::shared_ptr s, Width w) - : ProcessorEntry (s, w), - _send (s), - /* set the adjustment to a gain of 0dB so that the fader's default value is right */ - _adjustment (0.781787, 0, 1, 0.01, 0.1), - _fader (_slider, &_adjustment, 0, false), - _ignore_gain_change (false) +void +ProcessorEntry::toggle_control_visibility (Control* c) { - _fader.set_name ("SendFader"); - _fader.set_controllable (_send->amp()->gain_control ()); - _vbox.pack_start (_fader); + c->set_visible (!c->visible ()); + _parent->update_gui_object_state (this); +} - _fader.show (); +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 { + + _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 (); - _adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &SendProcessorEntry::gain_adjusted)); - _send->amp()->gain_control()->Changed.connect (send_gain_connection, invalidator (*this), boost::bind (&SendProcessorEntry::show_gain, this), gui_context()); - show_gain (); + /* 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 () { - ENSURE_GUI_THREAD (*this, &SendProcessorEntry::show_gain) + if (_ignore_ui_adjustment) { + return; + } - float const value = gain_to_slider_position (_send->amp()->gain ()); + 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; + } + + _ignore_ui_adjustment = true; + + if (c->toggled ()) { - if (_adjustment.get_value() != value) { - _ignore_gain_change = true; - _adjustment.set_value (value); - _ignore_gain_change = false; + _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 ()) << _("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); +} + +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); + } +} + +void +ProcessorEntry::Control::set_visible (bool v) +{ + if (v) { + box.show (); + } else { + box.hide (); } + + _visible = v; +} - _send->amp()->set_gain (slider_position_to_gain (_adjustment.get_value()), this); +/** 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); @@ -384,6 +624,13 @@ PluginInsertProcessorEntry::plugin_insert_splitting_changed () } } +void +PluginInsertProcessorEntry::hide_things () +{ + ProcessorEntry::hide_things (); + plugin_insert_splitting_changed (); +} + void PluginInsertProcessorEntry::setup_visuals () { @@ -409,45 +656,59 @@ PluginInsertProcessorEntry::SplittingIcon::on_expose_event (GdkEventExpose* ev) { cairo_t* cr = gdk_cairo_create (get_window()->gobj()); - cairo_set_line_width (cr, 1); + cairo_rectangle (cr, ev->area.x, ev->area.y, ev->area.width, ev->area.height); + cairo_clip (cr); - double const width = ev->area.width; - double const height = ev->area.height; + cairo_set_line_width (cr, 1.5); + cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND); + + Gtk::Allocation a = get_allocation(); + double const width = a.get_width(); + double const height = a.get_height(); Gdk::Color const bg = get_style()->get_bg (STATE_NORMAL); cairo_set_source_rgb (cr, bg.get_red_p (), bg.get_green_p (), bg.get_blue_p ()); - + cairo_rectangle (cr, 0, 0, width, height); cairo_fill (cr); Gdk::Color const fg = get_style()->get_fg (STATE_NORMAL); cairo_set_source_rgb (cr, fg.get_red_p (), fg.get_green_p (), fg.get_blue_p ()); - cairo_move_to (cr, width * 0.3, height); - cairo_line_to (cr, width * 0.3, height * 0.5); - cairo_line_to (cr, width * 0.7, height * 0.5); - cairo_line_to (cr, width * 0.7, height); - cairo_move_to (cr, width * 0.5, height * 0.5); - cairo_line_to (cr, width * 0.5, 0); + const float si_l = rint(width * 0.3) + .5; + const float si_c = rint(width * 0.5) + .5; + const float si_r = rint(width * 0.7) + .5; + const float si_m = rint(height * 0.5) + .5; + + cairo_move_to (cr, si_l, height); + cairo_line_to (cr, si_l, si_m); + cairo_line_to (cr, si_r, si_m); + cairo_line_to (cr, si_r, height); + + cairo_set_line_cap (cr, CAIRO_LINE_CAP_BUTT); + cairo_move_to (cr, si_c, si_m); + cairo_line_to (cr, si_c, 0); cairo_stroke (cr); return true; } ProcessorBox::ProcessorBox (ARDOUR::Session* sess, boost::function get_plugin_selector, - RouteRedirectSelection& rsel, MixerStrip* parent, bool owner_is_mixer) + RouteProcessorSelection& rsel, MixerStrip* parent, bool owner_is_mixer) : _parent_strip (parent) , _owner_is_mixer (owner_is_mixer) , ab_direction (true) , _get_plugin_selector (get_plugin_selector) - , _placement(PreFader) + , _placement (-1) + , _visible_prefader_processors (0) , _rr_selection(rsel) + , _redisplay_pending (false) + { set_session (sess); _width = Wide; processor_menu = 0; - send_action_menu = 0; no_processor_redisplay = false; processor_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC); @@ -456,35 +717,42 @@ 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 () ); } + + ARDOUR_UI::instance()->set_tip (processor_display, _("Right-click to add/remove/edit\nplugins,inserts,sends and more")); } ProcessorBox::~ProcessorBox () { + /* it may appear as if we should delete processor_menu but that is a + * pointer to a widget owned by the UI Manager, and has potentially + * be returned to many other ProcessorBoxes. GTK doesn't really make + * clear the ownership of this widget, which is a menu and thus is + * never packed into any container other than an implict GtkWindow. + * + * For now, until or if we ever get clarification over the ownership + * story just let it continue to exist. At worst, its a small memory leak. + */ } void @@ -493,7 +761,7 @@ ProcessorBox::set_route (boost::shared_ptr r) if (_route == r) { return; } - + _route_connections.drop_connections(); /* new route: any existing block on processor redisplay must be meaningless */ @@ -501,15 +769,15 @@ 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 ( _route_connections, invalidator (*this), boost::bind (&ProcessorBox::route_going_away, this), gui_context() ); - + _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 (); @@ -520,6 +788,7 @@ ProcessorBox::route_going_away () { /* don't keep updating display as processors are deleted */ no_processor_redisplay = true; + _route.reset (); } void @@ -528,12 +797,29 @@ 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 (); list > procs; for (list::const_iterator i = children.begin(); i != children.end(); ++i) { - procs.push_back ((*i)->processor ()); + if ((*i)->processor ()) { + procs.push_back ((*i)->processor ()); + } } for (list >::const_iterator i = procs.begin(); i != procs.end(); ++i) { @@ -551,25 +837,18 @@ ProcessorBox::object_drop(DnDVBox* source, ProcessorEntry* posit if ((context->get_suggested_action() == Gdk::ACTION_MOVE) && source) { ProcessorBox* other = reinterpret_cast (source->get_data ("processorbox")); if (other) { - cerr << "source was another processor box, delete the selected items\n"; other->delete_dragged_processors (procs); } } } -void -ProcessorBox::update() -{ - redisplay_processors (); -} - void ProcessorBox::set_width (Width w) { if (_width == w) { return; } - + _width = w; list children = processor_display.children (); @@ -577,20 +856,7 @@ ProcessorBox::set_width (Width w) (*i)->set_enum_width (w); } - redisplay_processors (); -} - -void -ProcessorBox::build_send_action_menu () -{ - using namespace Menu_Helpers; - - send_action_menu = new Menu; - send_action_menu->set_name ("ArdourContextMenu"); - MenuList& items = send_action_menu->items(); - - items.push_back (MenuElem (_("New send"), sigc::mem_fun(*this, &ProcessorBox::new_send))); - items.push_back (MenuElem (_("Show send controls"), sigc::mem_fun(*this, &ProcessorBox::show_send_controls))); + queue_resize (); } Gtk::Menu* @@ -599,6 +865,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; } @@ -616,29 +883,24 @@ ProcessorBox::build_possible_aux_menu () } void -ProcessorBox::show_send_controls () -{ -} - -void -ProcessorBox::new_send () -{ -} - -void -ProcessorBox::show_processor_menu (gint arg) +ProcessorBox::show_processor_menu (int arg) { if (processor_menu == 0) { processor_menu = build_processor_menu (); + processor_menu->signal_unmap().connect (sigc::mem_fun (*this, &ProcessorBox::processor_menu_unmapped)); } - Gtk::MenuItem* plugin_menu_item = dynamic_cast(ActionManager::get_widget("/processormenu/newplugin")); + /* Sort out the plugin submenu */ + + Gtk::MenuItem* plugin_menu_item = dynamic_cast(ActionManager::get_widget("/ProcessorMenu/newplugin")); if (plugin_menu_item) { plugin_menu_item->set_submenu (*_get_plugin_selector()->plugin_menu()); } - Gtk::MenuItem* aux_menu_item = dynamic_cast(ActionManager::get_widget("/processormenu/newaux")); + /* And the aux submenu */ + + Gtk::MenuItem* aux_menu_item = dynamic_cast(ActionManager::get_widget("/ProcessorMenu/newaux")); if (aux_menu_item) { Menu* m = build_possible_aux_menu(); @@ -652,46 +914,79 @@ ProcessorBox::show_processor_menu (gint 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()); paste_action->set_sensitive (!_rr_selection.processors.empty()); + 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 ()); + edit_generic_action->set_sensitive (one_processor_can_be_edited ()); + + boost::shared_ptr pi; + if (single_selection) { + pi = boost::dynamic_pointer_cast (single_selection->processor ()); + } + + /* 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->processor ())); + processor_menu->popup (1, arg); -} -bool -ProcessorBox::enter_notify (GdkEventCrossing*) -{ - _current_processor_box = this; - Keyboard::magic_widget_grab_focus (); - processor_display.grab_focus (); + /* Add a placeholder gap to the processor list to indicate where a processor would be + inserted were one chosen from the menu. + */ + int x, y; + processor_display.get_pointer (x, y); + _placement = processor_display.add_placeholder (y); - return false; + if (_visible_prefader_processors == 0 && _placement > 0) { + --_placement; + } } bool -ProcessorBox::leave_notify (GdkEventCrossing* ev) +ProcessorBox::enter_notify (GdkEventCrossing*) { - switch (ev->detail) { - case GDK_NOTIFY_INFERIOR: - break; - default: - Keyboard::magic_widget_drop_focus (); - } - + _current_processor_box = this; return false; } bool -ProcessorBox::processor_key_press_event (GdkEventKey *) +ProcessorBox::leave_notify (GdkEventCrossing*) { - /* do real stuff on key release */ return false; } -bool -ProcessorBox::processor_key_release_event (GdkEventKey *ev) +void +ProcessorBox::processor_operation (ProcessorOperation op) { - bool ret = false; ProcSelection targets; get_selected_processors (targets); @@ -703,58 +998,37 @@ ProcessorBox::processor_key_release_event (GdkEventKey *ev) pair const pointer = processor_display.get_child_at_position (y); - if (pointer.first) { + if (pointer.first && pointer.first->processor()) { targets.push_back (pointer.first->processor ()); } } - - switch (ev->keyval) { - case GDK_a: - if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { - processor_display.select_all (); - ret = true; - } + switch (op) { + case ProcessorsSelectAll: + processor_display.select_all (); break; - case GDK_c: - if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { - copy_processors (targets); - ret = true; - } + case ProcessorsCopy: + copy_processors (targets); break; - case GDK_x: - if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { - cut_processors (targets); - ret = true; - } + case ProcessorsCut: + cut_processors (targets); break; - case GDK_v: - if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { - if (targets.empty()) { - paste_processors (); - } else { - paste_processors (targets.front()); - } - ret = true; + case ProcessorsPaste: + if (targets.empty()) { + paste_processors (); + } else { + paste_processors (targets.front()); } break; - case GDK_Up: - break; - - case GDK_Down: - break; - - case GDK_Delete: - case GDK_BackSpace: + case ProcessorsDelete: delete_processors (targets); - ret = true; break; - case GDK_Return: + case ProcessorsToggleActive: for (ProcSelection::iterator i = targets.begin(); i != targets.end(); ++i) { if ((*i)->active()) { (*i)->deactivate (); @@ -762,21 +1036,33 @@ ProcessorBox::processor_key_release_event (GdkEventKey *ev) (*i)->activate (); } } - ret = true; break; - case GDK_slash: + case ProcessorsAB: ab_plugins (); - ret = true; break; default: break; } +} - return ret; +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) { @@ -784,7 +1070,7 @@ ProcessorBox::processor_button_press_event (GdkEventButton *ev, ProcessorEntry* if (child) { processor = child->processor (); } - + int ret = false; bool selected = processor_display.selected (child); @@ -792,8 +1078,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) { @@ -817,34 +1111,16 @@ ProcessorBox::processor_button_release_event (GdkEventButton *ev, ProcessorEntry if (child) { processor = child->processor (); } - - int ret = false; if (processor && Keyboard::is_delete_event (ev)) { Glib::signal_idle().connect (sigc::bind ( sigc::mem_fun(*this, &ProcessorBox::idle_delete_processor), boost::weak_ptr(processor))); - ret = true; } else if (Keyboard::is_context_menu_event (ev)) { - /* figure out if we are above or below the fader/amp processor, - and set the next insert position appropriately. - */ - - if (processor) { - if (_route->processor_is_prefader (processor)) { - _placement = PreFader; - } else { - _placement = PostFader; - } - } else { - _placement = PostFader; - } - show_processor_menu (ev->time); - ret = true; } else if (processor && Keyboard::is_button2_event (ev) #ifndef GTKOSX @@ -859,8 +1135,6 @@ ProcessorBox::processor_button_release_event (GdkEventButton *ev, ProcessorEntry } else { processor->activate (); } - ret = true; - } return false; @@ -869,24 +1143,11 @@ ProcessorBox::processor_button_release_event (GdkEventButton *ev, ProcessorEntry Menu * ProcessorBox::build_processor_menu () { - processor_menu = dynamic_cast(ActionManager::get_widget("/processormenu") ); + processor_menu = dynamic_cast(ActionManager::get_widget("/ProcessorMenu") ); processor_menu->set_name ("ArdourContextMenu"); return processor_menu; } -void -ProcessorBox::selection_changed () -{ - bool const sensitive = (processor_display.selection().empty()) ? false : true; - ActionManager::set_sensitive (ActionManager::plugin_selection_sensitive_actions, sensitive); - edit_action->set_sensitive (one_processor_can_be_edited ()); - - /* disallow rename for multiple selections and for plugin inserts */ - rename_action->set_sensitive ( - processor_display.selection().size() == 1 && boost::dynamic_pointer_cast (processor_display.selection().front()->processor()) == 0 - ); -} - void ProcessorBox::select_all_processors () { @@ -915,11 +1176,7 @@ ProcessorBox::use_plugins (const SelectedPlugins& plugins) Route::ProcessorStreams err_streams; - if (Config->get_new_plugins_active()) { - processor->activate (); - } - - if (_route->add_processor (processor, _placement, &err_streams)) { + if (_route->add_processor_by_index (processor, _placement, &err_streams, Config->get_new_plugins_active ())) { weird_plugin_dialog (**p, err_streams); return true; // XXX SHAREDPTR delete plugin here .. do we even need to care? @@ -940,7 +1197,7 @@ ProcessorBox::weird_plugin_dialog (Plugin& p, Route::ProcessorStreams streams) ArdourDialog dialog (_("Plugin Incompatibility")); Label label; - string text = string_compose(_("You attempted to add the plugin \"%1\" at index %2.\n"), + string text = string_compose(_("You attempted to add the plugin \"%1\" in slot %2.\n"), p.name(), streams.index); bool has_midi = streams.count.n_midi() > 0 || p.get_info()->n_inputs.n_midi() > 0; @@ -973,7 +1230,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 (); @@ -984,7 +1240,7 @@ void ProcessorBox::choose_insert () { boost::shared_ptr processor (new PortInsert (*_session, _route->pannable(), _route->mute_master())); - _route->add_processor (processor, _placement); + _route->add_processor_by_index (processor, _placement); } /* Caller must not hold process lock */ @@ -1000,7 +1256,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; @@ -1046,7 +1302,7 @@ ProcessorBox::send_io_finished (IOSelector::Result r, boost::weak_ptr break; case IOSelector::Accepted: - _route->add_processor (processor, _placement); + _route->add_processor_by_index (processor, _placement); if (Profile->get_sae()) { processor->activate (); } @@ -1074,7 +1330,7 @@ ProcessorBox::return_io_finished (IOSelector::Result r, boost::weak_ptradd_processor (processor, _placement); + _route->add_processor_by_index (processor, _placement); if (Profile->get_sae()) { processor->activate (); } @@ -1097,10 +1353,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 @@ -1117,7 +1370,8 @@ ProcessorBox::route_processors_changed (RouteProcessorChange c) void ProcessorBox::redisplay_processors () { - ENSURE_GUI_THREAD (*this, &ProcessorBox::redisplay_processors) + ENSURE_GUI_THREAD (*this, &ProcessorBox::redisplay_processors); + bool fader_seen; if (no_processor_redisplay) { return; @@ -1125,25 +1379,36 @@ ProcessorBox::redisplay_processors () processor_display.clear (); + _visible_prefader_processors = 0; + fader_seen = false; + + _route->foreach_processor (sigc::bind (sigc::mem_fun (*this, &ProcessorBox::help_count_visible_prefader_processors), + &_visible_prefader_processors, &fader_seen)); + + if (_visible_prefader_processors == 0) { // fader only + 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; } - + _route->foreach_processor (sigc::mem_fun (*this, &ProcessorBox::maybe_add_processor_to_ui_list)); /* 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; @@ -1163,11 +1428,11 @@ 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 (); - + if (p == t) { /* this processor is already on the list; done */ (*i)->marked = true; @@ -1189,27 +1454,49 @@ ProcessorBox::maybe_add_processor_to_ui_list (boost::weak_ptr w) } else { loc = X_("P"); } - + 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, + /* if the processor already has an existing UI, note that so that we don't recreate it */ - + 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 +ProcessorBox::help_count_visible_prefader_processors (boost::weak_ptr p, uint32_t* cnt, bool* amp_seen) +{ + boost::shared_ptr processor (p.lock ()); + + if (processor && processor->display_to_user()) { + + if (boost::dynamic_pointer_cast(processor)) { + *amp_seen = true; + } else { + if (!*amp_seen) { + (*cnt)++; + } + } + } } void @@ -1221,34 +1508,26 @@ 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); } - - e->set_pixel_width (get_allocation().get_width()); - processor_display.add_child (e); -} - -void -ProcessorBox::build_processor_tooltip (EventBox& box, string start) -{ - string tip(start); - - list children = processor_display.children (); - for (list::iterator i = children.begin(); i != children.end(); ++i) { - tip += '\n'; - tip += (*i)->processor()->name(); + /* Set up this entry's state from the GUIObjectState */ + XMLNode* proc = entry_gui_object_state (e); + if (proc) { + e->set_control_state (proc); } - ARDOUR_UI::instance()->set_tip (box, tip); + if (boost::dynamic_pointer_cast (processor)) { + /* Always show send controls */ + e->show_all_controls (); + } + + processor_display.add_child (e); } void @@ -1263,7 +1542,7 @@ ProcessorBox::setup_entry_positions () { list children = processor_display.children (); bool pre_fader = true; - + for (list::iterator i = children.begin(); i != children.end(); ++i) { if (boost::dynamic_pointer_cast((*i)->processor())) { pre_fader = false; @@ -1284,8 +1563,10 @@ ProcessorBox::compute_processor_sort_keys () list children = processor_display.children (); Route::ProcessorList our_processors; - for (list::iterator iter = children.begin(); iter != children.end(); ++iter) { - our_processors.push_back ((*iter)->processor ()); + for (list::iterator i = children.begin(); i != children.end(); ++i) { + if ((*i)->processor()) { + our_processors.push_back ((*i)->processor ()); + } } if (_route->reorder_processors (our_processors)) { @@ -1302,14 +1583,14 @@ void ProcessorBox::report_failed_reorder () { /* reorder failed, so redisplay */ - + redisplay_processors (); - + /* now tell them about the problem */ - + ArdourDialog dialog (_("Plugin Incompatibility")); Label label; - + label.set_text (_("\ You cannot reorder these plugins/sends/inserts\n\ in that way because the inputs and\n\ @@ -1318,12 +1599,11 @@ outputs will not work correctly.")); dialog.get_vbox()->set_border_width (12); dialog.get_vbox()->pack_start (label); 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 (); - + dialog.run (); } @@ -1349,27 +1629,19 @@ ProcessorBox::can_cut () const vector > sel; get_selected_processors (sel); - + /* cut_processors () does not cut inserts */ for (vector >::const_iterator i = sel.begin (); i != sel.end (); ++i) { - + if (boost::dynamic_pointer_cast((*i)) != 0 || (boost::dynamic_pointer_cast((*i)) != 0) || (boost::dynamic_pointer_cast((*i)) != 0)) { return true; } } - - return false; -} - -void -ProcessorBox::cut_processors () -{ - ProcSelection to_be_removed; - get_selected_processors (to_be_removed); + return false; } void @@ -1413,14 +1685,6 @@ ProcessorBox::cut_processors (const ProcSelection& to_be_removed) redisplay_processors (); } -void -ProcessorBox::copy_processors () -{ - ProcSelection to_be_copied; - get_selected_processors (to_be_copied); - copy_processors (to_be_copied); -} - void ProcessorBox::copy_processors (const ProcSelection& to_be_copied) { @@ -1442,14 +1706,6 @@ ProcessorBox::copy_processors (const ProcSelection& to_be_copied) _rr_selection.set (node); } -void -ProcessorBox::delete_processors () -{ - ProcSelection to_be_deleted; - get_selected_processors (to_be_deleted); - delete_processors (to_be_deleted); -} - void ProcessorBox::delete_processors (const ProcSelection& targets) { @@ -1593,6 +1849,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; @@ -1600,29 +1857,56 @@ 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; } 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; @@ -1630,6 +1914,19 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr p.reset (r); + } else if (type->value() == "port") { + + XMLNode n (**niter); + 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 is a plugin. @@ -1643,7 +1940,7 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr } catch (...) { - cerr << "plugin insert constructor failed\n"; + error << _("plugin insert constructor failed") << endmsg; } } @@ -1662,18 +1959,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 { @@ -1693,9 +1978,9 @@ ProcessorBox::for_selected_processors (void (ProcessorBox::*method)(boost::share } void -ProcessorBox::all_processors_active (bool state) +ProcessorBox::all_visible_processors_active (bool state) { - _route->all_processors_active (_placement, state); + _route->all_visible_processors_active (state); } void @@ -1782,8 +2067,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; @@ -1795,46 +2080,36 @@ 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; } } if (boost::dynamic_pointer_cast (processor)) { - _parent_strip->revert_to_default_display (); - - } else if ((internal_send = boost::dynamic_pointer_cast (processor)) != 0) { - - if (!_session->engine().connected()) { - return; - } - if (_parent_strip) { - if (boost::dynamic_pointer_cast (_parent_strip->current_delivery()) == internal_send) { - _parent_strip->revert_to_default_display (); - } else { - _parent_strip->show_send (internal_send); - } + _parent_strip->revert_to_default_display (); } } else if ((send = boost::dynamic_pointer_cast (processor)) != 0) { if (!_session->engine().connected()) { - return; + return 0; } - SendUIWindow* w = new SendUIWindow (send, _session); - w->show (); + if (boost::dynamic_pointer_cast (processor) == 0) { + + gidget = new SendUIWindow (send, _session); + } } else if ((retrn = boost::dynamic_pointer_cast (processor)) != 0) { - if (boost::dynamic_pointer_cast (retrn)) { - /* no GUI for these */ - return; - } + if (boost::dynamic_pointer_cast (retrn)) { + /* no GUI for these */ + return 0; + } if (!_session->engine().connected()) { - return; + return 0; } boost::shared_ptr retrn = boost::dynamic_pointer_cast (processor); @@ -1860,20 +2135,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; @@ -1881,9 +2151,9 @@ ProcessorBox::toggle_edit_processor (boost::shared_ptr processor) } else if ((port_insert = boost::dynamic_pointer_cast (processor)) != 0) { if (!_session->engine().connected()) { - MessageDialog msg ( _("Not connected to JACK - no I/O changes are possible")); + MessageDialog msg ( _("Not connected to audio engine - no I/O changes are possible")); msg.run (); - return; + return 0; } PortInsertWindow *io_selector; @@ -1901,20 +2171,29 @@ 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; +} + +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 0; } + + PluginUIWindow* win = new PluginUIWindow (plugin_insert, true, false); + win->set_title (generate_processor_title (plugin_insert)); + + return win; } void ProcessorBox::register_actions () { - Glib::RefPtr popup_act_grp = Gtk::ActionGroup::create(X_("processormenu")); + Glib::RefPtr popup_act_grp = Gtk::ActionGroup::create(X_("ProcessorMenu")); Glib::RefPtr act; /* new stuff */ @@ -1923,13 +2202,15 @@ ProcessorBox::register_actions () act = ActionManager::register_action (popup_act_grp, X_("newinsert"), _("New Insert"), sigc::ptr_fun (ProcessorBox::rb_choose_insert)); - ActionManager::jack_sensitive_actions.push_back (act); - act = ActionManager::register_action (popup_act_grp, X_("newsend"), _("New Send ..."), + ActionManager::engine_sensitive_actions.push_back (act); + act = ActionManager::register_action (popup_act_grp, X_("newsend"), _("New External Send ..."), sigc::ptr_fun (ProcessorBox::rb_choose_send)); - ActionManager::jack_sensitive_actions.push_back (act); + ActionManager::engine_sensitive_actions.push_back (act); 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)"), @@ -1960,20 +2241,35 @@ ProcessorBox::register_actions () /* activation etc. */ - ActionManager::register_action (popup_act_grp, X_("activate_all"), _("Activate all"), - sigc::ptr_fun (ProcessorBox::rb_activate_all)); - ActionManager::register_action (popup_act_grp, X_("deactivate_all"), _("Deactivate all"), - sigc::ptr_fun (ProcessorBox::rb_deactivate_all)); + ActionManager::register_action (popup_act_grp, X_("activate_all"), _("Activate All"), + sigc::ptr_fun (ProcessorBox::rb_activate_all)); + ActionManager::register_action (popup_act_grp, X_("deactivate_all"), _("Deactivate All"), + sigc::ptr_fun (ProcessorBox::rb_deactivate_all)); ActionManager::register_action (popup_act_grp, X_("ab_plugins"), _("A/B Plugins"), - sigc::ptr_fun (ProcessorBox::rb_ab_plugins)); + sigc::ptr_fun (ProcessorBox::rb_ab_plugins)); /* show editors */ - edit_action = ActionManager::register_action (popup_act_grp, X_("edit"), _("Edit..."), - sigc::ptr_fun (ProcessorBox::rb_edit)); + edit_action = ActionManager::register_action ( + popup_act_grp, X_("edit"), _("Edit..."), + sigc::ptr_fun (ProcessorBox::rb_edit)); + + 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 () { @@ -2060,7 +2356,7 @@ ProcessorBox::rb_cut () return; } - _current_processor_box->cut_processors (); + _current_processor_box->processor_operation (ProcessorsCut); } void @@ -2070,7 +2366,7 @@ ProcessorBox::rb_delete () return; } - _current_processor_box->delete_processors (); + _current_processor_box->processor_operation (ProcessorsDelete); } void @@ -2079,7 +2375,7 @@ ProcessorBox::rb_copy () if (_current_processor_box == 0) { return; } - _current_processor_box->copy_processors (); + _current_processor_box->processor_operation (ProcessorsCopy); } void @@ -2089,7 +2385,7 @@ ProcessorBox::rb_paste () return; } - _current_processor_box->paste_processors (); + _current_processor_box->processor_operation (ProcessorsPaste); } void @@ -2108,7 +2404,7 @@ ProcessorBox::rb_select_all () return; } - _current_processor_box->select_all_processors (); + _current_processor_box->processor_operation (ProcessorsSelectAll); } void @@ -2128,7 +2424,7 @@ ProcessorBox::rb_activate_all () return; } - _current_processor_box->all_processors_active (true); + _current_processor_box->all_visible_processors_active (true); } void @@ -2137,7 +2433,7 @@ ProcessorBox::rb_deactivate_all () if (_current_processor_box == 0) { return; } - _current_processor_box->all_processors_active (false); + _current_processor_box->all_visible_processors_active (false); } void @@ -2147,7 +2443,61 @@ ProcessorBox::rb_edit () return; } - _current_processor_box->for_selected_processors (&ProcessorBox::toggle_edit_processor); + _current_processor_box->for_selected_processors (&ProcessorBox::edit_processor); +} + +bool +ProcessorBox::edit_aux_send (boost::shared_ptr processor) +{ + if (boost::dynamic_pointer_cast (processor) == 0) { + return false; + } + + if (_parent_strip) { + boost::shared_ptr send = boost::dynamic_pointer_cast (processor); + if (_parent_strip->current_delivery() == send) { + _parent_strip->revert_to_default_display (); + } else { + _parent_strip->show_send(send); + } + } + return true; +} + +void +ProcessorBox::edit_processor (boost::shared_ptr processor) +{ + if (!processor) { + return; + } + if (edit_aux_send (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; + } + if (edit_aux_send (processor)) { + return; + } + + ProcessorWindowProxy* proxy = find_window_proxy (processor); + + if (proxy) { + proxy->set_custom_ui_mode (false); + proxy->toggle (); + } } void @@ -2169,6 +2519,10 @@ ProcessorBox::route_property_changed (const PropertyChange& what_changed) processor = (*iter)->processor (); + if (!processor) { + continue; + } + Window* w = get_processor_ui (processor); if (!w) { @@ -2203,25 +2557,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 (); @@ -2230,10 +2573,6 @@ ProcessorBox::get_processor_ui (boost::shared_ptr p) const ++i; } - /* we shouldn't get here, because the ProcessorUIList should always contain - an entry for each processor. - */ - assert (false); return 0; } @@ -2244,14 +2583,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 (); - - p->set_ui (w); - - while (i != _processor_window_proxies.end()) { + list::iterator i = _processor_window_info.begin (); + + p->set_ui (w); + + 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; } @@ -2285,29 +2624,136 @@ ProcessorBox::mixer_strip_delivery_changed (boost::weak_ptr w) } } -ProcessorWindowProxy::ProcessorWindowProxy ( - string const & name, - XMLNode const * node, - ProcessorBox* box, - boost::weak_ptr processor - ) - : WindowProxy (name, node) +/** Called to repair the damage of Editor::show_window doing a show_all() */ +void +ProcessorBox::hide_things () +{ + list c = processor_display.children (); + for (list::iterator i = c.begin(); i != c.end(); ++i) { + (*i)->hide_things (); + } +} + +void +ProcessorBox::processor_menu_unmapped () +{ + processor_display.remove_placeholder (); +} + +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 (); +}