hut/outfly
hut/outfly
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

simplified noise cancellation, add "Amplify outside recordings" to radio

Browse source
This commit is contained in:
yuni 2024-09-14 23:43:21 +02:00
parent 5c477286f5
commit 8309e32f85
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/var.rs
View file

@ -174,15 +174,14 @@ impl Default for Settings {
noise_cancellation_mode: 0, noise_cancellation_mode: 0,
noise_cancellation_modes: vec![ noise_cancellation_modes: vec![
"Off".to_string(), "Off".to_string(),
"Ambience".to_string(), "On".to_string(),
"Mechanical".to_string(),
"Max".to_string(),
], ],
radio_mode: 1, radio_mode: 1,
radio_modes: vec![ radio_modes: vec![
// see also: settings.is_radio_playing() // see also: settings.is_radio_playing()
"Off".to_string(), "Off".to_string(),
"Cinematic Frequency".to_string(), "Cinematic Frequency".to_string(),
"Amplify outside recordings".to_string(),
], ],
volume_sfx: 100, volume_sfx: 100,
volume_music: 100, volume_music: 100,
@ -336,10 +335,9 @@ impl Settings {
pub fn is_radio_playing(&self, sfx: audio::Sfx) -> Option<bool> { pub fn is_radio_playing(&self, sfx: audio::Sfx) -> Option<bool> {
let radio = self.radio_mode; let radio = self.radio_mode;
let ambience = self.noise_cancellation_mode != 1 && self.noise_cancellation_mode != 3;
match sfx { match sfx {
audio::Sfx::BGM => Some(radio == 1), audio::Sfx::BGM => Some(radio == 1),
audio::Sfx::BGMActualJupiterRecording => Some(radio == 0 && ambience), audio::Sfx::BGMActualJupiterRecording => Some(radio == 2),
_ => None, _ => None,
} }
} }
@ -352,7 +350,7 @@ impl Settings {
value value
}; };
self.noise_cancellation_mode = value; self.noise_cancellation_mode = value;
self.mute_sfx = value >= 2; self.mute_sfx = value >= 1;
} }
} }