diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-12-01 19:34:53 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-12-01 19:34:53 +0000 |
| commit | 9a85516623d2b6b873ba5aade1113e4cfbae497a (patch) | |
| tree | 8f38ddb2dc26b920b2aff34ed3da16ec38ed7124 /gtk2_ardour/processor_box.cc | |
| parent | 104a92a12894a51a6f463b91dea2b27981dd17b9 (diff) | |
cleanup vertical spacing a bit in mixer strip; rename new send options to be more clear on the difference; relabel "sends" button to say "Aux Sends" to be clearer on what it does; code tidy up in processor box and mixer strip
git-svn-id: svn://localhost/ardour2/branches/3.0@10850 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/processor_box.cc')
| -rw-r--r-- | gtk2_ardour/processor_box.cc | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index d5699c3651..7ad56cced3 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -472,7 +472,6 @@ ProcessorBox::ProcessorBox (ARDOUR::Session* sess, boost::function<PluginSelecto _width = Wide; processor_menu = 0; - send_action_menu = 0; no_processor_redisplay = false; processor_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC); @@ -506,6 +505,7 @@ ProcessorBox::ProcessorBox (ARDOUR::Session* sess, boost::function<PluginSelecto ProcessorBox::~ProcessorBox () { + delete processor_menu; } void @@ -573,7 +573,6 @@ ProcessorBox::object_drop(DnDVBox<ProcessorEntry>* source, ProcessorEntry* posit if ((context->get_suggested_action() == Gdk::ACTION_MOVE) && source) { ProcessorBox* other = reinterpret_cast<ProcessorBox*> (source->get_data ("processorbox")); if (other) { - cerr << "source was another processor box, delete the selected items\n"; other->delete_dragged_processors (procs); } } @@ -602,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 () { @@ -1909,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); |