X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fprocessor_box.cc;h=e5d479b9ab5434829b00106f762898116af1710c;hb=f0db054a07ecc9d49fede8fcc9175a85c635369f;hp=f9b4cc0e6ecd7813e52e6c04ce6697620ff2499f;hpb=3b89d9eaa03406a5e03648f47734211f09b89d62;p=ardour.git diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index f9b4cc0e6e..e5d479b9ab 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -17,6 +17,10 @@ */ +#ifdef WAF_BUILD +#include "gtk2ardour-config.h" +#endif + #include #include #include @@ -35,13 +39,12 @@ #include #include #include -#include #include "ardour/amp.h" #include "ardour/ardour.h" -#include "ardour/audio_diskstream.h" #include "ardour/audio_track.h" #include "ardour/audioengine.h" +#include "ardour/internal_send.h" #include "ardour/ladspa_plugin.h" #include "ardour/meter.h" #include "ardour/plugin_insert.h" @@ -59,6 +62,7 @@ #include "io_selector.h" #include "keyboard.h" #include "mixer_ui.h" +#include "mixer_strip.h" #include "plugin_selector.h" #include "plugin_ui.h" #include "processor_box.h" @@ -75,7 +79,6 @@ class AUPluginUI; #endif using namespace std; -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Gtk; @@ -84,76 +87,221 @@ using namespace Gtkmm2ext; ProcessorBox* ProcessorBox::_current_processor_box = 0; RefPtr ProcessorBox::paste_action; -bool ProcessorBox::get_colors = true; -Gdk::Color* ProcessorBox::active_processor_color; -Gdk::Color* ProcessorBox::inactive_processor_color; +RefPtr ProcessorBox::cut_action; +RefPtr ProcessorBox::rename_action; +Glib::RefPtr SendProcessorEntry::_slider; + +ProcessorEntry::ProcessorEntry (boost::shared_ptr p, Width w) + : _processor (p) + , _width (w) +{ + _hbox.pack_start (_active, false, false); + _event_box.add (_name); + _hbox.pack_start (_event_box, true, true); + _vbox.pack_start (_hbox); + + _name.set_alignment (0, 0.5); + _name.set_text (name ()); + _name.set_padding (2, 2); + + _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), ui_bind (&ProcessorEntry::processor_property_changed, this, _1), gui_context()); +} + +EventBox& +ProcessorEntry::action_widget () +{ + return _event_box; +} + +Gtk::Widget& +ProcessorEntry::widget () +{ + return _vbox; +} + +string +ProcessorEntry::drag_text () const +{ + return name (); +} + +boost::shared_ptr +ProcessorEntry::processor () const +{ + return _processor; +} + +void +ProcessorEntry::set_enum_width (Width w) +{ + _width = w; +} + +void +ProcessorEntry::active_toggled () +{ + if (_active.get_active ()) { + if (!_processor->active ()) { + _processor->activate (); + } + } else { + if (_processor->active ()) { + _processor->deactivate (); + } + } +} + +void +ProcessorEntry::processor_active_changed () +{ + if (_active.get_active () != _processor->active ()) { + _active.set_active (_processor->active ()); + } +} + +void +ProcessorEntry::processor_property_changed (const PropertyChange& what_changed) +{ + if (what_changed.contains (ARDOUR::Properties::name)) { + _name.set_text (name ()); + } +} + +string +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); + break; + case Narrow: + 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(); + break; + case Narrow: + 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), + _adjustment (0, 0, 1, 0.01, 0.1), + _fader (_slider, &_adjustment, 0, false), + _ignore_gain_change (false) +{ + _fader.set_controllable (_send->amp()->gain_control ()); + _vbox.pack_start (_fader); + + _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 (); +} + +void +SendProcessorEntry::setup_slider_pix () +{ + _slider = ::get_icon ("fader_belt_h_thin"); + assert (_slider); +} + +void +SendProcessorEntry::show_gain () +{ + ENSURE_GUI_THREAD (*this, &SendProcessorEntry::show_gain) + + float const value = gain_to_slider_position (_send->amp()->gain ()); + + if (_adjustment.get_value() != value) { + _ignore_gain_change = true; + _adjustment.set_value (value); + _ignore_gain_change = false; + } +} + +void +SendProcessorEntry::gain_adjusted () +{ + if (_ignore_gain_change) { + return; + } + + _send->amp()->set_gain (slider_position_to_gain (_adjustment.get_value()), this); +} + +void +SendProcessorEntry::set_pixel_width (int p) +{ + _fader.set_fader_length (p); +} -ProcessorBox::ProcessorBox (Placement pcmnt, Session& sess, PluginSelector &plugsel, - RouteRedirectSelection & rsel, bool owner_is_mixer) - : _session(sess) +ProcessorBox::ProcessorBox (ARDOUR::Session* sess, boost::function get_plugin_selector, + RouteRedirectSelection& rsel, MixerStrip* parent, bool owner_is_mixer) + : _parent_strip (parent) , _owner_is_mixer (owner_is_mixer) - , _placement(pcmnt) - , _plugin_selector(plugsel) + , ab_direction (true) + , _get_plugin_selector (get_plugin_selector) + , _placement(PreFader) , _rr_selection(rsel) { - if (get_colors) { - active_processor_color = new Gdk::Color; - inactive_processor_color = new Gdk::Color; - set_color (*active_processor_color, rgba_from_style ( - "ProcessorSelector", 0xff, 0, 0, 0, "fg", Gtk::STATE_ACTIVE, false )); - set_color (*inactive_processor_color, rgba_from_style ( - "ProcessorSelector", 0xff, 0, 0, 0, "fg", Gtk::STATE_NORMAL, false )); - get_colors = false; - } + set_session (sess); _width = Wide; processor_menu = 0; send_action_menu = 0; - processor_drag_in_progress = false; no_processor_redisplay = false; - ignore_delete = false; - - model = ListStore::create(columns); - - RefPtr selection = processor_display.get_selection(); - selection->set_mode (Gtk::SELECTION_MULTIPLE); - selection->signal_changed().connect (mem_fun (*this, &ProcessorBox::selection_changed)); - - processor_display.set_model (model); - processor_display.append_column (X_("notshown"), columns.text); - processor_display.set_name ("ProcessorSelector"); - processor_display.set_headers_visible (false); - processor_display.set_reorderable (true); - processor_display.set_size_request (-1, 40); - processor_display.get_column(0)->set_sizing(TREE_VIEW_COLUMN_FIXED); - processor_display.get_column(0)->set_fixed_width(48); - processor_display.add_object_drag (columns.processor.index(), "processors"); - processor_display.signal_drop.connect (mem_fun (*this, &ProcessorBox::object_drop)); - - TreeViewColumn* name_col = processor_display.get_column(0); - CellRendererText* renderer = dynamic_cast( - processor_display.get_column_cell_renderer (0)); - name_col->add_attribute(renderer->property_foreground_gdk(), columns.color); processor_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC); - - model->signal_row_deleted().connect (mem_fun (*this, &ProcessorBox::row_deleted)); - processor_scroller.add (processor_display); - processor_eventbox.add (processor_scroller); + pack_start (processor_scroller, true, true); - processor_scroller.set_size_request (-1, 40); + processor_display.set_flags (CAN_FOCUS); + processor_display.set_name ("ProcessorSelector"); + processor_display.set_size_request (48, -1); + processor_display.set_data ("processorbox", this); + + processor_display.signal_enter_notify_event().connect (sigc::mem_fun(*this, &ProcessorBox::enter_notify), false); + processor_display.signal_leave_notify_event().connect (sigc::mem_fun(*this, &ProcessorBox::leave_notify), false); - pack_start (processor_eventbox, true, true); + processor_display.signal_key_press_event().connect (sigc::mem_fun(*this, &ProcessorBox::processor_key_press_event)); + processor_display.signal_key_release_event().connect (sigc::mem_fun(*this, &ProcessorBox::processor_key_release_event)); - processor_eventbox.signal_enter_notify_event().connect (bind ( - sigc::ptr_fun (ProcessorBox::enter_box), - this)); + processor_display.ButtonPress.connect (sigc::mem_fun (*this, &ProcessorBox::processor_button_press_event)); + processor_display.ButtonRelease.connect (sigc::mem_fun (*this, &ProcessorBox::processor_button_release_event)); - processor_display.signal_button_press_event().connect ( - mem_fun(*this, &ProcessorBox::processor_button_press_event), false); - processor_display.signal_button_release_event().connect ( - mem_fun(*this, &ProcessorBox::processor_button_release_event)); + processor_display.Reordered.connect (sigc::mem_fun (*this, &ProcessorBox::reordered)); + processor_display.DropFromAnotherBox.connect (sigc::mem_fun (*this, &ProcessorBox::object_drop)); + processor_display.SelectionChanged.connect (sigc::mem_fun (*this, &ProcessorBox::selection_changed)); } ProcessorBox::~ProcessorBox () @@ -163,16 +311,19 @@ ProcessorBox::~ProcessorBox () void ProcessorBox::set_route (boost::shared_ptr r) { - connections.clear (); + if (_route == r) { + return; + } + + connections.drop_connections(); + /* new route: any existing block on processor redisplay must be meaningless */ + no_processor_redisplay = false; _route = r; - connections.push_back (_route->processors_changed.connect ( - mem_fun(*this, &ProcessorBox::redisplay_processors))); - connections.push_back (_route->GoingAway.connect ( - mem_fun (*this, &ProcessorBox::route_going_away))); - connections.push_back (_route->NameChanged.connect ( - mem_fun(*this, &ProcessorBox::route_name_changed))); + _route->processors_changed.connect (connections, invalidator (*this), ui_bind (&ProcessorBox::route_processors_changed, this, _1), gui_context()); + _route->DropReferences.connect (connections, invalidator (*this), boost::bind (&ProcessorBox::route_going_away, this), gui_context()); + _route->PropertyChanged.connect (connections, invalidator (*this), ui_bind (&ProcessorBox::route_property_changed, this, _1), gui_context()); redisplay_processors (); } @@ -184,18 +335,39 @@ ProcessorBox::route_going_away () no_processor_redisplay = true; } - void -ProcessorBox::object_drop (const list >& procs) +ProcessorBox::object_drop(DnDVBox* source, ProcessorEntry* position, Glib::RefPtr const & context) { - for (std::list >::const_iterator i = procs.begin(); - i != procs.end(); ++i) { + boost::shared_ptr p; + if (position) { + p = position->processor (); + } + + list children = source->selection (); + list > procs; + for (list::const_iterator i = children.begin(); i != children.end(); ++i) { + procs.push_back ((*i)->processor ()); + } + + for (list >::const_iterator i = procs.begin(); i != procs.end(); ++i) { XMLNode& state = (*i)->get_state (); XMLNodeList nlist; nlist.push_back (&state); - paste_processor_state (nlist); + paste_processor_state (nlist, p); delete &state; } + + /* since the dndvbox doesn't take care of this properly, we have to delete the originals + ourselves. + */ + + 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 @@ -204,15 +376,20 @@ ProcessorBox::update() redisplay_processors (); } - void ProcessorBox::set_width (Width w) { if (_width == w) { return; } + _width = w; + list children = processor_display.children (); + for (list::iterator i = children.begin(); i != children.end(); ++i) { + (*i)->set_enum_width (w); + } + redisplay_processors (); } @@ -247,8 +424,30 @@ ProcessorBox::build_send_action_menu () send_action_menu->set_name ("ArdourContextMenu"); MenuList& items = send_action_menu->items(); - items.push_back (MenuElem (_("New send"), mem_fun(*this, &ProcessorBox::new_send))); - items.push_back (MenuElem (_("Show send controls"), mem_fun(*this, &ProcessorBox::show_send_controls))); + 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))); +} + +Gtk::Menu* +ProcessorBox::build_possible_aux_menu () +{ + boost::shared_ptr rl = _session->get_routes_with_internal_returns(); + + if (rl->empty()) { + return 0; + } + + using namespace Menu_Helpers; + Menu* menu = manage (new Menu); + MenuList& items = menu->items(); + + for (RouteList::iterator r = rl->begin(); r != rl->end(); ++r) { + if (!_route->internal_send_for (*r) && *r != _route) { + items.push_back (MenuElem ((*r)->name(), sigc::bind (sigc::ptr_fun (ProcessorBox::rb_choose_aux), boost::weak_ptr(*r)))); + } + } + + return menu; } void @@ -271,49 +470,162 @@ ProcessorBox::show_processor_menu (gint arg) Gtk::MenuItem* plugin_menu_item = dynamic_cast(ActionManager::get_widget("/processormenu/newplugin")); if (plugin_menu_item) { - plugin_menu_item->set_submenu (_plugin_selector.plugin_menu()); + plugin_menu_item->set_submenu (*_get_plugin_selector()->plugin_menu()); + } + + Gtk::MenuItem* aux_menu_item = dynamic_cast(ActionManager::get_widget("/processormenu/newaux")); + + if (aux_menu_item) { + Menu* m = build_possible_aux_menu(); + if (m && !m->items().empty()) { + aux_menu_item->set_submenu (*m); + aux_menu_item->set_sensitive (true); + } else { + /* stupid gtkmm: we need to pass a null reference here */ + gtk_menu_item_set_submenu (aux_menu_item->gobj(), 0); + aux_menu_item->set_sensitive (false); + } } + cut_action->set_sensitive (can_cut()); paste_action->set_sensitive (!_rr_selection.processors.empty()); processor_menu->popup (1, arg); } -void -ProcessorBox::processor_drag_begin (GdkDragContext *context) +bool +ProcessorBox::enter_notify (GdkEventCrossing*) { - processor_drag_in_progress = true; + _current_processor_box = this; + Keyboard::magic_widget_grab_focus (); + processor_display.grab_focus (); + + return false; } -void -ProcessorBox::processor_drag_end (GdkDragContext *context) +bool +ProcessorBox::leave_notify (GdkEventCrossing* ev) +{ + switch (ev->detail) { + case GDK_NOTIFY_INFERIOR: + break; + default: + Keyboard::magic_widget_drop_focus (); + } + + return false; +} + +bool +ProcessorBox::processor_key_press_event (GdkEventKey *) { - processor_drag_in_progress = false; + /* do real stuff on key release */ + return false; } bool -ProcessorBox::processor_button_press_event (GdkEventButton *ev) +ProcessorBox::processor_key_release_event (GdkEventKey *ev) { - TreeIter iter; - TreeModel::Path path; - TreeViewColumn* column; - int cellx; - int celly; - boost::shared_ptr processor; - int ret = false; - bool selected = false; + bool ret = false; + ProcSelection targets; + + get_selected_processors (targets); - if (processor_display.get_path_at_pos ((int)ev->x, (int)ev->y, path, column, cellx, celly)) { - if ((iter = model->get_iter (path))) { - processor = (*iter)[columns.processor]; - selected = processor_display.get_selection()->is_selected (iter); + if (targets.empty()) { + + int x, y; + processor_display.get_pointer (x, y); + + pair const pointer = processor_display.get_child_at_position (x, y); + + if (pointer.first) { + 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; + } + break; + + case GDK_c: + if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { + copy_processors (targets); + ret = true; + } + break; + + case GDK_x: + if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { + cut_processors (targets); + ret = true; + } + 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; + } + break; + + case GDK_Up: + break; + + case GDK_Down: + break; + + case GDK_Delete: + case GDK_BackSpace: + delete_processors (targets); + ret = true; + break; + + case GDK_Return: + for (ProcSelection::iterator i = targets.begin(); i != targets.end(); ++i) { + if ((*i)->active()) { + (*i)->deactivate (); + } else { + (*i)->activate (); + } } + ret = true; + break; + + case GDK_slash: + ab_plugins (); + ret = true; + break; + + default: + break; + } + + return ret; +} +bool +ProcessorBox::processor_button_press_event (GdkEventButton *ev, ProcessorEntry* child) +{ + boost::shared_ptr processor; + if (child) { + processor = child->processor (); } + + int ret = false; + bool selected = processor_display.selected (child); if (processor && (Keyboard::is_edit_event (ev) || (ev->button == 1 && ev->type == GDK_2BUTTON_PRESS))) { - if (_session.engine().connected()) { + if (_session->engine().connected()) { /* XXX giving an error message here is hard, because we may be in the midst of a button press */ edit_processor (processor); } @@ -321,47 +633,52 @@ ProcessorBox::processor_button_press_event (GdkEventButton *ev) } else if (processor && ev->button == 1 && selected) { - // this is purely informational but necessary + // this is purely informational but necessary for route params UI ProcessorSelected (processor); // emit } else if (!processor && ev->button == 1 && ev->type == GDK_2BUTTON_PRESS) { choose_plugin (); - _plugin_selector.show_manager (); + _get_plugin_selector()->show_manager (); } - return ret; } bool -ProcessorBox::processor_button_release_event (GdkEventButton *ev) +ProcessorBox::processor_button_release_event (GdkEventButton *ev, ProcessorEntry* child) { - TreeIter iter; - TreeModel::Path path; - TreeViewColumn* column; - int cellx; - int celly; boost::shared_ptr processor; - int ret = false; - - - if (processor_display.get_path_at_pos ((int)ev->x, (int)ev->y, path, column, cellx, celly)) { - if ((iter = model->get_iter (path))) { - processor = (*iter)[columns.processor]; - } + if (child) { + processor = child->processor (); } + + int ret = false; if (processor && Keyboard::is_delete_event (ev)) { - Glib::signal_idle().connect (bind ( - mem_fun(*this, &ProcessorBox::idle_delete_processor), + 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)) { - show_processor_menu(ev->time); + /* 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) @@ -381,7 +698,7 @@ ProcessorBox::processor_button_release_event (GdkEventButton *ev) } - return ret; + return false; } Menu * @@ -398,34 +715,40 @@ ProcessorBox::build_processor_menu () void ProcessorBox::selection_changed () { - bool sensitive = (processor_display.get_selection()->count_selected_rows()) ? true : false; + bool sensitive = (processor_display.selection().empty()) ? false : true; ActionManager::set_sensitive (ActionManager::plugin_selection_sensitive_actions, sensitive); + + /* 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 () { - processor_display.get_selection()->select_all(); + processor_display.select_all (); } void ProcessorBox::deselect_all_processors () { - processor_display.get_selection()->unselect_all(); + processor_display.select_none (); } void ProcessorBox::choose_plugin () { - _plugin_selector.set_interested_object (*this); + _get_plugin_selector()->set_interested_object (*this); } -void +/** @return true if an error occurred, otherwise false */ +bool ProcessorBox::use_plugins (const SelectedPlugins& plugins) { for (SelectedPlugins::const_iterator p = plugins.begin(); p != plugins.end(); ++p) { - boost::shared_ptr processor (new PluginInsert (_session, *p)); + boost::shared_ptr processor (new PluginInsert (*_session, *p)); Route::ProcessorStreams err_streams; @@ -433,25 +756,25 @@ ProcessorBox::use_plugins (const SelectedPlugins& plugins) processor->activate (); } - if (_route->add_processor (processor, &err_streams, 0, _placement)) { - weird_plugin_dialog (**p, err_streams, _route); + if (_route->add_processor (processor, _placement, &err_streams)) { + weird_plugin_dialog (**p, err_streams); + return true; // XXX SHAREDPTR delete plugin here .. do we even need to care? } else { if (Profile->get_sae()) { processor->activate (); } - processor->ActiveChanged.connect (bind ( - mem_fun (*this, &ProcessorBox::show_processor_active), - boost::weak_ptr(processor))); } } + + return false; } void -ProcessorBox::weird_plugin_dialog (Plugin& p, Route::ProcessorStreams streams, boost::shared_ptr io) +ProcessorBox::weird_plugin_dialog (Plugin& p, Route::ProcessorStreams streams) { - ArdourDialog dialog (_("ardour: weird plugin dialog")); + ArdourDialog dialog (_("Plugin Incompatibility")); Label label; string text = string_compose(_("You attempted to add the plugin \"%1\" at index %2.\n"), @@ -476,7 +799,7 @@ ProcessorBox::weird_plugin_dialog (Plugin& p, Route::ProcessorStreams streams, b text += string_compose("\t%1 ", streams.count.n_audio()) + _("audio channel(s)\n"); } - text += _("\nArdour is unable to insert this plugin here.\n"); + text += string_compose (_("\n%1 is unable to insert this plugin here.\n"), PROGRAM_NAME); label.set_text(text); dialog.get_vbox()->pack_start (label); @@ -493,42 +816,47 @@ ProcessorBox::weird_plugin_dialog (Plugin& p, Route::ProcessorStreams streams, b void ProcessorBox::choose_insert () { - boost::shared_ptr processor (new PortInsert (_session)); - processor->ActiveChanged.connect (bind ( - mem_fun(*this, &ProcessorBox::show_processor_active), - boost::weak_ptr(processor))); - _route->add_processor (processor, 0, 0, _placement); + boost::shared_ptr processor (new PortInsert (*_session, _route->mute_master())); + _route->add_processor (processor, _placement); } void ProcessorBox::choose_send () { - boost::shared_ptr send (new Send (_session)); + boost::shared_ptr send (new Send (*_session, _route->mute_master())); /* make an educated guess at the initial number of outputs for the send */ - ChanCount outs = (_session.master_out()) - ? _session.master_out()->n_outputs() + ChanCount outs = (_session->master_out()) + ? _session->master_out()->n_outputs() : _route->n_outputs(); /* XXX need processor lock on route */ try { - send->io()->ensure_io (ChanCount::ZERO, outs, false, this); + send->output()->ensure_io (outs, false, this); } catch (AudioEngine::PortRegistrationFailure& err) { error << string_compose (_("Cannot set up new send: %1"), err.what()) << endmsg; return; } - /* let the user adjust the IO setup before creation */ - IOSelectorWindow *ios = new IOSelectorWindow (_session, send->io(), false, true); + /* let the user adjust the IO setup before creation. + + Note: this dialog is NOT modal - we just leave it to run and it will + return when its Finished signal is emitted - typically when the window + is closed. + */ + + IOSelectorWindow *ios = new IOSelectorWindow (_session, send->output(), true); ios->show_all (); /* keep a reference to the send so it doesn't get deleted while - the IOSelectorWindow is doing its stuff */ + the IOSelectorWindow is doing its stuff + */ _processor_being_created = send; - ios->selector().Finished.connect (bind ( - mem_fun(*this, &ProcessorBox::send_io_finished), + ios->selector().Finished.connect (sigc::bind ( + sigc::mem_fun(*this, &ProcessorBox::send_io_finished), boost::weak_ptr(send), ios)); + } void @@ -549,7 +877,7 @@ ProcessorBox::send_io_finished (IOSelector::Result r, boost::weak_ptr break; case IOSelector::Accepted: - _route->add_processor (processor, 0, 0, _placement); + _route->add_processor (processor, _placement); if (Profile->get_sae()) { processor->activate (); } @@ -559,35 +887,6 @@ ProcessorBox::send_io_finished (IOSelector::Result r, boost::weak_ptr delete_when_idle (ios); } -void -ProcessorBox::choose_return () -{ - boost::shared_ptr retrn (new Return (_session)); - - /* assume user just wants a single audio input (sidechain) by default */ - ChanCount ins(DataType::AUDIO, 1); - - /* XXX need processor lock on route */ - try { - retrn->io()->ensure_io (ins, ChanCount::ZERO, false, this); - } catch (AudioEngine::PortRegistrationFailure& err) { - error << string_compose (_("Cannot set up new return: %1"), err.what()) << endmsg; - return; - } - - /* let the user adjust the IO setup before creation */ - IOSelectorWindow *ios = new IOSelectorWindow (_session, retrn->io(), true, true); - ios->show_all (); - - /* keep a reference to the send so it doesn't get deleted while - the IOSelectorWindow is doing its stuff */ - _processor_being_created = retrn; - - ios->selector().Finished.connect (bind ( - mem_fun(*this, &ProcessorBox::return_io_finished), - boost::weak_ptr(retrn), ios)); -} - void ProcessorBox::return_io_finished (IOSelector::Result r, boost::weak_ptr weak_processor, IOSelectorWindow* ios) { @@ -606,7 +905,7 @@ ProcessorBox::return_io_finished (IOSelector::Result r, boost::weak_ptradd_processor (processor, 0, 0, _placement); + _route->add_processor (processor, _placement); if (Profile->get_sae()) { processor->activate (); } @@ -617,189 +916,105 @@ ProcessorBox::return_io_finished (IOSelector::Result r, boost::weak_ptr wr) { - ENSURE_GUI_THREAD (mem_fun(*this, &ProcessorBox::redisplay_processors)); - - if (no_processor_redisplay) { + if (!_route) { return; } - ignore_delete = true; - model->clear (); - ignore_delete = false; + boost::shared_ptr target = wr.lock(); - processor_active_connections.clear (); - processor_name_connections.clear (); + if (!target) { + return; + } - _route->foreach_processor (_placement, mem_fun (*this, &ProcessorBox::add_processor_to_display)); + boost::shared_ptr rlist (new RouteList); + rlist->push_back (_route); - switch (_placement) { - case PreFader: - build_processor_tooltip(processor_eventbox, _("Pre-fader inserts, sends & plugins:")); - break; - case PostFader: - build_processor_tooltip(processor_eventbox, _("Post-fader inserts, sends & plugins:")); - break; - } + _session->add_internal_sends (target, PreFader, rlist); } void -ProcessorBox::add_processor_to_display (boost::weak_ptr p) +ProcessorBox::route_processors_changed (RouteProcessorChange c) { - boost::shared_ptr processor (p.lock ()); - if (!processor) { + if (c.type == RouteProcessorChange::MeterPointChange && c.meter_visibly_changed == false) { + /* the meter has moved, but it was and still is invisible to the user, so nothing to do */ return; } - if (processor == _route->amp()) { - return; - } - - Gtk::TreeModel::Row row = *(model->append()); - row[columns.text] = processor_name (processor); - row[columns.processor] = processor; - - show_processor_active (processor); - - processor_active_connections.push_back (processor->ActiveChanged.connect (bind ( - mem_fun(*this, &ProcessorBox::show_processor_active), - boost::weak_ptr(processor)))); - processor_name_connections.push_back (processor->NameChanged.connect (bind ( - mem_fun(*this, &ProcessorBox::show_processor_name), - boost::weak_ptr(processor)))); + redisplay_processors (); } -string -ProcessorBox::processor_name (boost::weak_ptr weak_processor) +void +ProcessorBox::redisplay_processors () { - boost::shared_ptr processor (weak_processor.lock()); - - if (!processor) { - return string(); - } - - boost::shared_ptr send; - string name_display; + ENSURE_GUI_THREAD (*this, &ProcessorBox::redisplay_processors) - if (!processor->active()) { - name_display = " ("; + if (no_processor_redisplay) { + return; } - if ((send = boost::dynamic_pointer_cast (processor)) != 0) { - - name_display += '>'; - - /* grab the send name out of its overall name */ - - string::size_type lbracket, rbracket; - lbracket = send->name().find ('['); - rbracket = send->name().find (']'); + processor_display.clear (); - switch (_width) { - case Wide: - name_display += send->name().substr (lbracket+1, lbracket-rbracket-1); - break; - case Narrow: - name_display += PBD::short_version (send->name().substr (lbracket+1, lbracket-rbracket-1), 4); - break; - } + _route->foreach_processor (sigc::mem_fun (*this, &ProcessorBox::add_processor_to_display)); - } else { + build_processor_tooltip (processor_eventbox, _("Inserts, sends & plugins:")); +} - switch (_width) { - case Wide: - name_display += processor->name(); - break; - case Narrow: - name_display += PBD::short_version (processor->name(), 5); - break; - } +void +ProcessorBox::add_processor_to_display (boost::weak_ptr p) +{ + boost::shared_ptr processor (p.lock ()); + if (!processor || !processor->display_to_user()) { + return; } - if (!processor->active()) { - name_display += ')'; + boost::shared_ptr send = boost::dynamic_pointer_cast (processor); + ProcessorEntry* e = 0; + if (send) { + e = new SendProcessorEntry (send, _width); + } else { + e = new ProcessorEntry (processor, _width); } - - return name_display; + 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); - Gtk::TreeModel::Children children = model->children(); - for(Gtk::TreeModel::Children::iterator iter = children.begin(); iter != children.end(); ++iter) { - Gtk::TreeModel::Row row = *iter; + list children = processor_display.children (); + for (list::iterator i = children.begin(); i != children.end(); ++i) { tip += '\n'; - tip += row[columns.text]; - } - ARDOUR_UI::instance()->tooltips().set_tip (box, tip); -} - -void -ProcessorBox::show_processor_name (boost::weak_ptr processor) -{ - ENSURE_GUI_THREAD(bind (mem_fun(*this, &ProcessorBox::show_processor_name), processor)); - show_processor_active (processor); -} - -void -ProcessorBox::show_processor_active (boost::weak_ptr weak_processor) -{ - boost::shared_ptr processor (weak_processor.lock()); - - if (!processor) { - return; - } - - ENSURE_GUI_THREAD(bind (mem_fun(*this, &ProcessorBox::show_processor_active), weak_processor)); - - Gtk::TreeModel::Children children = model->children(); - Gtk::TreeModel::Children::iterator iter = children.begin(); - - while (iter != children.end()) { - - boost::shared_ptr r = (*iter)[columns.processor]; - - if (r == processor) { - (*iter)[columns.text] = processor_name (r); - - if (processor->active()) { - (*iter)[columns.color] = *active_processor_color; - } else { - (*iter)[columns.color] = *inactive_processor_color; - } - break; - } - - iter++; + tip += (*i)->processor()->name(); } + + ARDOUR_UI::instance()->set_tip (box, tip); } void -ProcessorBox::row_deleted (const Gtk::TreeModel::Path& path) +ProcessorBox::reordered () { - if (!ignore_delete) { - compute_processor_sort_keys (); - } + compute_processor_sort_keys (); } void ProcessorBox::compute_processor_sort_keys () { - uint32_t sort_key = 0; - Gtk::TreeModel::Children children = model->children(); + list children = processor_display.children (); + Route::ProcessorList our_processors; - for (Gtk::TreeModel::Children::iterator iter = children.begin(); iter != children.end(); ++iter) { - boost::shared_ptr r = (*iter)[columns.processor]; - r->set_sort_key (sort_key); - sort_key++; + for (list::iterator iter = children.begin(); iter != children.end(); ++iter) { + our_processors.push_back ((*iter)->processor ()); } - if (_route->sort_processors ()) { + if (_route->reorder_processors (our_processors)) { + + /* reorder failed, so redisplay */ redisplay_processors (); @@ -809,10 +1024,11 @@ ProcessorBox::compute_processor_sort_keys () Label label; label.set_text (_("\ -You cannot reorder this set of processors\n\ +You cannot reorder these plugins/sends/inserts\n\ in that way because the inputs and\n\ -outputs do not work correctly.")); +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); @@ -841,23 +1057,51 @@ ProcessorBox::rename_processors () } } +bool +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; - XMLNode* node = new XMLNode (X_("cut")); get_selected_processors (to_be_removed); +} +void +ProcessorBox::cut_processors (const ProcSelection& to_be_removed) +{ if (to_be_removed.empty()) { return; } + XMLNode* node = new XMLNode (X_("cut")); + Route::ProcessorList to_cut; + no_processor_redisplay = true; - for (ProcSelection::iterator i = to_be_removed.begin(); i != to_be_removed.end(); ++i) { - // Do not cut inserts + for (ProcSelection::const_iterator i = to_be_removed.begin(); i != to_be_removed.end(); ++i) { + // Cut only plugins, sends and returns if (boost::dynamic_pointer_cast((*i)) != 0 || - (boost::dynamic_pointer_cast((*i)) != 0)) { + (boost::dynamic_pointer_cast((*i)) != 0) || + (boost::dynamic_pointer_cast((*i)) != 0)) { void* gui = (*i)->get_gui (); @@ -866,16 +1110,17 @@ ProcessorBox::cut_processors () } XMLNode& child ((*i)->get_state()); - - if (_route->remove_processor (*i) == 0) { - /* success */ - node->add_child_nocopy (child); - } else { - delete &child; - } + node->add_child_nocopy (child); + to_cut.push_back (*i); } } + if (_route->remove_processors (to_cut) != 0) { + delete node; + no_processor_redisplay = false; + return; + } + _rr_selection.set (node); no_processor_redisplay = false; @@ -886,18 +1131,24 @@ void ProcessorBox::copy_processors () { ProcSelection to_be_copied; - XMLNode* node = new XMLNode (X_("copy")); - get_selected_processors (to_be_copied); + copy_processors (to_be_copied); +} +void +ProcessorBox::copy_processors (const ProcSelection& to_be_copied) +{ if (to_be_copied.empty()) { return; } - for (ProcSelection::iterator i = to_be_copied.begin(); i != to_be_copied.end(); ++i) { - // Do not copy inserts + XMLNode* node = new XMLNode (X_("copy")); + + for (ProcSelection::const_iterator i = to_be_copied.begin(); i != to_be_copied.end(); ++i) { + // Copy only plugins, sends, returns if (boost::dynamic_pointer_cast((*i)) != 0 || - (boost::dynamic_pointer_cast((*i)) != 0)) { + (boost::dynamic_pointer_cast((*i)) != 0) || + (boost::dynamic_pointer_cast((*i)) != 0)) { node->add_child_nocopy ((*i)->get_state()); } } @@ -909,14 +1160,20 @@ void ProcessorBox::delete_processors () { ProcSelection to_be_deleted; - get_selected_processors (to_be_deleted); + delete_processors (to_be_deleted); +} - if (to_be_deleted.empty()) { +void +ProcessorBox::delete_processors (const ProcSelection& targets) +{ + if (targets.empty()) { return; } - for (ProcSelection::iterator i = to_be_deleted.begin(); i != to_be_deleted.end(); ++i) { + no_processor_redisplay = true; + + for (ProcSelection::const_iterator i = targets.begin(); i != targets.end(); ++i) { void* gui = (*i)->get_gui (); @@ -931,6 +1188,27 @@ ProcessorBox::delete_processors () redisplay_processors (); } +void +ProcessorBox::delete_dragged_processors (const list >& procs) +{ + list >::const_iterator x; + + no_processor_redisplay = true; + for (x = procs.begin(); x != procs.end(); ++x) { + + void* gui = (*x)->get_gui (); + + if (gui) { + static_cast(gui)->hide (); + } + + _route->remove_processor(*x); + } + + no_processor_redisplay = false; + redisplay_processors (); +} + gint ProcessorBox::idle_delete_processor (boost::weak_ptr weak_processor) { @@ -955,7 +1233,8 @@ ProcessorBox::rename_processor (boost::shared_ptr processor) { ArdourPrompter name_prompter (true); string result; - name_prompter.set_prompt (_("rename processor")); + name_prompter.set_title (_("Rename Processor")); + name_prompter.set_prompt (_("New name:")); name_prompter.set_initial_text (processor->name()); name_prompter.add_button (_("Rename"), Gtk::RESPONSE_ACCEPT); name_prompter.set_response_sensitive (Gtk::RESPONSE_ACCEPT, false); @@ -964,9 +1243,29 @@ ProcessorBox::rename_processor (boost::shared_ptr processor) switch (name_prompter.run ()) { case Gtk::RESPONSE_ACCEPT: - name_prompter.get_result (result); - if (result.length()) { - processor->set_name (result); + name_prompter.get_result (result); + if (result.length()) { + + int tries = 0; + string test = result; + + while (tries < 100) { + if (_session->io_name_is_legal (test)) { + result = test; + break; + } + tries++; + + test = string_compose ("%1-%2", result, tries); + } + + if (tries < 100) { + processor->set_name (result); + } else { + /* unlikely! */ + ARDOUR_UI::instance()->popup_error + (string_compose (_("At least 100 IO objects exist with a name like %1 - name not changed"), result)); + } } break; } @@ -981,50 +1280,92 @@ ProcessorBox::paste_processors () return; } - cerr << "paste from node called " << _rr_selection.processors.get_node().name() << endl; + paste_processor_state (_rr_selection.processors.get_node().children(), boost::shared_ptr()); +} + +void +ProcessorBox::paste_processors (boost::shared_ptr before) +{ + + if (_rr_selection.processors.empty()) { + return; + } - paste_processor_state (_rr_selection.processors.get_node().children()); + paste_processor_state (_rr_selection.processors.get_node().children(), before); } void -ProcessorBox::paste_processor_state (const XMLNodeList& nlist) +ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr p) { XMLNodeConstIterator niter; list > copies; - cerr << "Pasting processor selection containing " << nlist.size() << endl; - if (nlist.empty()) { return; } for (niter = nlist.begin(); niter != nlist.end(); ++niter) { - cerr << "try using " << (*niter)->name() << endl; + XMLProperty const * type = (*niter)->property ("type"); assert (type); boost::shared_ptr p; try { - if (type->value() == "send") { + 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 */ + continue; + + } else if (type->value() == "send") { + + XMLNode n (**niter); + Send::make_unique (n, *_session); + Send* s = new Send (*_session, _route->mute_master()); + if (s->set_state (n, Stateful::loading_state_version)) { + delete s; + return; + } + + p.reset (s); + + + } else if (type->value() == "return") { + XMLNode n (**niter); - Send::make_unique (n, _session); - p.reset (new Send (_session, n)); + Return::make_unique (n, *_session); + Return* r = new Return (*_session); - } else if (type->value() == "meter") { - p = _route->shared_peak_meter(); + if (r->set_state (n, Stateful::loading_state_version)) { + delete r; + return; + } + + p.reset (r); } else { - p.reset (new PluginInsert (_session, **niter)); + /* XXX its a bit limiting to assume that everything else + is a plugin. + */ + + p.reset (new PluginInsert (*_session)); + p->set_state (**niter, Stateful::current_state_version); } copies.push_back (p); } + catch (...) { cerr << "plugin insert constructor failed\n"; } } - if (_route->add_processors (copies, 0, _placement)) { + if (copies.empty()) { + return; + } + + if (_route->add_processors (copies, p)) { string msg = _( "Copying the set of processors on the clipboard failed,\n\ @@ -1048,23 +1389,20 @@ ProcessorBox::deactivate_processor (boost::shared_ptr r) } void -ProcessorBox::get_selected_processors (ProcSelection& processors) +ProcessorBox::get_selected_processors (ProcSelection& processors) const { - vector pathlist = processor_display.get_selection()->get_selected_rows(); - - for (vector::iterator iter = pathlist.begin(); iter != pathlist.end(); ++iter) { - processors.push_back ((*(model->get_iter(*iter)))[columns.processor]); - } + const list selection = processor_display.selection (); + for (list::const_iterator i = selection.begin(); i != selection.end(); ++i) { + processors.push_back ((*i)->processor ()); + } } void ProcessorBox::for_selected_processors (void (ProcessorBox::*method)(boost::shared_ptr)) { - vector pathlist = processor_display.get_selection()->get_selected_rows(); - - for (vector::iterator iter = pathlist.begin(); iter != pathlist.end(); ++iter) { - boost::shared_ptr processor = (*(model->get_iter(*iter)))[columns.processor]; - (this->*method)(processor); + list selection = processor_display.selection (); + for (list::iterator i = selection.begin(); i != selection.end(); ++i) { + (this->*method) ((*i)->processor ()); } } @@ -1088,31 +1426,41 @@ ProcessorBox::clear_processors () string prompt; vector choices; - if (boost::dynamic_pointer_cast(_route) != 0) { - if (_placement == PreFader) { - prompt = _("Do you really want to remove all pre-fader processors from this track?\n" - "(this cannot be undone)"); - } else { - prompt = _("Do you really want to remove all post-fader processors from this track?\n" - "(this cannot be undone)"); - } + prompt = string_compose (_("Do you really want to remove all processors from %1?\n" + "(this cannot be undone)"), _route->name()); + + choices.push_back (_("Cancel")); + choices.push_back (_("Yes, remove them all")); + + Gtkmm2ext::Choice prompter (_("Remove processors"), prompt, choices); + + if (prompter.run () == 1) { + _route->clear_processors (PreFader); + _route->clear_processors (PostFader); + } +} + +void +ProcessorBox::clear_processors (Placement p) +{ + string prompt; + vector choices; + + if (p == PreFader) { + prompt = string_compose (_("Do you really want to remove all pre-fader processors from %1?\n" + "(this cannot be undone)"), _route->name()); } else { - if (_placement == PreFader) { - prompt = _("Do you really want to remove all pre-fader processors from this bus?\n" - "(this cannot be undone)"); - } else { - prompt = _("Do you really want to remove all post-fader processors from this bus?\n" - "(this cannot be undone)"); - } + prompt = string_compose (_("Do you really want to remove all post-fader processors from %1?\n" + "(this cannot be undone)"), _route->name()); } choices.push_back (_("Cancel")); choices.push_back (_("Yes, remove them all")); - Gtkmm2ext::Choice prompter (prompt, choices); + Gtkmm2ext::Choice prompter (_("Remove processors"), prompt, choices); if (prompter.run () == 1) { - _route->clear_processors (_placement); + _route->clear_processors (p); } } @@ -1134,22 +1482,16 @@ ProcessorBox::edit_processor (boost::shared_ptr processor) if ((send = boost::dynamic_pointer_cast (processor)) != 0) { - if (!_session.engine().connected()) { + if (!_session->engine().connected()) { return; } - boost::shared_ptr send = boost::dynamic_pointer_cast (processor); - +#ifdef OLD_SEND_EDITING SendUIWindow *send_ui; if (send->get_gui() == 0) { - send_ui = new SendUIWindow (send, _session); - - WindowTitle title(Glib::get_application_name()); - title += send->name(); - send_ui->set_title (title.get_string()); - + send_ui->set_title (send->name()); send->set_gui (send_ui); } else { @@ -1157,10 +1499,15 @@ ProcessorBox::edit_processor (boost::shared_ptr processor) } gidget = send_ui; - +#else + if (_parent_strip) { + _parent_strip->show_send (send); + } +#endif + } else if ((retrn = boost::dynamic_pointer_cast (processor)) != 0) { - if (!_session.engine().connected()) { + if (!_session->engine().connected()) { return; } @@ -1171,11 +1518,7 @@ ProcessorBox::edit_processor (boost::shared_ptr processor) if (retrn->get_gui() == 0) { return_ui = new ReturnUIWindow (retrn, _session); - - WindowTitle title(Glib::get_application_name()); - title += retrn->name(); - return_ui->set_title (title.get_string()); - + return_ui->set_title (retrn->name ()); send->set_gui (return_ui); } else { @@ -1196,11 +1539,7 @@ ProcessorBox::edit_processor (boost::shared_ptr processor) if (plugin_insert->get_gui() == 0) { plugin_ui = new PluginUIWindow (win, plugin_insert); - - WindowTitle title(Glib::get_application_name()); - title += generate_processor_title (plugin_insert); - plugin_ui->set_title (title.get_string()); - + plugin_ui->set_title (generate_processor_title (plugin_insert)); plugin_insert->set_gui (plugin_ui); } else { @@ -1212,7 +1551,7 @@ ProcessorBox::edit_processor (boost::shared_ptr processor) } else if ((port_insert = boost::dynamic_pointer_cast (processor)) != 0) { - if (!_session.engine().connected()) { + if (!_session->engine().connected()) { MessageDialog msg ( _("Not connected to JACK - no I/O changes are possible")); msg.run (); return; @@ -1241,23 +1580,6 @@ ProcessorBox::edit_processor (boost::shared_ptr processor) } } -bool -ProcessorBox::enter_box (GdkEventCrossing *ev, ProcessorBox* rb) -{ - switch (ev->detail) { - case GDK_NOTIFY_INFERIOR: - break; - - case GDK_NOTIFY_VIRTUAL: - /* fallthru */ - - default: - _current_processor_box = rb; - } - - return false; -} - void ProcessorBox::register_actions () { @@ -1274,17 +1596,20 @@ ProcessorBox::register_actions () act = ActionManager::register_action (popup_act_grp, X_("newsend"), _("New Send ..."), sigc::ptr_fun (ProcessorBox::rb_choose_send)); ActionManager::jack_sensitive_actions.push_back (act); - act = ActionManager::register_action (popup_act_grp, X_("newreturn"), _("New Return ..."), - sigc::ptr_fun (ProcessorBox::rb_choose_return)); - ActionManager::jack_sensitive_actions.push_back (act); - ActionManager::register_action (popup_act_grp, X_("clear"), _("Clear"), + ActionManager::register_action (popup_act_grp, X_("newaux"), _("New Aux Send ...")); + + 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)"), + sigc::ptr_fun (ProcessorBox::rb_clear_pre)); + ActionManager::register_action (popup_act_grp, X_("clear_post"), _("Clear (post-fader)"), + sigc::ptr_fun (ProcessorBox::rb_clear_post)); /* standard editing stuff */ - act = ActionManager::register_action (popup_act_grp, X_("cut"), _("Cut"), - sigc::ptr_fun (ProcessorBox::rb_cut)); - ActionManager::plugin_selection_sensitive_actions.push_back(act); + cut_action = ActionManager::register_action (popup_act_grp, X_("cut"), _("Cut"), + sigc::ptr_fun (ProcessorBox::rb_cut)); + ActionManager::plugin_selection_sensitive_actions.push_back(cut_action); act = ActionManager::register_action (popup_act_grp, X_("copy"), _("Copy"), sigc::ptr_fun (ProcessorBox::rb_copy)); ActionManager::plugin_selection_sensitive_actions.push_back(act); @@ -1295,34 +1620,40 @@ ProcessorBox::register_actions () paste_action = ActionManager::register_action (popup_act_grp, X_("paste"), _("Paste"), sigc::ptr_fun (ProcessorBox::rb_paste)); - act = ActionManager::register_action (popup_act_grp, X_("rename"), _("Rename"), + rename_action = ActionManager::register_action (popup_act_grp, X_("rename"), _("Rename"), sigc::ptr_fun (ProcessorBox::rb_rename)); - ActionManager::plugin_selection_sensitive_actions.push_back(act); ActionManager::register_action (popup_act_grp, X_("selectall"), _("Select All"), sigc::ptr_fun (ProcessorBox::rb_select_all)); ActionManager::register_action (popup_act_grp, X_("deselectall"), _("Deselect All"), sigc::ptr_fun (ProcessorBox::rb_deselect_all)); - /* activation */ - act = ActionManager::register_action (popup_act_grp, X_("activate"), _("Activate"), - sigc::ptr_fun (ProcessorBox::rb_activate)); - ActionManager::plugin_selection_sensitive_actions.push_back(act); - act = ActionManager::register_action (popup_act_grp, X_("deactivate"), _("Deactivate"), - sigc::ptr_fun (ProcessorBox::rb_deactivate)); - ActionManager::plugin_selection_sensitive_actions.push_back(act); + /* 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)); /* show editors */ act = ActionManager::register_action (popup_act_grp, X_("edit"), _("Edit"), - sigc::ptr_fun (ProcessorBox::rb_edit)); + sigc::ptr_fun (ProcessorBox::rb_edit)); ActionManager::plugin_selection_sensitive_actions.push_back(act); ActionManager::add_action_group (popup_act_grp); } +void +ProcessorBox::rb_ab_plugins () +{ + if (_current_processor_box == 0) { + return; + } + + _current_processor_box->ab_plugins (); +} + void ProcessorBox::rb_choose_plugin () { @@ -1351,12 +1682,13 @@ ProcessorBox::rb_choose_send () } void -ProcessorBox::rb_choose_return () +ProcessorBox::rb_choose_aux (boost::weak_ptr wr) { if (_current_processor_box == 0) { return; } - _current_processor_box->choose_return (); + + _current_processor_box->choose_aux (wr); } void @@ -1369,91 +1701,94 @@ ProcessorBox::rb_clear () _current_processor_box->clear_processors (); } + void -ProcessorBox::rb_cut () +ProcessorBox::rb_clear_pre () { if (_current_processor_box == 0) { return; } - _current_processor_box->cut_processors (); + _current_processor_box->clear_processors (PreFader); } + void -ProcessorBox::rb_delete () +ProcessorBox::rb_clear_post () { if (_current_processor_box == 0) { return; } - _current_processor_box->delete_processors (); + _current_processor_box->clear_processors (PostFader); } void -ProcessorBox::rb_copy () +ProcessorBox::rb_cut () { if (_current_processor_box == 0) { return; } - _current_processor_box->copy_processors (); + + _current_processor_box->cut_processors (); } void -ProcessorBox::rb_paste () +ProcessorBox::rb_delete () { if (_current_processor_box == 0) { return; } - _current_processor_box->paste_processors (); + _current_processor_box->delete_processors (); } void -ProcessorBox::rb_rename () +ProcessorBox::rb_copy () { if (_current_processor_box == 0) { return; } - _current_processor_box->rename_processors (); + _current_processor_box->copy_processors (); } void -ProcessorBox::rb_select_all () +ProcessorBox::rb_paste () { if (_current_processor_box == 0) { return; } - _current_processor_box->select_all_processors (); + _current_processor_box->paste_processors (); } void -ProcessorBox::rb_deselect_all () +ProcessorBox::rb_rename () { if (_current_processor_box == 0) { return; } - - _current_processor_box->deselect_all_processors (); + _current_processor_box->rename_processors (); } void -ProcessorBox::rb_activate () +ProcessorBox::rb_select_all () { if (_current_processor_box == 0) { return; } - _current_processor_box->for_selected_processors (&ProcessorBox::activate_processor); + _current_processor_box->select_all_processors (); } void -ProcessorBox::rb_deactivate () +ProcessorBox::rb_deselect_all () { if (_current_processor_box == 0) { return; } - _current_processor_box->for_selected_processors (&ProcessorBox::deactivate_processor); + + _current_processor_box->deselect_all_processors (); } void @@ -1486,20 +1821,23 @@ ProcessorBox::rb_edit () } void -ProcessorBox::route_name_changed () +ProcessorBox::route_property_changed (const PropertyChange& what_changed) { - ENSURE_GUI_THREAD (mem_fun (*this, &ProcessorBox::route_name_changed)); + if (!what_changed.contains (ARDOUR::Properties::name)) { + return; + } + + ENSURE_GUI_THREAD (*this, &ProcessorBox::route_property_changed, what_changed); boost::shared_ptr processor; boost::shared_ptr plugin_insert; boost::shared_ptr send; - Gtk::TreeModel::Children children = model->children(); + list children = processor_display.children(); - for (Gtk::TreeModel::Children::iterator iter = children.begin(); iter != children.end(); ++iter) { - Gtk::TreeModel::Row row = *iter; + for (list::iterator iter = children.begin(); iter != children.end(); ++iter) { - processor= row[columns.processor]; + processor = (*iter)->processor (); void* gui = processor->get_gui(); @@ -1509,14 +1847,10 @@ ProcessorBox::route_name_changed () /* rename editor windows for sends and plugins */ - WindowTitle title (Glib::get_application_name()); - if ((send = boost::dynamic_pointer_cast (processor)) != 0) { - title += send->name(); - static_cast(gui)->set_title (title.get_string()); + static_cast(gui)->set_title (send->name ()); } else if ((plugin_insert = boost::dynamic_pointer_cast (processor)) != 0) { - title += generate_processor_title (plugin_insert); - static_cast(gui)->set_title (title.get_string()); + static_cast(gui)->set_title (generate_processor_title (plugin_insert)); } } } @@ -1539,3 +1873,13 @@ 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 ()); + } +}