ardour/livetrax
13
0
Fork 0
Code

Make controller menu items look the same whether for one channel or many (#3779).

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8886 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-02-17 16:43:30 +00:00
parent 469b390e52
commit 97e2aedc2d
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk2_ardour/midi_time_axis.cc
View File

@ -442,6 +442,7 @@ MidiTimeAxisView::build_automation_action_menu ()
automation_items.push_back (MenuElem (_("Controllers"), *controller_menu));
} else {
automation_items.push_back (MenuElem (string_compose ("<i>%1</i>", _("No MIDI Channels selected"))));
dynamic_cast<Label*> (automation_items.back().get_child())->set_use_markup (true);
}
}
@ -664,9 +665,14 @@ MidiTimeAxisView::build_controller_menu ()
if (selected_channels & (0x0001 << chn)) {
Evoral::Parameter fully_qualified_param (MidiCCAutomation, chn, ctl);
ctl_items.push_back (CheckMenuElem (_route->describe_parameter (fully_qualified_param),
sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::toggle_automation_track),
fully_qualified_param)));
ctl_items.push_back (
CheckMenuElem (
string_compose ("<b>%1</b>: %2 [%3]", ctl, midi_name (ctl), int (chn)),
sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::toggle_automation_track),
fully_qualified_param)
)
);
dynamic_cast<Label*> (ctl_items.back().get_child())->set_use_markup (true);
boost::shared_ptr<AutomationTimeAxisView> track = automation_child (fully_qualified_param);
bool visible = false;
@ -998,7 +1004,7 @@ MidiTimeAxisView::set_channel_mode (ChannelMode, uint16_t)
/* TODO: Bender, Pressure */
/* invalidate the controller menu, so that we rebuilt it next time */
/* invalidate the controller menu, so that we rebuild it next time */
_controller_menu_map.clear ();
delete controller_menu;
controller_menu = 0;