X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fprocessor_box.cc;h=cc322df13d060a00583ed68ee4f7c0df7cf1f13f;hb=e0ad227381ca5caa921ad36473c6297398e28b89;hp=7b784022fa750a028af71466bfe21d4e5653f124;hpb=648450781b8e5a39fd89c1a42f34b601c97df0e2;p=ardour.git diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index 7b784022fa..cc322df13d 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -37,12 +37,10 @@ #include #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" @@ -80,7 +78,6 @@ class AUPluginUI; #endif using namespace std; -using namespace sigc; using namespace ARDOUR; using namespace PBD; using namespace Gtk; @@ -89,81 +86,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; - -ProcessorBox::ProcessorBox (ARDOUR::Session& sess, sigc::slot get_plugin_selector, - RouteRedirectSelection& rsel, MixerStrip* parent, bool owner_is_mixer) - : _session(sess) - , _parent_strip (parent) +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 (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) + , 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_data ("processorbox", this); - 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.set_enable_search (false); - 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); - pack_start (processor_eventbox, true, true); + 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); - processor_display.signal_enter_notify_event().connect (mem_fun(*this, &ProcessorBox::enter_notify), false); - processor_display.signal_leave_notify_event().connect (mem_fun(*this, &ProcessorBox::leave_notify), false); + 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_display.signal_key_press_event().connect (mem_fun(*this, &ProcessorBox::processor_key_press_event)); - processor_display.signal_key_release_event().connect (mem_fun(*this, &ProcessorBox::processor_key_release_event)); + 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 () @@ -173,18 +310,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 (); } @@ -196,21 +334,18 @@ ProcessorBox::route_going_away () no_processor_redisplay = true; } - void -ProcessorBox::object_drop (const list >& procs, Gtk::TreeView* source, int x, int y, Glib::RefPtr& context) +ProcessorBox::object_drop(DnDVBox* source, ProcessorEntry* position, Glib::RefPtr const & context) { - TreeIter iter; - TreeModel::Path path; - TreeViewColumn* column; - int cellx; - int celly; boost::shared_ptr p; + if (position) { + p = position->processor (); + } - if (processor_display.get_path_at_pos (x, y, path, column, cellx, celly)) { - if ((iter = model->get_iter (path))) { - p = (*iter)[columns.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) { @@ -221,7 +356,7 @@ ProcessorBox::object_drop (const list >& procs, Gtk delete &state; } - /* since the treeview doesn't take care of this properly, we have to delete the originals + /* since the dndvbox doesn't take care of this properly, we have to delete the originals ourselves. */ @@ -232,8 +367,6 @@ ProcessorBox::object_drop (const list >& procs, Gtk other->delete_dragged_processors (procs); } } - - context->drag_finish (true, (context->get_suggested_action() == Gdk::ACTION_MOVE), 0); } void @@ -242,15 +375,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 (); } @@ -285,14 +423,14 @@ 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(); + boost::shared_ptr rl = _session->get_routes_with_internal_returns(); if (rl->empty()) { return 0; @@ -303,8 +441,8 @@ ProcessorBox::build_possible_aux_menu () MenuList& items = menu->items(); for (RouteList::iterator r = rl->begin(); r != rl->end(); ++r) { - if (!(*r)->internal_send_for (*r)) { - items.push_back (MenuElem ((*r)->name(), bind (sigc::ptr_fun (ProcessorBox::rb_choose_aux), boost::weak_ptr(*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)))); } } @@ -338,31 +476,22 @@ ProcessorBox::show_processor_menu (gint arg) if (aux_menu_item) { Menu* m = build_possible_aux_menu(); - if (m) { + 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 */ - aux_menu_item->set_submenu (*((Gtk::Menu *)0)); + 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 *) -{ - processor_drag_in_progress = true; -} - -void -ProcessorBox::processor_drag_end (GdkDragContext *) -{ - processor_drag_in_progress = false; -} - bool ProcessorBox::enter_notify (GdkEventCrossing*) { @@ -404,32 +533,35 @@ ProcessorBox::processor_key_release_event (GdkEventKey *ev) if (targets.empty()) { int x, y; - TreeIter iter; - TreeModel::Path path; - TreeViewColumn* column; - int cellx; - int celly; - processor_display.get_pointer (x, y); - if (processor_display.get_path_at_pos (x, y, path, column, cellx, celly)) { - if ((iter = model->get_iter (path))) { - targets.push_back ((*iter)[columns.processor]); - } + 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; @@ -440,16 +572,23 @@ ProcessorBox::processor_key_release_event (GdkEventKey *ev) } 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_slash: + case GDK_Return: for (ProcSelection::iterator i = targets.begin(); i != targets.end(); ++i) { if ((*i)->active()) { (*i)->deactivate (); @@ -460,6 +599,11 @@ ProcessorBox::processor_key_release_event (GdkEventKey *ev) ret = true; break; + case GDK_slash: + ab_plugins (); + ret = true; + break; + default: break; } @@ -468,28 +612,19 @@ ProcessorBox::processor_key_release_event (GdkEventKey *ev) } bool -ProcessorBox::processor_button_press_event (GdkEventButton *ev) +ProcessorBox::processor_button_press_event (GdkEventButton *ev, ProcessorEntry* child) { - TreeIter iter; - TreeModel::Path path; - TreeViewColumn* column; - int cellx; - int celly; boost::shared_ptr processor; - int ret = false; - bool selected = 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]; - selected = processor_display.get_selection()->is_selected (iter); - } - + 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); } @@ -506,31 +641,23 @@ ProcessorBox::processor_button_press_event (GdkEventButton *ev) _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; @@ -570,7 +697,7 @@ ProcessorBox::processor_button_release_event (GdkEventButton *ev) } - return ret; + return false; } Menu * @@ -587,20 +714,25 @@ 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 @@ -609,12 +741,13 @@ ProcessorBox::choose_plugin () _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; @@ -624,23 +757,23 @@ ProcessorBox::use_plugins (const SelectedPlugins& plugins) 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) { - 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"), @@ -665,7 +798,7 @@ ProcessorBox::weird_plugin_dialog (Plugin& p, Route::ProcessorStreams streams) 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); @@ -682,21 +815,18 @@ ProcessorBox::weird_plugin_dialog (Plugin& p, Route::ProcessorStreams streams) void ProcessorBox::choose_insert () { - boost::shared_ptr processor (new PortInsert (_session, _route->mute_master())); - processor->ActiveChanged.connect (bind (mem_fun(*this, &ProcessorBox::show_processor_active), - boost::weak_ptr(processor))); - + 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, _route->mute_master())); + 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 */ @@ -722,8 +852,8 @@ ProcessorBox::choose_send () */ _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)); } @@ -756,35 +886,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->input()->ensure_io (ins, 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->input(), true); - ios->show_all (); - - /* keep a reference to the return 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) { @@ -829,26 +930,32 @@ ProcessorBox::choose_aux (boost::weak_ptr wr) boost::shared_ptr rlist (new RouteList); rlist->push_back (_route); - _session.add_internal_sends (target, PreFader, rlist); + _session->add_internal_sends (target, PreFader, rlist); +} + +void +ProcessorBox::route_processors_changed (RouteProcessorChange c) +{ + 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; + } + + redisplay_processors (); } void ProcessorBox::redisplay_processors () { - ENSURE_GUI_THREAD (mem_fun(*this, &ProcessorBox::redisplay_processors)); + ENSURE_GUI_THREAD (*this, &ProcessorBox::redisplay_processors) if (no_processor_redisplay) { return; } - ignore_delete = true; - model->clear (); - ignore_delete = false; - - processor_active_connections.clear (); - processor_name_connections.clear (); + processor_display.clear (); - _route->foreach_processor (mem_fun (*this, &ProcessorBox::add_processor_to_display)); + _route->foreach_processor (sigc::mem_fun (*this, &ProcessorBox::add_processor_to_display)); build_processor_tooltip (processor_eventbox, _("Inserts, sends & plugins:")); } @@ -862,147 +969,46 @@ ProcessorBox::add_processor_to_display (boost::weak_ptr p) 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)))); -} - -string -ProcessorBox::processor_name (boost::weak_ptr weak_processor) -{ - boost::shared_ptr processor (weak_processor.lock()); - - if (!processor) { - return string(); - } - - boost::shared_ptr send; - string name_display; - - if (!processor->active()) { - 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; - } - + boost::shared_ptr send = boost::dynamic_pointer_cast (processor); + ProcessorEntry* e = 0; + if (send) { + e = new SendProcessorEntry (send, _width); } else { - - switch (_width) { - case Wide: - name_display += processor->display_name(); - break; - case Narrow: - name_display += PBD::short_version (processor->display_name(), 5); - break; - } - - } - - if (!processor->active()) { - name_display += ')'; + 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]; + tip += (*i)->processor()->name(); } - ARDOUR_UI::instance()->tooltips().set_tip (box, tip); + + ARDOUR_UI::instance()->set_tip (box, tip); } void -ProcessorBox::show_processor_name (boost::weak_ptr processor) +ProcessorBox::reordered () { - 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++; - } -} - -void -ProcessorBox::row_deleted (const Gtk::TreeModel::Path &) -{ - if (!ignore_delete) { - compute_processor_sort_keys (); - } + compute_processor_sort_keys (); } void ProcessorBox::compute_processor_sort_keys () { - 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 p = (*iter)[columns.processor]; - our_processors.push_back ((*iter)[columns.processor]); + for (list::iterator iter = children.begin(); iter != children.end(); ++iter) { + our_processors.push_back ((*iter)->processor ()); } if (_route->reorder_processors (our_processors)) { @@ -1013,14 +1019,15 @@ ProcessorBox::compute_processor_sort_keys () /* now tell them about the problem */ - ArdourDialog dialog (_("ardour: weird plugin dialog")); + ArdourDialog dialog (_("Plugin Incompatibility")); 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); @@ -1049,6 +1056,27 @@ 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 () { @@ -1204,7 +1232,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); @@ -1215,11 +1244,27 @@ ProcessorBox::rename_processor (boost::shared_ptr processor) case Gtk::RESPONSE_ACCEPT: name_prompter.get_result (result); if (result.length()) { - if (_session.route_by_name (result)) { - ARDOUR_UI::instance()->popup_error (_("A track already exists with that name")); - return; - } - processor->set_name (result); + + 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; } @@ -1275,20 +1320,36 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr } else if (type->value() == "send") { XMLNode n (**niter); - Send::make_unique (n, _session); - p.reset (new Send (_session, _route->mute_master(), n)); + 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); - Return::make_unique (n, _session); - p.reset (new Return (_session, **niter)); + Return::make_unique (n, *_session); + Return* r = new Return (*_session); + + if (r->set_state (n, Stateful::loading_state_version)) { + delete r; + return; + } + + p.reset (r); } else { /* XXX its a bit limiting to assume that everything else is a plugin. */ - p.reset (new PluginInsert (_session, **niter)); + + p.reset (new PluginInsert (*_session)); + p->set_state (**niter, Stateful::current_state_version); } copies.push_back (p); @@ -1327,23 +1388,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 ()); } } @@ -1373,7 +1431,7 @@ ProcessorBox::clear_processors () 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 (PreFader); @@ -1398,7 +1456,7 @@ ProcessorBox::clear_processors (Placement p) 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 (p); @@ -1423,7 +1481,7 @@ ProcessorBox::edit_processor (boost::shared_ptr processor) if ((send = boost::dynamic_pointer_cast (processor)) != 0) { - if (!_session.engine().connected()) { + if (!_session->engine().connected()) { return; } @@ -1442,14 +1500,13 @@ ProcessorBox::edit_processor (boost::shared_ptr processor) gidget = send_ui; #else if (_parent_strip) { - _parent_strip->gain_meter().set_controls (_route, send->meter(), send->amp()); - _parent_strip->panner_ui().set_panner (send->panner()); + _parent_strip->show_send (send); } #endif } else if ((retrn = boost::dynamic_pointer_cast (processor)) != 0) { - if (!_session.engine().connected()) { + if (!_session->engine().connected()) { return; } @@ -1493,7 +1550,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; @@ -1540,8 +1597,6 @@ ProcessorBox::register_actions () ActionManager::jack_sensitive_actions.push_back (act); ActionManager::register_action (popup_act_grp, X_("newaux"), _("New Aux Send ...")); - ActionManager::register_action (popup_act_grp, X_("newreturn"), _("New Return ..."), - sigc::ptr_fun (ProcessorBox::rb_choose_return)); ActionManager::register_action (popup_act_grp, X_("clear"), _("Clear (all)"), sigc::ptr_fun (ProcessorBox::rb_clear)); @@ -1551,9 +1606,9 @@ ProcessorBox::register_actions () 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); @@ -1564,68 +1619,65 @@ 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_choose_plugin () +ProcessorBox::rb_ab_plugins () { if (_current_processor_box == 0) { return; } - _current_processor_box->choose_plugin (); + + _current_processor_box->ab_plugins (); } void -ProcessorBox::rb_choose_insert () +ProcessorBox::rb_choose_plugin () { if (_current_processor_box == 0) { return; } - _current_processor_box->choose_insert (); + _current_processor_box->choose_plugin (); } void -ProcessorBox::rb_choose_send () +ProcessorBox::rb_choose_insert () { if (_current_processor_box == 0) { return; } - _current_processor_box->choose_send (); + _current_processor_box->choose_insert (); } void -ProcessorBox::rb_choose_return () +ProcessorBox::rb_choose_send () { if (_current_processor_box == 0) { return; } - _current_processor_box->choose_return (); + _current_processor_box->choose_send (); } void @@ -1738,25 +1790,6 @@ ProcessorBox::rb_deselect_all () _current_processor_box->deselect_all_processors (); } -void -ProcessorBox::rb_activate () -{ - if (_current_processor_box == 0) { - return; - } - - _current_processor_box->for_selected_processors (&ProcessorBox::activate_processor); -} - -void -ProcessorBox::rb_deactivate () -{ - if (_current_processor_box == 0) { - return; - } - _current_processor_box->for_selected_processors (&ProcessorBox::deactivate_processor); -} - void ProcessorBox::rb_activate_all () { @@ -1787,20 +1820,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(); @@ -1836,3 +1872,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 ()); + } +}