diff options
| author | Robin Gareus <robin@gareus.org> | 2019-06-04 14:56:50 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2019-06-04 14:56:50 +0200 |
| commit | 9aff22a9d2245fe86c9c19ee5dda44b91a1e14e4 (patch) | |
| tree | b144c1911704e1dedb08448fba6d91d0b38c7245 /gtk2_ardour | |
| parent | 3e4f2d0f7aa2f7c48c407cfe335ed417edd99efa (diff) | |
Tweak toolbar meter reset button to unconditionally apply to all DPM
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/ardour_ui2.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui_dialogs.cc | 8 |
2 files changed, 2 insertions, 8 deletions
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, _("<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 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; } |