diff options
| author | Eskil Queseth <eskilq@kth.se> | 2020-11-16 23:26:11 +0100 |
|---|---|---|
| committer | Eskil Queseth <eskilq@kth.se> | 2020-11-16 23:26:11 +0100 |
| commit | be4d273fa8778ec87ad4a34502d0f3c75657fbbc (patch) | |
| tree | 1e26aa9f64ca3e874c08d5923cb538cd3d0ae851 /mumd/src/audio.rs | |
| parent | 505e850afab903797eba40bdc6c852f09dfa186f (diff) | |
| download | mum-be4d273fa8778ec87ad4a34502d0f3c75657fbbc.tar.gz | |
change sound_effects to sound-effects
Diffstat (limited to 'mumd/src/audio.rs')
| -rw-r--r-- | mumd/src/audio.rs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/mumd/src/audio.rs b/mumd/src/audio.rs index 2e9d1bd..d5617fc 100644 --- a/mumd/src/audio.rs +++ b/mumd/src/audio.rs @@ -1,14 +1,14 @@ pub mod input; pub mod output; -#[cfg(feature = "sound_effects")] +#[cfg(feature = "sound-effects")] use crate::audio::output::SaturatingAdd; use cpal::traits::{DeviceTrait, HostTrait, StreamTrait}; use cpal::{SampleFormat, SampleRate, Stream, StreamConfig}; use log::*; use mumble_protocol::voice::VoicePacketPayload; use opus::Channels; -#[cfg(feature = "sound_effects")] +#[cfg(feature = "sound-effects")] use samplerate::ConverterType; use std::collections::hash_map::Entry; use std::collections::{HashMap, VecDeque}; @@ -16,7 +16,7 @@ use std::sync::{Arc, Mutex}; use tokio::sync::{mpsc, watch}; //TODO? move to mumlib -#[cfg(feature = "sound_effects")] +#[cfg(feature = "sound-effects")] pub const EVENT_SOUNDS: &[(&str, NotificationEvents)] = &[ ("resources/connect.wav", NotificationEvents::ServerConnect), ( @@ -75,10 +75,10 @@ pub struct Audio { client_streams: Arc<Mutex<HashMap<u32, output::ClientStream>>>, - #[cfg(feature = "sound_effects")] + #[cfg(feature = "sound-effects")] sounds: HashMap<NotificationEvents, Vec<f32>>, - #[cfg(feature = "sound_effects")] + #[cfg(feature = "sound-effects")] play_sounds: Arc<Mutex<VecDeque<f32>>>, } @@ -220,7 +220,7 @@ impl Audio { output_stream.play().unwrap(); - #[cfg(feature = "sound_effects")] + #[cfg(feature = "sound-effects")] let sounds = EVENT_SOUNDS .iter() .map(|(path, event)| { @@ -255,11 +255,11 @@ impl Audio { input_volume_sender, input_channel_receiver: Some(input_receiver), client_streams, - #[cfg(feature = "sound_effects")] + #[cfg(feature = "sound-effects")] sounds, output_volume_sender, user_volumes, - #[cfg(feature = "sound_effects")] + #[cfg(feature = "sound-effects")] play_sounds, } } @@ -343,7 +343,7 @@ impl Audio { } } - #[cfg(feature = "sound_effects")] + #[cfg(feature = "sound-effects")] pub fn play_effect(&self, effect: NotificationEvents) { let samples = self.sounds.get(&effect).unwrap(); @@ -357,6 +357,6 @@ impl Audio { play_sounds.extend(samples.iter().skip(l)); } - #[cfg(not(feature = "sound_effects"))] + #[cfg(not(feature = "sound-effects"))] pub fn play_effect(&self, _: NotificationEvents) {} } |
