diff options
| -rw-r--r-- | gtk2_ardour/mixer_strip.cc | 24 | ||||
| -rw-r--r-- | gtk2_ardour/processor_box.cc | 18 | ||||
| -rw-r--r-- | gtk2_ardour/processor_box.h | 3 |
3 files changed, 16 insertions, 29 deletions
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 5cf0a1365a..4da1695c13 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -278,16 +278,17 @@ MixerStrip::init () whvbox.pack_start (width_hide_box, true, true); + global_vpacker.set_spacing (2); global_vpacker.pack_start (whvbox, Gtk::PACK_SHRINK); global_vpacker.pack_start (button_table, Gtk::PACK_SHRINK); global_vpacker.pack_start (processor_box, true, true); global_vpacker.pack_start (panners, Gtk::PACK_SHRINK); - global_vpacker.pack_start (top_button_table, Gtk::PACK_SHRINK, 2); - global_vpacker.pack_start (rec_solo_table, Gtk::PACK_SHRINK, 2); - global_vpacker.pack_start (middle_button_table, Gtk::PACK_SHRINK, 2); + global_vpacker.pack_start (top_button_table, Gtk::PACK_SHRINK); + global_vpacker.pack_start (rec_solo_table, Gtk::PACK_SHRINK); + global_vpacker.pack_start (middle_button_table, Gtk::PACK_SHRINK); global_vpacker.pack_start (gpm, Gtk::PACK_SHRINK); global_vpacker.pack_start (bottom_button_table, Gtk::PACK_SHRINK); - global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK, 2); + global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK); global_vpacker.pack_start (_comment_button, Gtk::PACK_SHRINK); global_frame.add (global_vpacker); @@ -593,7 +594,8 @@ MixerStrip::set_width_enum (Width w, void* owner) switch (w) { case Wide: if (show_sends_button) { - show_sends_button->set_text (_("Sends")); + show_sends_button->set_text (_("Aux\nSends")); + show_sends_button->layout()->set_alignment (Pango::ALIGN_CENTER); } ((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text ( @@ -1468,15 +1470,16 @@ MixerStrip::build_route_ops_menu () gboolean MixerStrip::name_button_button_press (GdkEventButton* ev) { - if (ev->button == 3) { + /* show menu for either button 1 or 3, so as not to confuse people + and also not hide stuff from them. + */ + + if (ev->button == 3 || ev->button == 1) { list_route_operations (); /* do not allow rename if the track is record-enabled */ rename_menu_item->set_sensitive (!_route->record_enabled()); route_ops_menu->popup (1, ev->time); - - } else if (ev->button == 1) { - revert_to_default_display (); } return false; @@ -1729,6 +1732,7 @@ MixerStrip::bus_send_display_changed (boost::shared_ptr<Route> send_to) if (send_to) { boost::shared_ptr<Send> send = _route->internal_send_for (send_to); + if (send) { show_send (send); } else { @@ -1744,7 +1748,7 @@ MixerStrip::drop_send () { boost::shared_ptr<Send> current_send; - if (_current_delivery && (current_send = boost::dynamic_pointer_cast<Send>(_current_delivery))) { + if (_current_delivery && ((current_send = boost::dynamic_pointer_cast<Send>(_current_delivery)) != 0)) { current_send->set_metering (false); } 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); diff --git a/gtk2_ardour/processor_box.h b/gtk2_ardour/processor_box.h index bbbcf8ceb9..bf02caf3d7 100644 --- a/gtk2_ardour/processor_box.h +++ b/gtk2_ardour/processor_box.h @@ -264,9 +264,6 @@ class ProcessorBox : public Gtk::HBox, public PluginInterestedObject, public ARD Width _width; - Gtk::Menu *send_action_menu; - void build_send_action_menu (); - void new_send (); void show_send_controls (); |