diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-12-17 17:58:44 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-12-17 17:59:08 +0000 |
| commit | 7688d22456b2bb480fd7f0b9c094231d6c536947 (patch) | |
| tree | 1782cef701f86654a02881e8cc0c5b70b78041df /gtk2_ardour/route_time_axis.cc | |
| parent | 8405f642e769861ae9f070137c35d7dcd0983de2 (diff) | |
remove channel filter status and button from MIDI track header, access via context menu
Diffstat (limited to 'gtk2_ardour/route_time_axis.cc')
| -rw-r--r-- | gtk2_ardour/route_time_axis.cc | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index e546bff976..2bb7577319 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -526,13 +526,13 @@ RouteTimeAxisView::build_automation_action_menu (bool for_selection) automation_action_menu->set_name ("ArdourContextMenu"); items.push_back (MenuElem (_("Show All Automation"), - sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::show_all_automation), for_selection))); + sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::show_all_automation), for_selection))); items.push_back (MenuElem (_("Show Existing Automation"), - sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::show_existing_automation), for_selection))); + sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::show_existing_automation), for_selection))); items.push_back (MenuElem (_("Hide All Automation"), - sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::hide_all_automation), for_selection))); + sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::hide_all_automation), for_selection))); /* Attach the plugin submenu. It may have previously been used elsewhere, so it was detached above @@ -577,7 +577,7 @@ RouteTimeAxisView::build_automation_action_menu (bool for_selection) items.push_back (CheckMenuElem (_("Pan"), sigc::mem_fun (*this, &RouteTimeAxisView::update_pan_track_visibility))); pan_automation_item = dynamic_cast<Gtk::CheckMenuItem*> (&items.back ()); pan_automation_item->set_active ((!for_selection || _editor.get_selection().tracks.size() == 1) && - (!pan_tracks.empty() && string_is_affirmative (pan_tracks.front()->gui_property ("visible")))); + (!pan_tracks.empty() && string_is_affirmative (pan_tracks.front()->gui_property ("visible")))); set<Evoral::Parameter> const & params = _route->pannable()->what_can_be_automated (); for (set<Evoral::Parameter>::const_iterator p = params.begin(); p != params.end(); ++p) { @@ -852,6 +852,17 @@ RouteTimeAxisView::build_display_menu () items.push_back (SeparatorElem()); + if (is_midi_track()) { + Menu* midi_menu = manage (new Menu); + MenuList& midi_items = midi_menu->items(); + midi_menu->set_name (X_("ArdourContextMenu")); + + midi_items.push_back (MenuElem (_("Channel Management"), sigc::mem_fun (*this, &RouteTimeAxisView::toggle_channel_selector))); + + items.push_back (MenuElem (_("MIDI"), *midi_menu)); + items.push_back (SeparatorElem()); + } + int active = 0; int inactive = 0; TrackSelection const & s = _editor.get_selection().tracks; @@ -1420,7 +1431,7 @@ RouteTimeAxisView::name_entry_changed (string const& str) } string x = str; - + strip_whitespace_edges (x); if (x.empty()) { @@ -2928,4 +2939,3 @@ RouteTimeAxisView::set_marked_for_display (bool yn) { return RouteUI::mark_hidden (!yn); } - |