diff options
Diffstat (limited to 'src/audio')
| -rw-r--r-- | src/audio/mod.rs | 28 | ||||
| -rw-r--r-- | src/audio/play_queue.rs | 4 |
2 files changed, 16 insertions, 16 deletions
diff --git a/src/audio/mod.rs b/src/audio/mod.rs index 3c3041f..9affdb1 100644 --- a/src/audio/mod.rs +++ b/src/audio/mod.rs @@ -3,24 +3,20 @@ use std::sync::Arc; use chrono::Duration; use either::Either; use serenity::{ - client::bridge::voice::ClientVoiceManager, - model::{ - id::{ - ChannelId, - }, - }, + model::id::ChannelId, prelude::*, - voice::LockedAudio, }; use typemap::Key; -pub use self::play_queue::PlayQueue; -pub use self::timeutil::parse_times; -pub use self::ytdl::*; +pub use self::{ + play_queue::PlayQueue, + timeutil::parse_times, + ytdl::*, +}; +mod play_queue; mod timeutil; mod ytdl; -mod play_queue; pub struct VoiceManager; @@ -37,15 +33,15 @@ impl VoiceManager { #[derive(Clone, Debug)] pub struct PlayArgs { - pub data: Either<String, Vec<u8>>, - pub initiator: String, + pub data: Either<String, Vec<u8>>, + pub initiator: String, pub sender_channel: ChannelId, - pub start: Option<Duration>, - pub end: Option<Duration>, + pub start: Option<Duration>, + pub end: Option<Duration>, } #[derive(Clone)] pub struct CurrentItem { pub init_args: PlayArgs, - pub audio: LockedAudio, + pub audio: LockedAudio, } diff --git a/src/audio/play_queue.rs b/src/audio/play_queue.rs index ff1c2c9..34fc113 100644 --- a/src/audio/play_queue.rs +++ b/src/audio/play_queue.rs @@ -54,6 +54,10 @@ impl Key for PlayQueue { type Value = Arc<RwLock<PlayQueue>>; } +impl serenity::prelude::TypeMapKey for PlayQueue { + type Value = Arc<RwLock<PlayQueue>>; +} + impl PlayQueue { pub fn new() -> Self { PlayQueue { |
