github-mirrors/librespot
1
0
Fork 0
mirror of https://github.com/librespot-org/librespot.git synced 2024-12-18 17:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #110 from librespot-org/inital-volume-ifelse-cleanup

Browse source 
Initial volume ifelse cleanup
This commit is contained in:
Colm 2018-01-30 23:38:36 +00:00 committed by GitHub
commit 8be642de31
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/main.rs
View file

@ -134,33 +134,20 @@ fn setup(args: &[String]) -> Setup {
let mixer_name = matches.opt_str("mixer"); let mixer_name = matches.opt_str("mixer");
let mixer = mixer::find(mixer_name.as_ref()) let mixer = mixer::find(mixer_name.as_ref())
.expect("Invalid mixer"); .expect("Invalid mixer");
let initial_volume;
// check if initial-volume argument is present let initial_volume: i32;
if matches.opt_present("initial-volume"){ if matches.opt_present("initial-volume") && matches.opt_str("initial-volume").unwrap().parse::<i32>().is_ok() {
// check if value is a number let iv = matches.opt_str("initial-volume").unwrap().parse::<i32>().unwrap();
if matches.opt_str("initial-volume").unwrap().parse::<i32>().is_ok(){ match iv {
// check if value is in [0-100] range, otherwise put the bound values iv if iv >= 0 && iv <= 100 => { initial_volume = iv * 0xFFFF / 100 }
if matches.opt_str("initial-volume").unwrap().parse::<i32>().unwrap() < 0 { _ => {
initial_volume = 0 as i32; debug!("Volume needs to be a value from 0-100; set volume level to 50%");
} initial_volume = 0x8000;
else if matches.opt_str("initial-volume").unwrap().parse::<i32>().unwrap() > 100{
initial_volume = 0xFFFF as i32;
}
// checks ok
else{
initial_volume = matches.opt_str("initial-volume").unwrap().parse::<i32>().unwrap()* 0xFFFF as i32 / 100 ;
} }
} }
// if value is not a number use default value (50%) } else {
else { initial_volume = 0x8000;
initial_volume = 0x8000 as i32;
}
} }
// if argument not present use default values (50%)
else{
initial_volume = 0x8000 as i32;
}
debug!("Volume \"{}\" !", initial_volume);
let zeroconf_port: u16; let zeroconf_port: u16;
if matches.opt_present("zeroconf-port") && matches.opt_str("zeroconf-port").unwrap().parse::<u16>().is_ok() { if matches.opt_present("zeroconf-port") && matches.opt_str("zeroconf-port").unwrap().parse::<u16>().is_ok() {