X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fprocessor_box.cc;h=9f2f1ed1e5b6739f14723dbd8e5f918644d2bbc7;hb=0f7e4234225d6b94d13091a53f55e55d1be1df02;hp=a2c5f61b244e5c66267ccb85da5a192dba671886;hpb=6dde76454d7facd732e65b8218f02d8114864942;p=ardour.git diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index a2c5f61b24..9f2f1ed1e5 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -54,6 +54,7 @@ #include "ardour/route.h" #include "ardour/send.h" #include "ardour/session.h" +#include "ardour/dB.h" #include "actions.h" #include "ardour_dialog.h" @@ -91,11 +92,14 @@ RefPtr ProcessorBox::paste_action; RefPtr ProcessorBox::cut_action; RefPtr ProcessorBox::rename_action; RefPtr ProcessorBox::edit_action; +RefPtr ProcessorBox::controls_action; Glib::RefPtr SendProcessorEntry::_slider; ProcessorEntry::ProcessorEntry (boost::shared_ptr p, Width w) - : _processor (p) + : _position (PreFader) + , _processor (p) , _width (w) + , _visual_state (Gtk::STATE_NORMAL) { _hbox.pack_start (_active, false, false); _event_box.add (_name); @@ -103,6 +107,9 @@ ProcessorEntry::ProcessorEntry (boost::shared_ptr p, Width w) _vbox.pack_start (_hbox); _frame.add (_vbox); + /* without this, the border is mis-drawn on some systems */ + _vbox.set_border_width (1); + _name.set_alignment (0, 0.5); _name.set_text (name ()); _name.set_padding (2, 2); @@ -116,7 +123,14 @@ ProcessorEntry::ProcessorEntry (boost::shared_ptr p, Width w) _active.set_active (_processor->active ()); _active.signal_toggled().connect (sigc::mem_fun (*this, &ProcessorEntry::active_toggled)); - + + _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()); } @@ -139,6 +153,66 @@ ProcessorEntry::drag_text () const return name (); } +void +ProcessorEntry::set_visual_state (Gtk::StateType t) +{ + _visual_state = t; + setup_visuals (); +} + +void +ProcessorEntry::set_position (Position p) +{ + _position = p; + setup_visuals (); +} + +void +ProcessorEntry::setup_visuals () +{ + switch (_position) { + case PreFader: + _event_box.set_name ("ProcessorPreFader"); + if (_visual_state == Gtk::STATE_NORMAL) { + _frame.set_name ("ProcessorPreFaderFrame"); + } + break; + + case Fader: + _event_box.set_name ("ProcessorFader"); + if (_visual_state == Gtk::STATE_NORMAL) { + _frame.set_name ("ProcessorFaderFrame"); + } + 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: + break; + } +} + + boost::shared_ptr ProcessorEntry::processor () const { @@ -186,18 +260,18 @@ ProcessorEntry::name () const { boost::shared_ptr send; string name_display; - + 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) { case Wide: name_display += send->name().substr (lbracket+1, lbracket-rbracket-1); @@ -206,9 +280,9 @@ ProcessorEntry::name () const name_display += PBD::short_version (send->name().substr (lbracket+1, lbracket-rbracket-1), 4); break; } - + } else { - + switch (_width) { case Wide: name_display += _processor->display_name(); @@ -217,17 +291,16 @@ ProcessorEntry::name () const name_display += PBD::short_version (_processor->display_name(), 5); break; } - + } - + return name_display; } 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), + _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) { @@ -235,6 +308,8 @@ SendProcessorEntry::SendProcessorEntry (boost::shared_ptr s, Width w) _fader.set_controllable (_send->amp()->gain_control ()); _vbox.pack_start (_fader); + _fader.show (); + _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 (); @@ -250,14 +325,18 @@ SendProcessorEntry::setup_slider_pix () void SendProcessorEntry::show_gain () { - ENSURE_GUI_THREAD (*this, &SendProcessorEntry::show_gain) - - float const value = gain_to_slider_position (_send->amp()->gain ()); + float const value = gain_to_slider_position_with_max (_send->amp()->gain (), Config->get_max_gain()); if (_adjustment.get_value() != value) { _ignore_gain_change = true; _adjustment.set_value (value); _ignore_gain_change = false; + + 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 ()); } } @@ -268,7 +347,7 @@ SendProcessorEntry::gain_adjusted () return; } - _send->amp()->set_gain (slider_position_to_gain (_adjustment.get_value()), this); + _send->amp()->set_gain (slider_position_to_gain_with_max (_adjustment.get_value(), Config->get_max_gain()), this); } void @@ -277,6 +356,88 @@ SendProcessorEntry::set_pixel_width (int p) _fader.set_fader_length (p); } +PluginInsertProcessorEntry::PluginInsertProcessorEntry (boost::shared_ptr p, Width w) + : ProcessorEntry (p, w) + , _plugin_insert (p) +{ + p->SplittingChanged.connect ( + _splitting_connection, invalidator (*this), ui_bind (&PluginInsertProcessorEntry::plugin_insert_splitting_changed, this), gui_context() + ); + + _splitting_icon.set_size_request (-1, 12); + + _vbox.pack_start (_splitting_icon); + _vbox.reorder_child (_splitting_icon, 0); + + plugin_insert_splitting_changed (); +} + +void +PluginInsertProcessorEntry::plugin_insert_splitting_changed () +{ + if (_plugin_insert->splitting ()) { + _splitting_icon.show (); + } else { + _splitting_icon.hide (); + } +} + +void +PluginInsertProcessorEntry::hide_things () +{ + plugin_insert_splitting_changed (); +} + +void +PluginInsertProcessorEntry::setup_visuals () +{ + switch (_position) { + case PreFader: + _splitting_icon.set_name ("ProcessorPreFader"); + break; + + case Fader: + _splitting_icon.set_name ("ProcessorFader"); + break; + + case PostFader: + _splitting_icon.set_name ("ProcessorPostFader"); + break; + } + + ProcessorEntry::setup_visuals (); +} + +bool +PluginInsertProcessorEntry::SplittingIcon::on_expose_event (GdkEventExpose* ev) +{ + cairo_t* cr = gdk_cairo_create (get_window()->gobj()); + + cairo_set_line_width (cr, 1); + + double const width = ev->area.width; + double const height = ev->area.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); + cairo_stroke (cr); + + return true; +} + ProcessorBox::ProcessorBox (ARDOUR::Session* sess, boost::function get_plugin_selector, RouteRedirectSelection& rsel, MixerStrip* parent, bool owner_is_mixer) : _parent_strip (parent) @@ -316,6 +477,9 @@ ProcessorBox::ProcessorBox (ARDOUR::Session* sess, boost::functionDeliveryChanged.connect ( _mixer_strip_connections, invalidator (*this), ui_bind (&ProcessorBox::mixer_strip_delivery_changed, this, _1), gui_context () @@ -333,7 +497,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 */ @@ -343,11 +507,11 @@ ProcessorBox::set_route (boost::shared_ptr r) _route->processors_changed.connect ( _route_connections, invalidator (*this), ui_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() ); @@ -360,6 +524,7 @@ ProcessorBox::route_going_away () { /* don't keep updating display as processors are deleted */ no_processor_redisplay = true; + _route.reset (); } void @@ -409,7 +574,7 @@ ProcessorBox::set_width (Width w) if (_width == w) { return; } - + _width = w; list children = processor_display.children (); @@ -472,13 +637,13 @@ ProcessorBox::show_processor_menu (gint arg) processor_menu = build_processor_menu (); } - Gtk::MenuItem* plugin_menu_item = dynamic_cast(ActionManager::get_widget("/processormenu/newplugin")); + 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")); + Gtk::MenuItem* aux_menu_item = dynamic_cast(ActionManager::get_widget("/ProcessorMenu/newaux")); if (aux_menu_item) { Menu* m = build_possible_aux_menu(); @@ -554,7 +719,7 @@ ProcessorBox::processor_key_release_event (GdkEventKey *ev) if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { processor_display.select_all (); ret = true; - } + } break; case GDK_c: @@ -624,7 +789,7 @@ ProcessorBox::processor_button_press_event (GdkEventButton *ev, ProcessorEntry* if (child) { processor = child->processor (); } - + int ret = false; bool selected = processor_display.selected (child); @@ -657,15 +822,12 @@ 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)) { @@ -684,7 +846,6 @@ ProcessorBox::processor_button_release_event (GdkEventButton *ev, ProcessorEntry } show_processor_menu (ev->time); - ret = true; } else if (processor && Keyboard::is_button2_event (ev) #ifndef GTKOSX @@ -699,8 +860,6 @@ ProcessorBox::processor_button_release_event (GdkEventButton *ev, ProcessorEntry } else { processor->activate (); } - ret = true; - } return false; @@ -709,25 +868,32 @@ 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"); - - show_all_children(); - 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 ()); + 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()); + + const bool single_selection = (processor_display.selection().size() == 1); + + boost::shared_ptr pi; + if (single_selection) { + pi = boost::dynamic_pointer_cast( + processor_display.selection().front()->processor()); + } + + /* enable gui for plugin inserts with editors */ + controls_action->set_sensitive(pi && pi->plugin()->has_editor()); /* 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 - ); + rename_action->set_sensitive(single_selection && pi); } void @@ -758,11 +924,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 (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? @@ -783,7 +945,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; @@ -792,14 +954,14 @@ ProcessorBox::weird_plugin_dialog (Plugin& p, Route::ProcessorStreams streams) text += _("\nThis plugin has:\n"); if (has_midi) { uint32_t const n = p.get_info()->n_inputs.n_midi (); - text += string_compose (ngettext ("\t%1 MIDI input", "\t%1 MIDI inputs", n), n); + text += string_compose (ngettext ("\t%1 MIDI input\n", "\t%1 MIDI inputs\n", n), n); } if (has_audio) { uint32_t const n = p.get_info()->n_inputs.n_audio (); - text += string_compose (ngettext ("\t%1 audio input", "\t%1 audio inputs", n), n); + text += string_compose (ngettext ("\t%1 audio input\n", "\t%1 audio inputs\n", n), n); } - text += _("\nBut at the insertion point, there are:\n"); + text += _("\nbut at the insertion point, there are:\n"); if (has_midi) { uint32_t const n = streams.count.n_midi (); text += string_compose (ngettext ("\t%1 MIDI channel\n", "\t%1 MIDI channels\n", n), n); @@ -826,7 +988,7 @@ ProcessorBox::weird_plugin_dialog (Plugin& p, Route::ProcessorStreams streams) void ProcessorBox::choose_insert () { - boost::shared_ptr processor (new PortInsert (*_session, _route->mute_master())); + boost::shared_ptr processor (new PortInsert (*_session, _route->pannable(), _route->mute_master())); _route->add_processor (processor, _placement); } @@ -834,7 +996,7 @@ ProcessorBox::choose_insert () void ProcessorBox::choose_send () { - boost::shared_ptr send (new Send (*_session, _route->mute_master())); + boost::shared_ptr send (new Send (*_session, _route->pannable(), _route->mute_master())); /* make an educated guess at the initial number of outputs for the send */ ChanCount outs = (_session->master_out()) @@ -858,7 +1020,7 @@ ProcessorBox::choose_send () */ IOSelectorWindow *ios = new IOSelectorWindow (_session, send->output(), true); - ios->show_all (); + ios->show (); /* keep a reference to the send so it doesn't get deleted while the IOSelectorWindow is doing its stuff @@ -970,12 +1132,10 @@ ProcessorBox::redisplay_processors () _route->foreach_processor (sigc::mem_fun (*this, &ProcessorBox::add_processor_to_display)); - build_processor_tooltip (processor_eventbox, _("Inserts, sends & plugins:")); - for (list::iterator i = _processor_window_proxies.begin(); i != _processor_window_proxies.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 */ @@ -994,7 +1154,7 @@ ProcessorBox::redisplay_processors () i = j; } - setup_entry_widget_names (); + setup_entry_positions (); } /** Add a ProcessorWindowProxy for a processor to our list, if that processor does @@ -1012,7 +1172,7 @@ ProcessorBox::maybe_add_processor_to_ui_list (boost::weak_ptr w) while (i != _processor_window_proxies.end()) { boost::shared_ptr t = (*i)->processor().lock (); - + if (p == t) { /* this processor is already on the list; done */ (*i)->marked = true; @@ -1034,14 +1194,25 @@ 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); - + wp->marked = true; + + /* 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)); + } + _processor_window_proxies.push_back (wp); ARDOUR_UI::instance()->add_window_proxy (wp); } @@ -1056,12 +1227,16 @@ ProcessorBox::add_processor_to_display (boost::weak_ptr p) } 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); } else { e = new ProcessorEntry (processor, _width); } + e->set_pixel_width (get_allocation().get_width()); processor_display.add_child (e); } @@ -1077,7 +1252,7 @@ ProcessorBox::build_processor_tooltip (EventBox& box, string start) tip += '\n'; tip += (*i)->processor()->name(); } - + ARDOUR_UI::instance()->set_tip (box, tip); } @@ -1085,29 +1260,24 @@ void ProcessorBox::reordered () { compute_processor_sort_keys (); - setup_entry_widget_names (); + setup_entry_positions (); } -/* Name the Entry widgets according to pre- or post-fader so that they get coloured right */ void -ProcessorBox::setup_entry_widget_names () +ProcessorBox::setup_entry_positions () { - /* It just so happens that the action_widget() is the event box (which gives the background - * colour) and the widget() is the frame, more by good luck than good judgement. - */ - 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; + (*i)->set_position (ProcessorEntry::Fader); } else { if (pre_fader) { - (*i)->action_widget().set_name ("ProcessorPreFader"); - (*i)->widget().set_name ("ProcessorPreFaderFrame"); + (*i)->set_position (ProcessorEntry::PreFader); } else { - (*i)->action_widget().set_name ("ProcessorPostFader"); - (*i)->widget().set_name ("ProcessorPostFaderFrame"); + (*i)->set_position (ProcessorEntry::PostFader); } } } @@ -1137,14 +1307,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\ @@ -1153,12 +1323,12 @@ 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 (); } @@ -1184,18 +1354,18 @@ 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; } @@ -1443,14 +1613,14 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr XMLNode n (**niter); Send::make_unique (n, *_session); - Send* s = new Send (*_session, _route->mute_master()); + Send* s = new Send (*_session, _route->pannable(), _route->mute_master()); if (s->set_state (n, Stateful::loading_state_version)) { delete s; return; } p.reset (s); - + } else if (type->value() == "return") { @@ -1465,6 +1635,14 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr p.reset (r); + } 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)) { + return; + } + } else { /* XXX its a bit limiting to assume that everything else is a plugin. @@ -1634,7 +1812,13 @@ ProcessorBox::toggle_edit_processor (boost::shared_ptr processor) } } - if ((internal_send = boost::dynamic_pointer_cast (processor)) != 0) { + if (boost::dynamic_pointer_cast (processor)) { + + if (_parent_strip) { + _parent_strip->revert_to_default_display (); + } + + } else if ((internal_send = boost::dynamic_pointer_cast (processor)) != 0) { if (!_session->engine().connected()) { return; @@ -1655,14 +1839,14 @@ ProcessorBox::toggle_edit_processor (boost::shared_ptr processor) } SendUIWindow* w = new SendUIWindow (send, _session); - w->show_all (); + w->show (); } 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; + } if (!_session->engine().connected()) { return; @@ -1742,10 +1926,32 @@ ProcessorBox::toggle_edit_processor (boost::shared_ptr processor) } } +void +ProcessorBox::toggle_processor_controls (boost::shared_ptr processor) +{ + boost::shared_ptr plugin_insert + = boost::dynamic_pointer_cast(processor); + if (!plugin_insert) { + return; + } + + 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)); + + if (plugin_ui->is_visible()) { + plugin_ui->hide(); + } else { + plugin_ui->show_all(); + plugin_ui->present(); + } +} + 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 */ @@ -1792,15 +1998,21 @@ ProcessorBox::register_actions () /* activation etc. */ ActionManager::register_action (popup_act_grp, X_("activate_all"), _("Activate all"), - sigc::ptr_fun (ProcessorBox::rb_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)); + 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)); + + /* show plugin GUI */ + controls_action = ActionManager::register_action ( + popup_act_grp, X_("controls"), _("Controls..."), + sigc::ptr_fun (ProcessorBox::rb_controls)); ActionManager::add_action_group (popup_act_grp); } @@ -1981,6 +2193,16 @@ ProcessorBox::rb_edit () _current_processor_box->for_selected_processors (&ProcessorBox::toggle_edit_processor); } +void +ProcessorBox::rb_controls () +{ + if (_current_processor_box == 0) { + return; + } + + _current_processor_box->for_selected_processors (&ProcessorBox::toggle_processor_controls); +} + void ProcessorBox::route_property_changed (const PropertyChange& what_changed) { @@ -2076,6 +2298,9 @@ 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()) { boost::shared_ptr t = (*i)->processor().lock (); if (t && t == p) { @@ -2113,6 +2338,15 @@ ProcessorBox::mixer_strip_delivery_changed (boost::weak_ptr w) } } +void +ProcessorBox::hide_things () +{ + list c = processor_display.children (); + for (list::iterator i = c.begin(); i != c.end(); ++i) { + (*i)->hide_things (); + } +} + ProcessorWindowProxy::ProcessorWindowProxy ( string const & name, XMLNode const * node,