diff options
| author | Robin Gareus <robin@gareus.org> | 2016-04-20 21:27:44 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2016-04-20 21:28:03 +0200 |
| commit | 62937ea1a658786f7615258bfe77af096c73123b (patch) | |
| tree | 7d45eed3582c74aa169df04c2544927ee0351138 | |
| parent | 49d044bf04886ad62e08839518c914ccff52794a (diff) | |
special case send panning for MB
since the route does not use Ardour pannersi"link panners" here only
affects send <> send linking.
| -rw-r--r-- | gtk2_ardour/ardour.menus.in | 2 | ||||
| -rw-r--r-- | gtk2_ardour/processor_box.cc | 23 | ||||
| -rw-r--r-- | gtk2_ardour/rc_option_editor.cc | 3 |
3 files changed, 18 insertions, 10 deletions
diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in index 4bfc87c187..bd955d552c 100644 --- a/gtk2_ardour/ardour.menus.in +++ b/gtk2_ardour/ardour.menus.in @@ -634,7 +634,9 @@ <menuitem action='newlua'/> <separator/> <menuitem action='controls'/> +#ifndef MIXBUS <menuitem action='send_options'/> +#endif <separator/> <menuitem action='clear'/> <menuitem action='clear_pre'/> diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index 60aee0ff62..ac3dc96bac 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -2089,19 +2089,22 @@ ProcessorBox::show_processor_menu (int arg) } } - Gtk::MenuItem* send_menu_item = dynamic_cast<Gtk::MenuItem*>(ActionManager::get_widget("/ProcessorMenu/send_options")); - if (send_menu_item) { - if (single_selection && !_route->is_monitor()) { - Menu* m = single_selection->build_send_options_menu (); - if (m && !m->items().empty()) { - send_menu_item->set_submenu (*m); - send_menu_item->set_sensitive (true); + + if (!ARDOUR::Profile->get_mixbus()) { + Gtk::MenuItem* send_menu_item = dynamic_cast<Gtk::MenuItem*>(ActionManager::get_widget("/ProcessorMenu/send_options")); + if (send_menu_item) { + if (single_selection && !_route->is_monitor()) { + Menu* m = single_selection->build_send_options_menu (); + if (m && !m->items().empty()) { + send_menu_item->set_submenu (*m); + send_menu_item->set_sensitive (true); + } else { + gtk_menu_item_set_submenu (send_menu_item->gobj(), 0); + send_menu_item->set_sensitive (false); + } } else { - gtk_menu_item_set_submenu (send_menu_item->gobj(), 0); send_menu_item->set_sensitive (false); } - } else { - send_menu_item->set_sensitive (false); } } diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index 3d5badf57b..599c4c46c8 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -2611,6 +2611,8 @@ if (!Profile->get_mixbus()) { add_option (_("Solo & mute"), new OptionEditorHeading (_("Send Routing"))); + +if (!ARDOUR::Profile->get_mixbus()) { add_option (_("Solo & mute"), new BoolOption ( "link-send-and-route-panner", @@ -2618,6 +2620,7 @@ if (!Profile->get_mixbus()) { sigc::mem_fun (*_rc_config, &RCConfiguration::get_link_send_and_route_panner), sigc::mem_fun (*_rc_config, &RCConfiguration::set_link_send_and_route_panner) )); +} add_option (_("MIDI"), new OptionEditorHeading (_("MIDI Preferences"))); |