ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

manually apply d697a31abf from master (git could not apply cleanly)

This commit is contained in:
Paul Davis 2014-02-19 23:44:53 -05:00
parent 14b2d0b549
commit 49d9397770
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/mixer_strip.cc
View File

@ -2155,8 +2155,8 @@ MixerStrip::popup_level_meter_menu (GdkEventButton* ev)
_suspend_menu_callbacks = true;
add_level_meter_item_point (items, group, _("Input"), MeterInput);
add_level_meter_item_point (items, group, _("Pre-fader"), MeterPreFader);
add_level_meter_item_point (items, group, _("Post-fader"), MeterPostFader);
add_level_meter_item_point (items, group, _("Pre Fader"), MeterPreFader);
add_level_meter_item_point (items, group, _("Post Fader"), MeterPostFader);
add_level_meter_item_point (items, group, _("Output"), MeterOutput);
add_level_meter_item_point (items, group, _("Custom"), MeterCustom);

4
gtk2_ardour/route_ui.cc
View File

@ -1237,13 +1237,13 @@ RouteUI::build_mute_menu(void)
MenuList& items = mute_menu->items();
pre_fader_mute_check = manage (new Gtk::CheckMenuItem(_("Pre Fader")));
pre_fader_mute_check = manage (new Gtk::CheckMenuItem(_("Pre Fader Sends")));
init_mute_menu(MuteMaster::PreFader, pre_fader_mute_check);
pre_fader_mute_check->signal_toggled().connect(sigc::bind (sigc::mem_fun (*this, &RouteUI::toggle_mute_menu), MuteMaster::PreFader, pre_fader_mute_check));
items.push_back (CheckMenuElem(*pre_fader_mute_check));
pre_fader_mute_check->show_all();
post_fader_mute_check = manage (new Gtk::CheckMenuItem(_("Post Fader")));
post_fader_mute_check = manage (new Gtk::CheckMenuItem(_("Post Fader Sends")));
init_mute_menu(MuteMaster::PostFader, post_fader_mute_check);
post_fader_mute_check->signal_toggled().connect(sigc::bind (sigc::mem_fun (*this, &RouteUI::toggle_mute_menu), MuteMaster::PostFader, post_fader_mute_check));
items.push_back (CheckMenuElem(*post_fader_mute_check));