From 3a2e6e174bb44f85607d133f5088f6ab8d62d163 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 1 Dec 2020 22:31:07 -0700 Subject: [PATCH] change default value of UIConfig's clock display limit, and prevent old config files from overriding the limit 720 hours was too long to be expressed via superclock in 62 bits. Use 99:59:59 instead. --- gtk2_ardour/ardour_ui_options.cc | 10 ++++++++++ gtk2_ardour/ui_config_vars.h | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc index d0e004f035..64b573449e 100644 --- a/gtk2_ardour/ardour_ui_options.cc +++ b/gtk2_ardour/ardour_ui_options.cc @@ -494,6 +494,16 @@ ARDOUR_UI::parameter_changed (std::string p) inhibit_screensaver (false); break; } + } else if (p == "clock-display-limit") { + /* limit upper value to 99:59:59 (HH:MM:SS) */ + using namespace Temporal; + const samplecnt_t limit = (99*60*60) + (59*60) + (59); /* seconds */ + + std::cerr <<"\n\n\n CDL changed to " << UIConfiguration::instance().get_clock_display_limit() << " vs. " << limit << " \n\n"; + + if (UIConfiguration::instance().get_clock_display_limit() > limit) { + UIConfiguration::instance().set_clock_display_limit (limit); + } } } diff --git a/gtk2_ardour/ui_config_vars.h b/gtk2_ardour/ui_config_vars.h index 846f4f4e80..dd383e4fc6 100644 --- a/gtk2_ardour/ui_config_vars.h +++ b/gtk2_ardour/ui_config_vars.h @@ -76,7 +76,7 @@ UI_CONFIG_VARIABLE (bool, show_region_cue_markers, "show-region-cue-markers", tr UI_CONFIG_VARIABLE (bool, show_name_highlight, "show-name-highlight", false) UI_CONFIG_VARIABLE (ARDOUR::ClockDeltaMode, primary_clock_delta_mode, "primary-clock-delta-mode", NoDelta) UI_CONFIG_VARIABLE (ARDOUR::ClockDeltaMode, secondary_clock_delta_mode, "secondary-clock-delta-mode", NoDelta) -UI_CONFIG_VARIABLE (uint64_t, clock_display_limit, "clock-display-limit", 2592000) /* seconds; default 30days (720h), 0 = unlimited */ +UI_CONFIG_VARIABLE (ARDOUR::samplecnt_t, clock_display_limit, "clock-display-limit", 8553600) /* seconds; default 99h, 0 = unlimited */ UI_CONFIG_VARIABLE (bool, show_track_meters, "show-track-meters", true) UI_CONFIG_VARIABLE (bool, follow_edits, "follow-edits", false) UI_CONFIG_VARIABLE (bool, super_rapid_clock_update, "super-rapid-clock-update", false)