From d4e4c927008274d84eac1fc895199b59bd298668 Mon Sep 17 00:00:00 2001 From: Hailey Somerville Date: Tue, 26 Dec 2023 11:36:52 +1100 Subject: [PATCH] move resampler ffi into core mod --- bark-core/src/receive/mod.rs | 1 + {bark/src => bark-core/src/receive}/resample.rs | 0 bark/src/main.rs | 1 - bark/src/receive.rs | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename {bark/src => bark-core/src/receive}/resample.rs (100%) diff --git a/bark-core/src/receive/mod.rs b/bark-core/src/receive/mod.rs index e8ae652..3556e31 100644 --- a/bark-core/src/receive/mod.rs +++ b/bark-core/src/receive/mod.rs @@ -1 +1,2 @@ pub mod queue; +pub mod resample; diff --git a/bark/src/resample.rs b/bark-core/src/receive/resample.rs similarity index 100% rename from bark/src/resample.rs rename to bark-core/src/receive/resample.rs diff --git a/bark/src/main.rs b/bark/src/main.rs index 49e5056..a1fa95e 100644 --- a/bark/src/main.rs +++ b/bark/src/main.rs @@ -1,7 +1,6 @@ mod audio; mod config; mod receive; -mod resample; mod socket; mod stats; mod stream; diff --git a/bark/src/receive.rs b/bark/src/receive.rs index a96e270..747f2d3 100644 --- a/bark/src/receive.rs +++ b/bark/src/receive.rs @@ -3,6 +3,7 @@ use std::sync::{Arc, Mutex}; use std::time::Duration; use bark_core::receive::queue::PacketQueue; +use bark_core::receive::resample::Resampler; use bytemuck::Zeroable; use structopt::StructOpt; @@ -14,7 +15,6 @@ use bark_protocol::packet::{Audio, Time, PacketKind, StatsReply}; use crate::audio::config::{DEFAULT_PERIOD, DEFAULT_BUFFER}; use crate::audio::output::{Output, OutputOpt}; -use crate::resample::Resampler; use crate::socket::{ProtocolSocket, Socket, SocketOpt}; use crate::{time, stats}; use crate::RunError;