aboutsummaryrefslogtreecommitdiffstats
path: root/mumd/src/audio.rs
diff options
context:
space:
mode:
authorEskil Queseth <eskilq@kth.se>2021-02-03 01:26:02 +0100
committerEskil Queseth <eskilq@kth.se>2021-02-03 01:26:02 +0100
commiteb96b559680e42173c0571b65fcb7fb63afbab62 (patch)
tree59ed522612fbd16a2aa6541e9cd785f78d691925 /mumd/src/audio.rs
parent154a2930b3bbe5ede06648c3a10b8fa4904277f4 (diff)
downloadmum-eb96b559680e42173c0571b65fcb7fb63afbab62.tar.gz
clean up depending on futures
Diffstat (limited to 'mumd/src/audio.rs')
-rw-r--r--mumd/src/audio.rs18
1 files changed, 3 insertions, 15 deletions
diff --git a/mumd/src/audio.rs b/mumd/src/audio.rs
index 598dde6..4fc7965 100644
--- a/mumd/src/audio.rs
+++ b/mumd/src/audio.rs
@@ -10,25 +10,13 @@ use dasp_frame::Frame;
use dasp_interpolate::linear::Linear;
use dasp_sample::{SignedSample, ToSample, Sample};
use dasp_signal::{self as signal, Signal};
-use futures::Stream;
-use futures::stream::StreamExt;
-use futures::task::{Context, Poll};
+use futures_util::{StreamExt, stream::Stream};
use log::*;
use mumble_protocol::Serverbound;
use mumble_protocol::voice::{VoicePacketPayload, VoicePacket};
use mumlib::config::SoundEffect;
use opus::Channels;
-use std::{
- borrow::Cow,
- collections::{hash_map::Entry, HashMap, VecDeque},
- convert::TryFrom,
- fmt::Debug,
- fs::File,
- future::Future,
- io::Read,
- pin::Pin,
- sync::{Arc, Mutex},
-};
+use std::{borrow::Cow, collections::{hash_map::Entry, HashMap, VecDeque}, convert::TryFrom, fmt::Debug, fs::File, future::Future, io::Read, pin::Pin, sync::{Arc, Mutex}, task::{Context, Poll}};
use strum::IntoEnumIterator;
use strum_macros::EnumIter;
use tokio::sync::watch;
@@ -171,7 +159,7 @@ impl Audio {
}
.unwrap();
- let (sample_sender, sample_receiver) = futures::channel::mpsc::channel(1_000_000);
+ let (sample_sender, sample_receiver) = futures_channel::mpsc::channel(1_000_000);
let (input_volume_sender, input_volume_receiver) = watch::channel::<f32>(input_volume);