aboutsummaryrefslogtreecommitdiff
path: root/src/voice/mod.rs
diff options
context:
space:
mode:
authorMaiddog <[email protected]>2017-08-26 17:55:43 -0500
committeralex <[email protected]>2017-08-27 00:55:43 +0200
commit3e0b1032d80a1847558a752e8316d97f9ae58f04 (patch)
treeca65390091cb3c0ab98b6497a1447ba69df3d20d /src/voice/mod.rs
parentUse `$crate` for `Args` (diff)
downloadserenity-3e0b1032d80a1847558a752e8316d97f9ae58f04.tar.xz
serenity-3e0b1032d80a1847558a752e8316d97f9ae58f04.zip
Add ability to play DCA and Opus files. (#148)
Diffstat (limited to 'src/voice/mod.rs')
-rw-r--r--src/voice/mod.rs11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/voice/mod.rs b/src/voice/mod.rs
index a94c8a0..6af5926 100644
--- a/src/voice/mod.rs
+++ b/src/voice/mod.rs
@@ -3,6 +3,7 @@
mod audio;
mod connection;
mod connection_info;
+mod dca;
mod error;
mod manager;
mod handler;
@@ -10,11 +11,12 @@ mod payload;
mod streamer;
mod threading;
-pub use self::audio::{AudioReceiver, AudioSource};
-pub use self::error::VoiceError;
+pub use self::audio::{AudioReceiver, AudioSource, AudioType};
+pub use self::dca::DcaMetadata;
+pub use self::error::{DcaError, VoiceError};
pub use self::handler::Handler;
pub use self::manager::Manager;
-pub use self::streamer::{ffmpeg, pcm, ytdl};
+pub use self::streamer::{dca, ffmpeg, opus, pcm, ytdl};
use self::connection_info::ConnectionInfo;
@@ -22,7 +24,8 @@ const CRYPTO_MODE: &'static str = "xsalsa20_poly1305";
pub(crate) enum Status {
Connect(ConnectionInfo),
- #[allow(dead_code)] Disconnect,
+ #[allow(dead_code)]
+ Disconnect,
SetReceiver(Option<Box<AudioReceiver>>),
SetSender(Option<Box<AudioSource>>),
}