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

removed and optimised

Browse source
This commit is contained in:
ComlOnline 2018-01-30 20:52:25 +00:00
parent bc7ceb3f65
commit 863ea9c976
1 changed files with 9 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/main.rs
View file

@ -132,33 +132,19 @@ 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; let initial_volume;
// check if initial-volume argument is present if matches.opt_present("initial-volume") && matches.opt_str("initial-volume").unwrap().parse::<i32>().is_ok() {
if matches.opt_present("initial-volume"){ let iv = matches.opt_str("zeroconf-port").unwrap().parse::<u16>().unwrap();
// check if value is a number if iv => 0 && iv <= 100 {
if matches.opt_str("initial-volume").unwrap().parse::<i32>().is_ok(){ initial_volume = iv * 0xFFFF as i32 / 100 ;
// check if value is in [0-100] range, otherwise put the bound values } else {
if matches.opt_str("initial-volume").unwrap().parse::<i32>().unwrap() < 0 { debug!("Volume needs to be a value from 0-100; set as 50%");
initial_volume = 0 as i32; initial_volume = 0x8000 as i32;
} }
else if matches.opt_str("initial-volume").unwrap().parse::<i32>().unwrap() > 100{ } else {
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 {
initial_volume = 0x8000 as i32; initial_volume = 0x8000 as i32;
} }
}
// if argument not present use default values (50%)
else{
initial_volume = 0x8000 as i32;
}
debug!("Volume \"{}\" !", initial_volume);
let name = matches.opt_str("name").unwrap(); let name = matches.opt_str("name").unwrap();
let use_audio_cache = !matches.opt_present("disable-audio-cache"); let use_audio_cache = !matches.opt_present("disable-audio-cache");