From 47ea6534d0ee1d55392f9866f14b638663a7daee Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sun, 26 Mar 2017 21:42:01 +0200 Subject: Add option to disable blinking alert buttons. --- gtk2_ardour/ardour_ui.cc | 8 ++++++-- gtk2_ardour/monitor_section.cc | 4 ++++ gtk2_ardour/rc_option_editor.cc | 8 ++++++++ gtk2_ardour/ui_config_vars.h | 1 + 4 files changed, 19 insertions(+), 2 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 1cf2d3f79f..67c92c24b0 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -2616,11 +2616,15 @@ void ARDOUR_UI::blink_handler (bool blink_on) { transport_rec_enable_blink (blink_on); - solo_blink (blink_on); sync_blink (blink_on); + + if (!UIConfiguration::instance().get_blink_alert_indicators()) { + blink_on = true; + } + error_blink (blink_on); + solo_blink (blink_on); audition_blink (blink_on); feedback_blink (blink_on); - error_blink (blink_on); } void diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc index ec591a571a..de1d9504c0 100644 --- a/gtk2_ardour/monitor_section.cc +++ b/gtk2_ardour/monitor_section.cc @@ -1178,6 +1178,10 @@ MonitorSection::map_state () void MonitorSection::do_blink (bool onoff) { + if (!UIConfiguration::instance().get_blink_alert_indicators ()) { + onoff = true; + } + solo_blink (onoff); audition_blink (onoff); } diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index 5af921c9c7..d2bcf3ca57 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -3562,6 +3562,14 @@ RCOptionEditor::RCOptionEditor () sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_blink_rec_arm) )); + add_option (_("Appearance"), + new BoolOption ( + "blink-alert-indicators", + _("Blink Alert Indicators"), + sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::get_blink_alert_indicators), + sigc::mem_fun (UIConfiguration::instance(), &UIConfiguration::set_blink_alert_indicators) + )); + #ifndef __APPLE__ /* font scaling does nothing with GDK/Quartz */ diff --git a/gtk2_ardour/ui_config_vars.h b/gtk2_ardour/ui_config_vars.h index af82c18761..74fc57874b 100644 --- a/gtk2_ardour/ui_config_vars.h +++ b/gtk2_ardour/ui_config_vars.h @@ -22,6 +22,7 @@ UI_CONFIG_VARIABLE (std::string, ui_rc_file, "ui-rc-file", "clearlooks.rc") UI_CONFIG_VARIABLE (std::string, color_file, "color-file", "dark") UI_CONFIG_VARIABLE (bool, flat_buttons, "flat-buttons", false) UI_CONFIG_VARIABLE (bool, blink_rec_arm, "blink-rec-arm", false) +UI_CONFIG_VARIABLE (bool, blink_alert_indicators, "blink-alert-indicators", true) UI_CONFIG_VARIABLE (float, waveform_gradient_depth, "waveform-gradient-depth", 0) UI_CONFIG_VARIABLE (float, timeline_item_gradient_depth, "timeline-item-gradient-depth", 0.5) UI_CONFIG_VARIABLE (bool, all_floating_windows_are_dialogs, "all-floating-windows-are-dialogs", false) -- cgit v1.2.3