From 3e0db1f3c44da6c33677310cbc6cb813ef3530f8 Mon Sep 17 00:00:00 2001 From: David Trattnig <david@subsquare.at> Date: Thu, 18 Aug 2022 14:13:24 +0200 Subject: [PATCH] refact: ditch some sleeping states #65 --- src/aura_engine/core/channels.py | 13 ++++--------- src/aura_engine/core/mixer.py | 1 - 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/aura_engine/core/channels.py b/src/aura_engine/core/channels.py index ac8cda5c..061f909a 100644 --- a/src/aura_engine/core/channels.py +++ b/src/aura_engine/core/channels.py @@ -437,19 +437,14 @@ class StreamChannel(GenericChannel): (bool): True if track loaded successfully """ - self.stop() - self.set_url(uri) - # TODO Review if still valid: Liquidsoap ignores commands sent without a certain timeout - time.sleep(2) - self.start() - - # TODO Review if that's still required: - time.sleep(1) + self.logger.debug(SU.pink(f"Loading stream '{uri}'")) retry_delay = self.config.get("input_stream_retry_delay") max_retries = self.config.get("input_stream_max_retries") retries = 0 - self.logger.debug(SU.pink(f"Loading stream '{uri}'")) + self.stop() + self.set_url(uri) + self.start() while not self.is_ready(uri): if retries >= max_retries: diff --git a/src/aura_engine/core/mixer.py b/src/aura_engine/core/mixer.py index d22e4fa6..a32cce74 100644 --- a/src/aura_engine/core/mixer.py +++ b/src/aura_engine/core/mixer.py @@ -70,7 +70,6 @@ class Mixer: self.channel_names = [] self.channels = {} - time.sleep(1) # TODO Check if this is still required self.refresh_channels() # TODO Graceful reboot: At some point the current track playing could -- GitLab