From f244972b5a0d9787a6bb3dcb23291357021b79cf Mon Sep 17 00:00:00 2001 From: Mads Kiilerich Date: Mon, 6 Jun 2022 00:45:07 +0200 Subject: [PATCH] temporal: simplify DEBUG_EARLY_SCTS_USE There is no need for scts_set now. "Early" use of SCTS will just give the value 0. DEBUG_EARLY_SCTS_USE can thus just check that _superclock_ticks_per_second doesn't have the initial value of 0. --- libs/temporal/superclock.cc | 3 --- libs/temporal/temporal/superclock.h | 10 ++++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/libs/temporal/superclock.cc b/libs/temporal/superclock.cc index 54b1a38b13..59794fdb99 100644 --- a/libs/temporal/superclock.cc +++ b/libs/temporal/superclock.cc @@ -24,8 +24,6 @@ Temporal::superclock_t Temporal::_superclock_ticks_per_second = 0; int Temporal::most_recent_engine_sample_rate = 48000; /* have to pick something as a default */ -bool Temporal::scts_set = false; - void Temporal::set_sample_rate (int sr) { @@ -36,5 +34,4 @@ void Temporal::set_superclock_ticks_per_second (Temporal::superclock_t sc) { _superclock_ticks_per_second = sc; - scts_set = true; } diff --git a/libs/temporal/temporal/superclock.h b/libs/temporal/temporal/superclock.h index 2e7b0d3694..d4a9e4d9d1 100644 --- a/libs/temporal/temporal/superclock.h +++ b/libs/temporal/temporal/superclock.h @@ -40,11 +40,13 @@ typedef int64_t superclock_t; static superclock_t _superclock_ticks_per_second = 0; #endif -extern bool scts_set; - #ifdef DEBUG_EARLY_SCTS_USE - -static inline superclock_t superclock_ticks_per_second() { if (!scts_set) { raise (SIGUSR2); } return _superclock_ticks_per_second; } +static inline superclock_t superclock_ticks_per_second() { + if (_superclock_ticks_per_second == 0) { + raise (SIGUSR2); + } + return _superclock_ticks_per_second; +} #else static inline superclock_t superclock_ticks_per_second() { return _superclock_ticks_per_second; } #endif