From e3476e79657b8d418661e75079dfaa1ad299991e Mon Sep 17 00:00:00 2001 From: Gnome! <45660393+GnomedDev@users.noreply.github.com> Date: Fri, 22 Apr 2022 19:57:49 +0100 Subject: [PATCH] Driver: Remove spin_sleep in `Mixer::march_deadline` (#124) * Remove spin_sleep * Remove comment --- Cargo.toml | 5 ----- src/driver/tasks/mixer.rs | 7 +------ 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index ac7a5c3..63a31a1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -77,10 +77,6 @@ features = ["voice", "gateway"] optional = true version = "0.1" -[dependencies.spin_sleep] -optional = true -version = "1" - [dependencies.streamcatcher] optional = true version = "1" @@ -161,7 +157,6 @@ driver-core = [ "parking_lot", "rand", "serenity-voice-model", - "spin_sleep", "streamcatcher", "typemap_rev", "url", diff --git a/src/driver/tasks/mixer.rs b/src/driver/tasks/mixer.rs index 3bca664..b359775 100644 --- a/src/driver/tasks/mixer.rs +++ b/src/driver/tasks/mixer.rs @@ -17,7 +17,6 @@ use discortp::{ }; use flume::{Receiver, Sender, TryRecvError}; use rand::random; -use spin_sleep::SpinSleeper; use std::time::Instant; use tokio::runtime::Handle; use tracing::{debug, error, instrument}; @@ -38,7 +37,6 @@ pub struct Mixer { pub prevent_events: bool, pub silence_frames: u8, pub skip_sleep: bool, - pub sleeper: SpinSleeper, pub soft_clip: SoftClip, pub tracks: Vec, pub ws: Option>, @@ -95,7 +93,6 @@ impl Mixer { prevent_events: false, silence_frames: 0, skip_sleep: false, - sleeper: Default::default(), soft_clip, tracks, ws: None, @@ -402,9 +399,7 @@ impl Mixer { return; } - // FIXME: make choice of spin-sleep/imprecise sleep optional in next breaking. - self.sleeper - .sleep(self.deadline.saturating_duration_since(Instant::now())); + std::thread::sleep(self.deadline.saturating_duration_since(Instant::now())); self.deadline += TIMESTEP_LENGTH; }