X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fprocessor_box.cc;h=7ad56cced370e3591fb9346cb98d4f9c62d80ce3;hb=7f1784252882cd216a9912f57f66533cc06af8a5;hp=be3547e4514de15ab548582692c012e8e88b82bc;hpb=ed626628b54e67dd9621c08d82a42afaed00c7ac;p=ardour.git diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index be3547e451..7ad56cced3 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -76,7 +76,7 @@ #include "i18n.h" -#ifdef HAVE_AUDIOUNITS +#ifdef AUDIOUNIT_SUPPORT class AUPluginUI; #endif @@ -96,75 +96,65 @@ RefPtr ProcessorBox::controls_action; Glib::RefPtr SendProcessorEntry::_slider; ProcessorEntry::ProcessorEntry (boost::shared_ptr p, Width w) - : _position (PreFader) + : _button (ArdourButton::led_default_elements) + , _position (PreFader) , _processor (p) , _width (w) , _visual_state (Gtk::STATE_NORMAL) { - _hbox.pack_start (_active, false, false); - _event_box.add (_name); - _hbox.pack_start (_event_box, true, true); - _vbox.pack_start (_hbox); - _frame.add (_vbox); - - /* without this, the border is mis-drawn on some systems */ - _vbox.set_border_width (1); - - _name.set_alignment (0, 0.5); - _name.set_text (name ()); - _name.set_padding (2, 2); - - if (boost::dynamic_pointer_cast (p)) { - /* Fader processor gets a special look */ - _event_box.set_name ("ProcessorFader"); - _frame.set_name ("ProcessorFaderFrame"); - _name.set_padding (2, 4); - } - - _active.set_active (_processor->active ()); - _active.signal_toggled().connect (sigc::mem_fun (*this, &ProcessorEntry::active_toggled)); - - _frame.show (); + _vbox.pack_start (_button, true, true); _vbox.show (); - _hbox.show (); - _event_box.show (); - _name.show (); - _active.show (); + + if (_processor->active()) { + _button.set_active_state (Gtkmm2ext::Active); + } + _button.set_diameter (3); + _button.set_distinct_led_click (true); + _button.set_led_left (true); + _button.signal_led_clicked.connect (sigc::mem_fun (*this, &ProcessorEntry::led_clicked)); + _button.set_text (name (_width)); + _button.show (); _processor->ActiveChanged.connect (active_connection, invalidator (*this), boost::bind (&ProcessorEntry::processor_active_changed, this), gui_context()); _processor->PropertyChanged.connect (name_connection, invalidator (*this), ui_bind (&ProcessorEntry::processor_property_changed, this, _1), gui_context()); + + setup_tooltip (); + setup_visuals (); } EventBox& ProcessorEntry::action_widget () { - return _event_box; + return _button; } Gtk::Widget& ProcessorEntry::widget () { - return _frame; + return _vbox; } string ProcessorEntry::drag_text () const { - return name (); + return name (Wide); } void -ProcessorEntry::set_visual_state (Gtk::StateType t) +ProcessorEntry::set_position (Position p) { - _visual_state = t; + _position = p; setup_visuals (); } void -ProcessorEntry::set_position (Position p) +ProcessorEntry::set_visual_state (Gtkmm2ext::VisualState s, bool yn) { - _position = p; - setup_visuals (); + if (yn) { + _button.set_visual_state (Gtkmm2ext::VisualState (_button.visual_state() | s)); + } else { + _button.set_visual_state (Gtkmm2ext::VisualState (_button.visual_state() & ~s)); + } } void @@ -172,42 +162,15 @@ ProcessorEntry::setup_visuals () { switch (_position) { case PreFader: - _event_box.set_name ("ProcessorPreFader"); - if (_visual_state == Gtk::STATE_NORMAL) { - _frame.set_name ("ProcessorPreFaderFrame"); - } + _button.set_name ("processor prefader"); break; case Fader: - _event_box.set_name ("ProcessorFader"); - if (_visual_state == Gtk::STATE_NORMAL) { - _frame.set_name ("ProcessorFaderFrame"); - } + _button.set_name ("processor fader"); break; case PostFader: - _event_box.set_name ("ProcessorPostFader"); - if (_visual_state == Gtk::STATE_NORMAL) { - _frame.set_name ("ProcessorPostFaderFrame"); - } - break; - } - - switch (_visual_state) { - case Gtk::STATE_NORMAL: - /* _frame has been set up above */ - _event_box.set_state (Gtk::STATE_NORMAL); - break; - case Gtk::STATE_SELECTED: - _frame.set_name ("ProcessorFrameSelected"); - /* don't change the background of the box when it is selected */ - _event_box.set_state (Gtk::STATE_NORMAL); - break; - case Gtk::STATE_ACTIVE: - _frame.set_name ("ProcessorFrameActiveSend"); - _event_box.set_state (Gtk::STATE_ACTIVE); - break; - default: + _button.set_name ("processor postfader"); break; } } @@ -226,24 +189,22 @@ ProcessorEntry::set_enum_width (Width w) } void -ProcessorEntry::active_toggled () +ProcessorEntry::led_clicked() { - if (_active.get_active ()) { - if (!_processor->active ()) { - _processor->activate (); - } + if (_button.active_state() == Gtkmm2ext::Active) { + _processor->deactivate (); } else { - if (_processor->active ()) { - _processor->deactivate (); - } + _processor->activate (); } } void ProcessorEntry::processor_active_changed () { - if (_active.get_active () != _processor->active ()) { - _active.set_active (_processor->active ()); + if (_processor->active()) { + _button.set_active_state (Gtkmm2ext::Active); + } else { + _button.unset_active_state (); } } @@ -251,12 +212,19 @@ void ProcessorEntry::processor_property_changed (const PropertyChange& what_changed) { if (what_changed.contains (ARDOUR::Properties::name)) { - _name.set_text (name ()); + _button.set_text (name (_width)); + setup_tooltip (); } } +void +ProcessorEntry::setup_tooltip () +{ + ARDOUR_UI::instance()->set_tip (_button, name (Wide)); +} + string -ProcessorEntry::name () const +ProcessorEntry::name (Width w) const { boost::shared_ptr send; string name_display; @@ -272,7 +240,7 @@ ProcessorEntry::name () const lbracket = send->name().find ('['); rbracket = send->name().find (']'); - switch (_width) { + switch (w) { case Wide: name_display += send->name().substr (lbracket+1, lbracket-rbracket-1); break; @@ -283,7 +251,7 @@ ProcessorEntry::name () const } else { - switch (_width) { + switch (w) { case Wide: name_display += _processor->display_name(); break; @@ -298,12 +266,12 @@ ProcessorEntry::name () const } SendProcessorEntry::SendProcessorEntry (boost::shared_ptr s, Width w) - : ProcessorEntry (s, w), - _send (s), - /* set the adjustment to a gain of 0dB so that the fader's default value is right */ - _adjustment (0.781787, 0, 1, 0.01, 0.1), - _fader (_slider, &_adjustment, 0, false), - _ignore_gain_change (false) + : ProcessorEntry (s, w) + , _send (s) + , _adjustment (gain_to_slider_position_with_max (1.0, Config->get_max_gain()), 0, 1, 0.01, 0.1) + , _fader (_slider, &_adjustment, 0, false) + , _ignore_gain_change (false) + , _data_type (DataType::AUDIO) { _fader.set_name ("SendFader"); _fader.set_controllable (_send->amp()->gain_control ()); @@ -312,10 +280,39 @@ SendProcessorEntry::SendProcessorEntry (boost::shared_ptr s, Width w) _fader.show (); _adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &SendProcessorEntry::gain_adjusted)); - _send->amp()->gain_control()->Changed.connect (send_gain_connection, invalidator (*this), boost::bind (&SendProcessorEntry::show_gain, this), gui_context()); + + _send->amp()->gain_control()->Changed.connect ( + _send_connections, invalidator (*this), boost::bind (&SendProcessorEntry::show_gain, this), gui_context() + ); + + _send->amp()->ConfigurationChanged.connect ( + _send_connections, invalidator (*this), ui_bind (&SendProcessorEntry::setup_gain_adjustment, this), gui_context () + ); + + setup_gain_adjustment (); show_gain (); } +void +SendProcessorEntry::setup_gain_adjustment () +{ + if (_send->amp()->output_streams().n_midi() == 0) { + _data_type = DataType::AUDIO; + _adjustment.set_lower (0); + _adjustment.set_upper (1); + _adjustment.set_step_increment (0.01); + _adjustment.set_page_increment (0.1); + _fader.set_default_value (gain_to_slider_position (1)); + } else { + _data_type = DataType::MIDI; + _adjustment.set_lower (0); + _adjustment.set_upper (2); + _adjustment.set_step_increment (0.05); + _adjustment.set_page_increment (0.1); + _fader.set_default_value (1); + } +} + void SendProcessorEntry::setup_slider_pix () { @@ -326,9 +323,16 @@ SendProcessorEntry::setup_slider_pix () void SendProcessorEntry::show_gain () { - ENSURE_GUI_THREAD (*this, &SendProcessorEntry::show_gain) - - float const value = gain_to_slider_position (_send->amp()->gain ()); + gain_t value = 0; + + switch (_data_type) { + case DataType::AUDIO: + value = gain_to_slider_position_with_max (_send->amp()->gain (), Config->get_max_gain()); + break; + case DataType::MIDI: + value = _send->amp()->gain (); + break; + } if (_adjustment.get_value() != value) { _ignore_gain_change = true; @@ -338,7 +342,11 @@ SendProcessorEntry::show_gain () stringstream s; s.precision (1); s.setf (ios::fixed, ios::floatfield); - s << accurate_coefficient_to_dB (_send->amp()->gain ()) << _("dB"); + s << accurate_coefficient_to_dB (_send->amp()->gain ()); + if (_data_type == DataType::AUDIO) { + s << _("dB"); + } + _fader.set_tooltip_text (s.str ()); } } @@ -350,7 +358,17 @@ SendProcessorEntry::gain_adjusted () return; } - _send->amp()->set_gain (slider_position_to_gain (_adjustment.get_value()), this); + gain_t value = 0; + + switch (_data_type) { + case DataType::AUDIO: + value = slider_position_to_gain_with_max (_adjustment.get_value(), Config->get_max_gain()); + break; + case DataType::MIDI: + value = _adjustment.get_value (); + } + + _send->amp()->set_gain (value, this); } void @@ -442,19 +460,18 @@ PluginInsertProcessorEntry::SplittingIcon::on_expose_event (GdkEventExpose* ev) } ProcessorBox::ProcessorBox (ARDOUR::Session* sess, boost::function get_plugin_selector, - RouteRedirectSelection& rsel, MixerStrip* parent, bool owner_is_mixer) + RouteProcessorSelection& rsel, MixerStrip* parent, bool owner_is_mixer) : _parent_strip (parent) , _owner_is_mixer (owner_is_mixer) , ab_direction (true) , _get_plugin_selector (get_plugin_selector) - , _placement(PreFader) + , _placement (-1) , _rr_selection(rsel) { set_session (sess); _width = Wide; processor_menu = 0; - send_action_menu = 0; no_processor_redisplay = false; processor_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC); @@ -470,15 +487,11 @@ ProcessorBox::ProcessorBox (ARDOUR::Session* sess, boost::function* source, ProcessorEntry* posit if ((context->get_suggested_action() == Gdk::ACTION_MOVE) && source) { ProcessorBox* other = reinterpret_cast (source->get_data ("processorbox")); if (other) { - cerr << "source was another processor box, delete the selected items\n"; other->delete_dragged_processors (procs); } } @@ -588,19 +601,6 @@ ProcessorBox::set_width (Width w) redisplay_processors (); } -void -ProcessorBox::build_send_action_menu () -{ - using namespace Menu_Helpers; - - send_action_menu = new Menu; - send_action_menu->set_name ("ArdourContextMenu"); - MenuList& items = send_action_menu->items(); - - items.push_back (MenuElem (_("New send"), sigc::mem_fun(*this, &ProcessorBox::new_send))); - items.push_back (MenuElem (_("Show send controls"), sigc::mem_fun(*this, &ProcessorBox::show_send_controls))); -} - Gtk::Menu* ProcessorBox::build_possible_aux_menu () { @@ -634,18 +634,23 @@ ProcessorBox::new_send () } void -ProcessorBox::show_processor_menu (gint arg) +ProcessorBox::show_processor_menu (int arg) { if (processor_menu == 0) { processor_menu = build_processor_menu (); + processor_menu->signal_unmap().connect (sigc::mem_fun (*this, &ProcessorBox::processor_menu_unmapped)); } + /* Sort out the plugin submenu */ + Gtk::MenuItem* plugin_menu_item = dynamic_cast(ActionManager::get_widget("/ProcessorMenu/newplugin")); if (plugin_menu_item) { plugin_menu_item->set_submenu (*_get_plugin_selector()->plugin_menu()); } + /* And the aux submenu */ + Gtk::MenuItem* aux_menu_item = dynamic_cast(ActionManager::get_widget("/ProcessorMenu/newaux")); if (aux_menu_item) { @@ -660,46 +665,57 @@ ProcessorBox::show_processor_menu (gint arg) } } + /* Sensitise actions as approprioate */ + cut_action->set_sensitive (can_cut()); paste_action->set_sensitive (!_rr_selection.processors.empty()); + const bool sensitive = !processor_display.selection().empty(); + ActionManager::set_sensitive (ActionManager::plugin_selection_sensitive_actions, sensitive); + edit_action->set_sensitive (one_processor_can_be_edited ()); + + boost::shared_ptr single_selection; + if (processor_display.selection().size() == 1) { + single_selection = processor_display.selection().front()->processor (); + } + + boost::shared_ptr pi; + if (single_selection) { + pi = boost::dynamic_pointer_cast (single_selection); + } + + /* enable gui for plugin inserts with editors */ + controls_action->set_sensitive(pi && pi->plugin()->has_editor()); + + /* disallow rename for multiple selections, for plugin inserts and for the fader */ + rename_action->set_sensitive (single_selection && !pi && !boost::dynamic_pointer_cast (single_selection)); + processor_menu->popup (1, arg); + + /* Add a placeholder gap to the processor list to indicate where a processor would be + inserted were one chosen from the menu. + */ + int x, y; + processor_display.get_pointer (x, y); + _placement = processor_display.add_placeholder (y); } bool ProcessorBox::enter_notify (GdkEventCrossing*) { _current_processor_box = this; - Keyboard::magic_widget_grab_focus (); - processor_display.grab_focus (); - return false; } 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 *) -{ - /* do real stuff on key release */ return false; } -bool -ProcessorBox::processor_key_release_event (GdkEventKey *ev) +void +ProcessorBox::processor_operation (ProcessorOperation op) { - bool ret = false; ProcSelection targets; get_selected_processors (targets); @@ -716,53 +732,32 @@ ProcessorBox::processor_key_release_event (GdkEventKey *ev) } } - - switch (ev->keyval) { - case GDK_a: - if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { - processor_display.select_all (); - ret = true; - } + switch (op) { + case ProcessorsSelectAll: + processor_display.select_all (); break; - case GDK_c: - if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { - copy_processors (targets); - ret = true; - } + case ProcessorsCopy: + copy_processors (targets); break; - case GDK_x: - if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { - cut_processors (targets); - ret = true; - } + case ProcessorsCut: + cut_processors (targets); break; - case GDK_v: - if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { - if (targets.empty()) { - paste_processors (); - } else { - paste_processors (targets.front()); - } - ret = true; + case ProcessorsPaste: + if (targets.empty()) { + paste_processors (); + } else { + paste_processors (targets.front()); } break; - case GDK_Up: - break; - - case GDK_Down: - break; - - case GDK_Delete: - case GDK_BackSpace: + case ProcessorsDelete: delete_processors (targets); - ret = true; break; - case GDK_Return: + case ProcessorsToggleActive: for (ProcSelection::iterator i = targets.begin(); i != targets.end(); ++i) { if ((*i)->active()) { (*i)->deactivate (); @@ -770,19 +765,15 @@ ProcessorBox::processor_key_release_event (GdkEventKey *ev) (*i)->activate (); } } - ret = true; break; - case GDK_slash: + case ProcessorsAB: ab_plugins (); - ret = true; break; default: break; } - - return ret; } bool @@ -826,33 +817,15 @@ ProcessorBox::processor_button_release_event (GdkEventButton *ev, ProcessorEntry processor = child->processor (); } - int ret = false; - if (processor && Keyboard::is_delete_event (ev)) { Glib::signal_idle().connect (sigc::bind ( sigc::mem_fun(*this, &ProcessorBox::idle_delete_processor), boost::weak_ptr(processor))); - ret = true; } else if (Keyboard::is_context_menu_event (ev)) { - /* figure out if we are above or below the fader/amp processor, - and set the next insert position appropriately. - */ - - if (processor) { - if (_route->processor_is_prefader (processor)) { - _placement = PreFader; - } else { - _placement = PostFader; - } - } else { - _placement = PostFader; - } - show_processor_menu (ev->time); - ret = true; } else if (processor && Keyboard::is_button2_event (ev) #ifndef GTKOSX @@ -867,8 +840,6 @@ ProcessorBox::processor_button_release_event (GdkEventButton *ev, ProcessorEntry } else { processor->activate (); } - ret = true; - } return false; @@ -882,29 +853,6 @@ ProcessorBox::build_processor_menu () return processor_menu; } -void -ProcessorBox::selection_changed () -{ - const bool sensitive = !processor_display.selection().empty(); - ActionManager::set_sensitive(ActionManager::plugin_selection_sensitive_actions, - sensitive); - edit_action->set_sensitive(one_processor_can_be_edited()); - - const bool single_selection = (processor_display.selection().size() == 1); - - boost::shared_ptr pi; - if (single_selection) { - pi = boost::dynamic_pointer_cast( - processor_display.selection().front()->processor()); - } - - /* enable gui for plugin inserts with editors */ - controls_action->set_sensitive(pi && pi->plugin()->has_editor()); - - /* disallow rename for multiple selections and for plugin inserts */ - rename_action->set_sensitive(single_selection && pi); -} - void ProcessorBox::select_all_processors () { @@ -933,7 +881,7 @@ ProcessorBox::use_plugins (const SelectedPlugins& plugins) Route::ProcessorStreams err_streams; - if (_route->add_processor (processor, _placement, &err_streams, Config->get_new_plugins_active ())) { + if (_route->add_processor_by_index (processor, _placement, &err_streams, Config->get_new_plugins_active ())) { weird_plugin_dialog (**p, err_streams); return true; // XXX SHAREDPTR delete plugin here .. do we even need to care? @@ -998,7 +946,7 @@ void ProcessorBox::choose_insert () { boost::shared_ptr processor (new PortInsert (*_session, _route->pannable(), _route->mute_master())); - _route->add_processor (processor, _placement); + _route->add_processor_by_index (processor, _placement); } /* Caller must not hold process lock */ @@ -1060,7 +1008,7 @@ ProcessorBox::send_io_finished (IOSelector::Result r, boost::weak_ptr break; case IOSelector::Accepted: - _route->add_processor (processor, _placement); + _route->add_processor_by_index (processor, _placement); if (Profile->get_sae()) { processor->activate (); } @@ -1088,7 +1036,7 @@ ProcessorBox::return_io_finished (IOSelector::Result r, boost::weak_ptradd_processor (processor, _placement); + _route->add_processor_by_index (processor, _placement); if (Profile->get_sae()) { processor->activate (); } @@ -1378,14 +1326,6 @@ ProcessorBox::can_cut () const return false; } -void -ProcessorBox::cut_processors () -{ - ProcSelection to_be_removed; - - get_selected_processors (to_be_removed); -} - void ProcessorBox::cut_processors (const ProcSelection& to_be_removed) { @@ -1427,14 +1367,6 @@ ProcessorBox::cut_processors (const ProcSelection& to_be_removed) redisplay_processors (); } -void -ProcessorBox::copy_processors () -{ - ProcSelection to_be_copied; - get_selected_processors (to_be_copied); - copy_processors (to_be_copied); -} - void ProcessorBox::copy_processors (const ProcSelection& to_be_copied) { @@ -1457,12 +1389,17 @@ ProcessorBox::copy_processors (const ProcSelection& to_be_copied) } void -ProcessorBox::delete_processors () +ProcessorBox::processors_up () +{ + /* unimplemented */ +} + +void +ProcessorBox::processors_down () { - ProcSelection to_be_deleted; - get_selected_processors (to_be_deleted); - delete_processors (to_be_deleted); + /* unimplemented */ } + void ProcessorBox::delete_processors (const ProcSelection& targets) @@ -1715,9 +1652,9 @@ ProcessorBox::for_selected_processors (void (ProcessorBox::*method)(boost::share } void -ProcessorBox::all_processors_active (bool state) +ProcessorBox::all_visible_processors_active (bool state) { - _route->all_processors_active (_placement, state); + _route->all_visible_processors_active (state); } void @@ -1781,7 +1718,7 @@ ProcessorBox::processor_can_be_edited (boost::shared_ptr processor) } if ( - boost::dynamic_pointer_cast (processor) || + (boost::dynamic_pointer_cast (processor) && !boost::dynamic_pointer_cast (processor))|| boost::dynamic_pointer_cast (processor) || boost::dynamic_pointer_cast (processor) || boost::dynamic_pointer_cast (processor) @@ -1823,20 +1760,8 @@ ProcessorBox::toggle_edit_processor (boost::shared_ptr processor) if (boost::dynamic_pointer_cast (processor)) { - _parent_strip->revert_to_default_display (); - - } else if ((internal_send = boost::dynamic_pointer_cast (processor)) != 0) { - - if (!_session->engine().connected()) { - return; - } - if (_parent_strip) { - if (boost::dynamic_pointer_cast (_parent_strip->current_delivery()) == internal_send) { - _parent_strip->revert_to_default_display (); - } else { - _parent_strip->show_send (internal_send); - } + _parent_strip->revert_to_default_display (); } } else if ((send = boost::dynamic_pointer_cast (processor)) != 0) { @@ -1845,8 +1770,10 @@ ProcessorBox::toggle_edit_processor (boost::shared_ptr processor) return; } - SendUIWindow* w = new SendUIWindow (send, _session); - w->show (); + if (boost::dynamic_pointer_cast (processor) == 0) { + SendUIWindow* w = new SendUIWindow (send, _session); + w->show (); + } } else if ((retrn = boost::dynamic_pointer_cast (processor)) != 0) { @@ -1968,7 +1895,7 @@ ProcessorBox::register_actions () act = ActionManager::register_action (popup_act_grp, X_("newinsert"), _("New Insert"), sigc::ptr_fun (ProcessorBox::rb_choose_insert)); ActionManager::jack_sensitive_actions.push_back (act); - act = ActionManager::register_action (popup_act_grp, X_("newsend"), _("New Send ..."), + act = ActionManager::register_action (popup_act_grp, X_("newsend"), _("New External Send ..."), sigc::ptr_fun (ProcessorBox::rb_choose_send)); ActionManager::jack_sensitive_actions.push_back (act); @@ -2004,9 +1931,9 @@ ProcessorBox::register_actions () /* activation etc. */ - ActionManager::register_action (popup_act_grp, X_("activate_all"), _("Activate all"), + ActionManager::register_action (popup_act_grp, X_("activate_all"), _("Activate All"), sigc::ptr_fun (ProcessorBox::rb_activate_all)); - ActionManager::register_action (popup_act_grp, X_("deactivate_all"), _("Deactivate all"), + ActionManager::register_action (popup_act_grp, X_("deactivate_all"), _("Deactivate All"), sigc::ptr_fun (ProcessorBox::rb_deactivate_all)); ActionManager::register_action (popup_act_grp, X_("ab_plugins"), _("A/B Plugins"), sigc::ptr_fun (ProcessorBox::rb_ab_plugins)); @@ -2110,7 +2037,7 @@ ProcessorBox::rb_cut () return; } - _current_processor_box->cut_processors (); + _current_processor_box->processor_operation (ProcessorsCut); } void @@ -2120,7 +2047,7 @@ ProcessorBox::rb_delete () return; } - _current_processor_box->delete_processors (); + _current_processor_box->processor_operation (ProcessorsDelete); } void @@ -2129,7 +2056,7 @@ ProcessorBox::rb_copy () if (_current_processor_box == 0) { return; } - _current_processor_box->copy_processors (); + _current_processor_box->processor_operation (ProcessorsCopy); } void @@ -2139,7 +2066,7 @@ ProcessorBox::rb_paste () return; } - _current_processor_box->paste_processors (); + _current_processor_box->processor_operation (ProcessorsPaste); } void @@ -2158,7 +2085,7 @@ ProcessorBox::rb_select_all () return; } - _current_processor_box->select_all_processors (); + _current_processor_box->processor_operation (ProcessorsSelectAll); } void @@ -2178,7 +2105,7 @@ ProcessorBox::rb_activate_all () return; } - _current_processor_box->all_processors_active (true); + _current_processor_box->all_visible_processors_active (true); } void @@ -2187,7 +2114,7 @@ ProcessorBox::rb_deactivate_all () if (_current_processor_box == 0) { return; } - _current_processor_box->all_processors_active (false); + _current_processor_box->all_visible_processors_active (false); } void @@ -2354,6 +2281,12 @@ ProcessorBox::hide_things () } } +void +ProcessorBox::processor_menu_unmapped () +{ + processor_display.remove_placeholder (); +} + ProcessorWindowProxy::ProcessorWindowProxy ( string const & name, XMLNode const * node,