Tweak toolbar meter reset button to unconditionally apply to all DPM

diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index b7cee9a82f2d506853984478cec9ba11b774e1f4..35ba234cfa69aa8014b16a03c5ac42a01b0efbb7 100644 (file)
--- 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, _("<b>Primary Clock</b> 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 <tt>Esc</tt>: cancel; <tt>Enter</tt>: confirm; postfix the edit with '+' or '-' to enter delta times.\n"));
        set_tip (secondary_clock, _("<b>Secondary Clock</b> 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 <tt>Esc</tt>: cancel; <tt>Enter</tt>: 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 eac41309c89a87c8697d80286e39f83fddac2572..00f2d6f5244defeab9e0faf8fd595d60a946e292 100644 (file)
--- 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;
 }