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

Fix Alsa mixer

Browse source
This commit is contained in:
Roderick van Domburg 2021-07-09 20:12:44 +02:00
parent 68bec41e08
commit 4c00b19c29
No known key found for this signature in database
GPG key ID: FE2585E713F9F30A
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main.rs
View file

@ -205,6 +205,7 @@ fn get_setup(args: &[String]) -> Setup {
const FORMAT: &str = "format"; const FORMAT: &str = "format";
const HELP: &str = "h"; const HELP: &str = "h";
const INITIAL_VOLUME: &str = "initial-volume"; const INITIAL_VOLUME: &str = "initial-volume";
const MIXER_TYPE: &str = "mixer";
const MIXER_CARD: &str = "mixer-card"; const MIXER_CARD: &str = "mixer-card";
const MIXER_INDEX: &str = "mixer-index"; const MIXER_INDEX: &str = "mixer-index";
const MIXER_NAME: &str = "mixer-name"; const MIXER_NAME: &str = "mixer-name";
@ -295,7 +296,7 @@ fn get_setup(args: &[String]) -> Setup {
"Specify the dither algorithm to use - [none, gpdf, tpdf, tpdf_hp]. Defaults to 'tpdf' for formats S16, S24, S24_3 and 'none' for other formats.", "Specify the dither algorithm to use - [none, gpdf, tpdf, tpdf_hp]. Defaults to 'tpdf' for formats S16, S24, S24_3 and 'none' for other formats.",
"DITHER", "DITHER",
) )
.optopt("", "mixer", "Mixer to use {alsa|softvol}.", "MIXER") .optopt("", MIXER_TYPE, "Mixer to use {alsa|softvol}.", "MIXER")
.optopt( .optopt(
"m", "m",
MIXER_NAME, MIXER_NAME,
@ -454,8 +455,8 @@ fn get_setup(args: &[String]) -> Setup {
exit(0); exit(0);
} }
let mixer_name = matches.opt_str(MIXER_NAME); let mixer_type = matches.opt_str(MIXER_TYPE);
let mixer = mixer::find(mixer_name.as_deref()).expect("Invalid mixer"); let mixer = mixer::find(mixer_type.as_deref()).expect("Invalid mixer");
let mixer_config = { let mixer_config = {
let card = matches.opt_str(MIXER_CARD).unwrap_or_else(|| { let card = matches.opt_str(MIXER_CARD).unwrap_or_else(|| {
@ -475,7 +476,7 @@ fn get_setup(args: &[String]) -> Setup {
let mut volume_range = matches let mut volume_range = matches
.opt_str(VOLUME_RANGE) .opt_str(VOLUME_RANGE)
.map(|range| range.parse::<f64>().unwrap()) .map(|range| range.parse::<f64>().unwrap())
.unwrap_or_else(|| match mixer_name.as_deref() { .unwrap_or_else(|| match mixer_type.as_deref() {
#[cfg(feature = "alsa-backend")] #[cfg(feature = "alsa-backend")]
Some(AlsaMixer::NAME) => 0.0, // let Alsa query the control Some(AlsaMixer::NAME) => 0.0, // let Alsa query the control
_ => VolumeCtrl::DEFAULT_DB_RANGE, _ => VolumeCtrl::DEFAULT_DB_RANGE,
@ -563,7 +564,7 @@ fn get_setup(args: &[String]) -> Setup {
} }
(volume as f32 / 100.0 * VolumeCtrl::MAX_VOLUME as f32) as u16 (volume as f32 / 100.0 * VolumeCtrl::MAX_VOLUME as f32) as u16
}) })
.or_else(|| match mixer_name.as_deref() { .or_else(|| match mixer_type.as_deref() {
#[cfg(feature = "alsa-backend")] #[cfg(feature = "alsa-backend")]
Some(AlsaMixer::NAME) => None, Some(AlsaMixer::NAME) => None,
_ => cache.as_ref().and_then(Cache::volume), _ => cache.as_ref().and_then(Cache::volume),