diff --git a/examples/serenity/voice_storage/src/main.rs b/examples/serenity/voice_storage/src/main.rs index 8973c0d..cbebb49 100644 --- a/examples/serenity/voice_storage/src/main.rs +++ b/examples/serenity/voice_storage/src/main.rs @@ -27,12 +27,12 @@ use serenity::{ }; use songbird::{ + driver::Bitrate, input::{ self, cached::{Compressed, Memory}, Input, }, - Bitrate, Call, Event, EventContext, diff --git a/src/driver/mod.rs b/src/driver/mod.rs index e2d988d..a732a5b 100644 --- a/src/driver/mod.rs +++ b/src/driver/mod.rs @@ -32,7 +32,8 @@ use crate::{ Event, EventHandler, }; -use audiopus::Bitrate; +/// Opus encoder bitrate settings. +pub use audiopus::{self as opus, Bitrate}; use core::{ future::Future, pin::Pin, diff --git a/src/driver/tasks/message/core.rs b/src/driver/tasks/message/core.rs index 76bf4de..b8b761e 100644 --- a/src/driver/tasks/message/core.rs +++ b/src/driver/tasks/message/core.rs @@ -1,10 +1,9 @@ #![allow(missing_docs)] use crate::{ - driver::{connection::error::Error, Config}, + driver::{connection::error::Error, Bitrate, Config}, events::EventData, tracks::Track, - Bitrate, ConnectionInfo, }; use flume::Sender; diff --git a/src/driver/tasks/message/mixer.rs b/src/driver/tasks/message/mixer.rs index 3c9b0a1..220c26d 100644 --- a/src/driver/tasks/message/mixer.rs +++ b/src/driver/tasks/message/mixer.rs @@ -3,9 +3,8 @@ use super::{Interconnect, UdpRxMessage, UdpTxMessage, WsMessage}; use crate::{ - driver::{Config, CryptoState}, + driver::{Bitrate, Config, CryptoState}, tracks::Track, - Bitrate, }; use flume::Sender; use xsalsa20poly1305::XSalsa20Poly1305 as Cipher; diff --git a/src/lib.rs b/src/lib.rs index 44a7cbc..18bebaf 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -63,9 +63,6 @@ pub mod tracks; #[cfg(feature = "driver-core")] mod ws; -#[cfg(feature = "driver-core")] -/// Opus encoder bitrate settings. -pub use audiopus::{self as opus, Bitrate}; #[cfg(feature = "driver-core")] pub use discortp as packet; #[cfg(feature = "driver-core")]