github-mirrors/librespot
1
0
Fork 0
mirror of https://github.com/librespot-org/librespot.git synced 2024-11-08 16:45:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Tidied up Syntax

Browse source
This commit is contained in:
Sasha Hilton 2018-01-31 00:05:54 +01:00
parent 618eceb740
commit fddcbbcd82
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main.rs
View file

@ -133,17 +133,18 @@ fn setup(args: &[String]) -> Setup {
let mixer = mixer::find(mixer_name.as_ref())
.expect("Invalid mixer");
let initial_volume;
let initial_volume: i32;
if matches.opt_present("initial-volume") && matches.opt_str("initial-volume").unwrap().parse::<i32>().is_ok() {
let iv = matches.opt_str("initial-volume").unwrap().parse::<i32>().unwrap();
if 0 <= iv && iv <= 100 {
initial_volume = iv * 0xFFFF as i32 / 100 ;
} else {
debug!("Volume needs to be a value from 0-100; set as 50%");
initial_volume = 0x8000 as i32;
match iv {
iv if iv >= 0 && iv <= 100 => { initial_volume = iv * 0xFFFF / 100 }
_ => {
debug!("Volume needs to be a value from 0-100; set volume level to 50%");
initial_volume = 0x8000;
}
}
} else {
initial_volume = 0x8000 as i32;
initial_volume = 0x8000;
}
let name = matches.opt_str("name").unwrap();