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

pass persist_volume to volume_to_mixer function calls

Browse source
This commit is contained in:
Brice Delli Paoli 2018-05-10 12:15:59 -04:00
parent f2be0533f3
commit fed89882d5
1 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
connect/src/spirc.rs
View file

@ -238,9 +238,14 @@ impl Spirc {
let volume = config.volume as u16; let volume = config.volume as u16;
let linear_volume = config.linear_volume; let linear_volume = config.linear_volume;
let persist_volume = config.persist_volume.clone();
let device = initial_device_state(config, volume); let device = initial_device_state(config, volume);
mixer.set_volume(volume_to_mixer(volume as u16, linear_volume)); mixer.set_volume(volume_to_mixer(
volume as u16,
linear_volume,
persist_volume.clone(),
));
let mut task = SpircTask { let mut task = SpircTask {
player: player, player: player,
@ -537,8 +542,11 @@ impl SpircTask {
MessageType::kMessageTypeVolume => { MessageType::kMessageTypeVolume => {
self.device.set_volume(frame.get_volume()); self.device.set_volume(frame.get_volume());
self.mixer self.mixer.set_volume(volume_to_mixer(
.set_volume(volume_to_mixer(frame.get_volume() as u16, self.linear_volume)); frame.get_volume() as u16,
self.linear_volume,
self.persist_volume.clone(),
));
self.notify(None); self.notify(None);
} }
@ -662,8 +670,11 @@ impl SpircTask {
volume = 0xFFFF; volume = 0xFFFF;
} }
self.device.set_volume(volume); self.device.set_volume(volume);
self.mixer self.mixer.set_volume(volume_to_mixer(
.set_volume(volume_to_mixer(volume as u16, self.linear_volume)); volume as u16,
self.linear_volume,
self.persist_volume.clone(),
));
} }
fn handle_volume_down(&mut self) { fn handle_volume_down(&mut self) {
@ -672,8 +683,11 @@ impl SpircTask {
volume = 0; volume = 0;
} }
self.device.set_volume(volume as u32); self.device.set_volume(volume as u32);
self.mixer self.mixer.set_volume(volume_to_mixer(
.set_volume(volume_to_mixer(volume as u16, self.linear_volume)); volume as u16,
self.linear_volume,
self.persist_volume.clone(),
));
} }
fn handle_end_of_track(&mut self) { fn handle_end_of_track(&mut self) {