yetangitu/librespot
1
0
Fork 0
mirror of https://github.com/librespot-org/librespot.git synced 2025-10-06 03:50:06 +02:00
Code Issues Releases Wiki Activity

More alsa stragglers

Browse source
This commit is contained in:
ashthespy 2018-11-01 17:40:42 +01:00
parent a80bf86a2b
commit cc6c9b2dc4
3 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/main.rs
View file

@ -140,10 +140,10 @@ fn setup(args: &[String]) -> Setup {
.optopt(
"",
"device",
"Audio device to use. Use '?' to list options if using portaudio",
"Audio device to use. Use '?' to list options if using portaudio or alsa",
"DEVICE",
)
.optopt("", "mixer", "Mixer to use (Alsa or softmixer)", "MIXER")
.optopt("", "mixer", "Mixer to use (alsa or softmixer)", "MIXER")
.optopt(
"m",
"mixer-name",
@ -228,9 +228,12 @@ fn setup(args: &[String]) -> Setup {
let mixer = mixer::find(mixer_name.as_ref()).expect("Invalid mixer");
let mixer_config = MixerConfig {
card: matches.opt_str("mixer-card").unwrap_or(String::from("default")),
mixer: matches.opt_str("mixer-name").unwrap_or(String::from("PCM")),
index: matches.opt_str("mixer-index").map(|index| index.parse::<u32>().unwrap()).unwrap_or(0),
card: matches.opt_str("mixer-card").unwrap_or(String::from("default")),
mixer: matches.opt_str("mixer-name").unwrap_or(String::from("PCM")),
index: matches
.opt_str("mixer-index")
.map(|index| index.parse::<u32>().unwrap())
.unwrap_or(0),
};
let use_audio_cache = !matches.opt_present("disable-audio-cache");
@ -247,8 +250,7 @@ fn setup(args: &[String]) -> Setup {
panic!("Initial volume must be in the range 0-100");
}
(volume as i32 * 0xFFFF / 100) as u16
})
.or_else(|| cache.as_ref().and_then(Cache::volume))
}).or_else(|| cache.as_ref().and_then(Cache::volume))
.unwrap_or(0x8000);
let zeroconf_port = matches