From: Robin Gareus Date: Sat, 3 Aug 2013 11:59:22 +0000 (+0200) Subject: add a peak reset button to the editor meter X-Git-Tag: 1.0.0~1111 X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=d17c3207b89b7abe676c76d9225f3d2e115fdd44;p=ardour.git add a peak reset button to the editor meter see http://tracker.ardour.org/view.php?id=5601 --- diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 33ac0ed39e..0cf1eca67e 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -182,6 +182,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir) , feedback_alert_button (_("feedback")) , editor_meter(0) + , editor_meter_peak_display() , speaker_config_window (X_("speaker-config"), _("Speaker Configuration")) , theme_manager (X_("theme-manager"), _("Theme Manager")) @@ -1039,7 +1040,13 @@ ARDOUR_UI::every_point_zero_something_seconds () SuperRapidScreenUpdate(); /* EMIT_SIGNAL */ if (editor_meter) { - editor_meter->update_meters(); + float mpeak = editor_meter->update_meters(); + if (mpeak > editor_meter_max_peak) { + if (mpeak >= Config->get_meter_peak()) { + editor_meter_peak_display.set_name ("meterbridge peakindicator on"); + editor_meter_peak_display.set_elements((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body)); + } + } } return TRUE; } @@ -4129,6 +4136,9 @@ ARDOUR_UI::reset_peak_display () { if (!_session || !_session->master_out() || !editor_meter) return; editor_meter->clear_meters(); + editor_meter_max_peak = -INFINITY; + editor_meter_peak_display.set_name ("meterbridge peakindicator"); + editor_meter_peak_display.set_elements((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body)); } void diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index 0d0e8638d9..551e115efa 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -450,6 +450,9 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr Gtk::VBox alert_box; Gtk::VBox meter_box; LevelMeterHBox * editor_meter; + float editor_meter_max_peak; + ArdourButton editor_meter_peak_display; + bool editor_meter_peak_button_release (GdkEventButton*); void solo_blink (bool); void sync_blink (bool); diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index d9ff245b67..e9ad631032 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -144,6 +144,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 Level Meter")); synchronize_sync_source_and_video_pullup (); @@ -418,6 +419,7 @@ ARDOUR_UI::setup_transport () } transport_tearoff_hbox.pack_start (alert_box, false, false); transport_tearoff_hbox.pack_start (meter_box, false, false); + transport_tearoff_hbox.pack_start (editor_meter_peak_display, false, false); if (Profile->get_sae()) { Image* img = manage (new Image ((::get_icon (X_("sae"))))); diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc index 96d5de60de..1f258ca1c8 100644 --- a/gtk2_ardour/ardour_ui_dialogs.cc +++ b/gtk2_ardour/ardour_ui_dialogs.cc @@ -53,6 +53,8 @@ #include "theme_manager.h" #include "time_info_box.h" +#include + #include "i18n.h" using namespace ARDOUR; @@ -192,6 +194,7 @@ ARDOUR_UI::set_session (Session *s) meter_box.remove(*editor_meter); delete editor_meter; editor_meter = 0; + editor_meter_peak_display.hide(); } if (_session && _session->master_out()) { @@ -205,6 +208,16 @@ ARDOUR_UI::set_session (Session *s) ArdourMeter::ResetAllPeakDisplays.connect (sigc::mem_fun(*this, &ARDOUR_UI::reset_peak_display)); ArdourMeter::ResetRoutePeakDisplays.connect (sigc::mem_fun(*this, &ARDOUR_UI::reset_route_peak_display)); ArdourMeter::ResetGroupPeakDisplays.connect (sigc::mem_fun(*this, &ARDOUR_UI::reset_group_peak_display)); + + editor_meter_peak_display.set_name ("meterbridge peakindicator"); + editor_meter_peak_display.set_elements((ArdourButton::Element) (ArdourButton::Edge|ArdourButton::Body)); + editor_meter_peak_display.unset_flags (Gtk::CAN_FOCUS); + editor_meter_peak_display.set_size_request(6, -1); + editor_meter_peak_display.set_corner_radius(2); + editor_meter_peak_display.show(); + + editor_meter_max_peak = -INFINITY; + editor_meter_peak_display.signal_button_release_event().connect (sigc::mem_fun(*this, &ARDOUR_UI::editor_meter_peak_button_release), false); } } @@ -250,6 +263,7 @@ ARDOUR_UI::unload_session (bool hide_stuff) meter_box.remove(*editor_meter); delete editor_meter; editor_meter = 0; + editor_meter_peak_display.hide(); } ActionManager::set_sensitive (ActionManager::session_sensitive_actions, false); @@ -524,3 +538,18 @@ ARDOUR_UI::main_window_state_event_handler (GdkEventWindowState* ev, bool window return false; } + +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)) { + 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 true; +}