From fe880d9b571f7f4b2030c65e457e9a7136b971f1 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 31 Oct 2019 23:57:46 +0100 Subject: [PATCH] Consolidate more automation-mode texts --- gtk2_ardour/generic_pluginui.cc | 10 +++++----- gtk2_ardour/panner_ui.cc | 25 ++++++++++--------------- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc index e18cdfd889..bff75800e0 100644 --- a/gtk2_ardour/generic_pluginui.cc +++ b/gtk2_ardour/generic_pluginui.cc @@ -122,15 +122,15 @@ GenericPluginUI::GenericPluginUI (boost::shared_ptr pi, bool scrol } smaller_hbox->pack_start (bypass_button, false, true, 4); - automation_manual_all_button.set_text(_("Manual")); + automation_manual_all_button.set_text (GainMeterBase::astate_string (ARDOUR::Off)); automation_manual_all_button.set_name (X_("generic button")); - automation_play_all_button.set_text(_("Play")); + automation_play_all_button.set_text (GainMeterBase::astate_string (ARDOUR::Play)); automation_play_all_button.set_name (X_("generic button")); - automation_write_all_button.set_text(_("Write")); + automation_write_all_button.set_text (GainMeterBase::astate_string (ARDOUR::Write)); automation_write_all_button.set_name (X_("generic button")); - automation_touch_all_button.set_text(_("Touch")); + automation_touch_all_button.set_text (GainMeterBase::astate_string (ARDOUR::Touch)); automation_touch_all_button.set_name (X_("generic button")); - automation_latch_all_button.set_text(_("Touch")); + automation_latch_all_button.set_text (GainMeterBase::astate_string (ARDOUR::Latch)); automation_latch_all_button.set_name (X_("generic button")); constraint_hbox->set_spacing (5); diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc index 7b434a448c..a1dcb5264b 100644 --- a/gtk2_ardour/panner_ui.cc +++ b/gtk2_ardour/panner_ui.cc @@ -151,21 +151,16 @@ PannerUI::build_astate_menu () /** TRANSLATORS: this is `Manual' in the sense of automation not being played, so that changes to pan must be done by hand. */ - pan_astate_menu->items().push_back (MenuElem (S_("Automation|Manual"), sigc::bind ( - sigc::mem_fun (_panner.get(), &Panner::set_automation_state), - (AutoState) ARDOUR::Off))); - pan_astate_menu->items().push_back (MenuElem (_("Play"), sigc::bind ( - sigc::mem_fun (_panner.get(), &Panner::set_automation_state), - (AutoState) Play))); - pan_astate_menu->items().push_back (MenuElem (_("Write"), sigc::bind ( - sigc::mem_fun (_panner.get(), &Panner::set_automation_state), - (AutoState) Write))); - pan_astate_menu->items().push_back (MenuElem (_("Touch"), sigc::bind ( - sigc::mem_fun (_panner.get(), &Panner::set_automation_state), - (AutoState) Touch))); - pan_astate_menu->items().push_back (MenuElem (_("Latch"), sigc::bind ( - sigc::mem_fun (_panner.get(), &Panner::set_automation_state), - (AutoState) Latch))); + pan_astate_menu->items().push_back (MenuElem (GainMeterBase::astate_string (ARDOUR::Off), + sigc::bind ( sigc::mem_fun (_panner.get(), &Panner::set_automation_state), (AutoState) ARDOUR::Off))); + pan_astate_menu->items().push_back (MenuElem (GainMeterBase::astate_string (ARDOUR::Play), + sigc::bind ( sigc::mem_fun (_panner.get(), &Panner::set_automation_state), (AutoState) Play))); + pan_astate_menu->items().push_back (MenuElem (GainMeterBase::astate_string (ARDOUR::Write), + sigc::bind ( sigc::mem_fun (_panner.get(), &Panner::set_automation_state), (AutoState) Write))); + pan_astate_menu->items().push_back (MenuElem (GainMeterBase::astate_string (ARDOUR::Touch), + sigc::bind (sigc::mem_fun (_panner.get(), &Panner::set_automation_state), (AutoState) Touch))); + pan_astate_menu->items().push_back (MenuElem (GainMeterBase::astate_string (ARDOUR::Latch), + sigc::bind ( sigc::mem_fun (_panner.get(), &Panner::set_automation_state), (AutoState) Latch))); }