From 54b39d7d09cedf9da65aca288005919ceb4029c8 Mon Sep 17 00:00:00 2001 From: philippe44 Date: Wed, 24 Jul 2019 21:53:27 -0700 Subject: [PATCH] remove statushack --- components/squeezelite/main.c | 3 --- components/squeezelite/slimproto.c | 8 -------- 2 files changed, 11 deletions(-) diff --git a/components/squeezelite/main.c b/components/squeezelite/main.c index 164daf9c..de63557d 100644 --- a/components/squeezelite/main.c +++ b/components/squeezelite/main.c @@ -220,9 +220,6 @@ static void usage(const char *argv0) { #endif #if LINKALL " LINKALL" -#endif -#if STATUSHACK - " STATUSHACK" #endif "\n\n", argv0); diff --git a/components/squeezelite/slimproto.c b/components/squeezelite/slimproto.c index 3c86254a..79308ba0 100644 --- a/components/squeezelite/slimproto.c +++ b/components/squeezelite/slimproto.c @@ -158,9 +158,7 @@ static void sendSTAT(const char *event, u32_t server_timestamp) { if (status.current_sample_rate && status.frames_played && status.frames_played > status.device_frames) { ms_played = (u32_t)(((u64_t)(status.frames_played - status.device_frames) * (u64_t)1000) / (u64_t)status.current_sample_rate); -#ifndef STATUSHACK if (now > status.updated) ms_played += (now - status.updated); -#endif LOG_SDEBUG("ms_played: %u (frames_played: %u device_frames: %u)", ms_played, status.frames_played, status.device_frames); } else if (status.frames_played && now > status.stream_start) { ms_played = now - status.stream_start; @@ -330,9 +328,6 @@ static void process_strm(u8_t *pkt, int len) { LOCK_O; output.state = jiffies ? OUTPUT_START_AT : OUTPUT_RUNNING; output.start_at = jiffies; -#ifdef STATUSHACK - status.frames_played = output.frames_played; -#endif UNLOCK_O; LOG_DEBUG("unpause at: %u now: %u", jiffies, gettime_ms()); @@ -698,9 +693,6 @@ static void slimproto_run() { _sendSTMs = true; output.track_started = false; status.stream_start = output.track_start_time; -#ifdef STATUSHACK - status.frames_played = output.frames_played; -#endif } #if PORTAUDIO if (output.pa_reopen) {