From 9aff22a9d2245fe86c9c19ee5dda44b91a1e14e4 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 4 Jun 2019 14:56:50 +0200 Subject: Tweak toolbar meter reset button to unconditionally apply to all DPM --- gtk2_ardour/ardour_ui2.cc | 2 +- gtk2_ardour/ardour_ui_dialogs.cc | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index b7cee9a82f..35ba234cfa 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -83,7 +83,7 @@ ARDOUR_UI::setup_tooltips () set_tip (feedback_alert_button, _("When active, there is a feedback loop.")); set_tip (primary_clock, _("Primary Clock right-click to set display mode. Click to edit, click+drag a digit or mouse-over+scroll wheel to modify.\nText edits: right-to-left overwrite Esc: cancel; Enter: confirm; postfix the edit with '+' or '-' to enter delta times.\n")); set_tip (secondary_clock, _("Secondary Clock right-click to set display mode. Click to edit, click+drag a digit or mouse-over+scroll wheel to modify.\nText edits: right-to-left overwrite Esc: cancel; Enter: confirm; postfix the edit with '+' or '-' to enter delta times.\n")); - set_tip (editor_meter_peak_display, _("Reset All Peak Indicators")); + set_tip (editor_meter_peak_display, _("Reset All Peak Meters")); set_tip (error_alert_button, _("Show Error Log and acknowledge warnings")); synchronize_sync_source_and_video_pullup (); diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc index eac41309c8..00f2d6f524 100644 --- a/gtk2_ardour/ardour_ui_dialogs.cc +++ b/gtk2_ardour/ardour_ui_dialogs.cc @@ -926,14 +926,8 @@ ARDOUR_UI::tabbed_window_state_event_handler (GdkEventWindowState* ev, void* obj bool ARDOUR_UI::editor_meter_peak_button_release (GdkEventButton* ev) { - if (ev->button == 1 && Gtkmm2ext::Keyboard::modifier_state_equals (ev->state, Gtkmm2ext::Keyboard::PrimaryModifier|Gtkmm2ext::Keyboard::TertiaryModifier)) { + if (ev->button == 1) { ArdourMeter::ResetAllPeakDisplays (); - } else if (ev->button == 1 && Gtkmm2ext::Keyboard::modifier_state_equals (ev->state, Gtkmm2ext::Keyboard::PrimaryModifier)) { - if (_session->master_out()) { - ArdourMeter::ResetGroupPeakDisplays (_session->master_out()->route_group()); - } - } else if (_session->master_out()) { - ArdourMeter::ResetRoutePeakDisplays (_session->master_out().get()); } return false; } -- cgit v1.2.3