From ba0f9f209df1b92115c7c2ba5e290416447dd721 Mon Sep 17 00:00:00 2001 From: Marcus Weseloh Date: Sun, 2 Jun 2024 12:21:38 +0200 Subject: [PATCH] Cleanup Jack time adjust code Remove unnecessary member var and rename variables for more clarity. --- server/streamreader/jack_stream.cpp | 6 +++--- server/streamreader/jack_stream.hpp | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/server/streamreader/jack_stream.cpp b/server/streamreader/jack_stream.cpp index ba6853db..ab2a19f7 100644 --- a/server/streamreader/jack_stream.cpp +++ b/server/streamreader/jack_stream.cpp @@ -238,9 +238,9 @@ bool JackStream::openJackConnection() cpt::to_string(jack_sample_rate) + "."); } - jack_time_t connect_time = jack_get_time(); - jackConnectTime_ = std::chrono::steady_clock::now(); - jackTimeAdjust_ = chrono::duration_cast(jackConnectTime_.time_since_epoch()).count() - connect_time; + jack_time_t jackTime = jack_get_time(); + auto now = std::chrono::steady_clock::now(); + jackTimeAdjust_ = chrono::duration_cast(now.time_since_epoch()).count() - jackTime; LOG(DEBUG, LOG_TAG) << name_ << ": Jack server time adjustment is " << jackTimeAdjust_ << "\n"; diff --git a/server/streamreader/jack_stream.hpp b/server/streamreader/jack_stream.hpp index c6f123f9..5e54b9a3 100644 --- a/server/streamreader/jack_stream.hpp +++ b/server/streamreader/jack_stream.hpp @@ -66,7 +66,6 @@ protected: jack_client_t* client_; std::vector ports_; jack_nframes_t jackConnectFrames_; - std::chrono::time_point jackConnectTime_; jack_time_t jackTimeAdjust_; SampleFormat jackSampleFormat_;