diff --git a/connect/src/spirc.rs b/connect/src/spirc.rs index f95e177..79a9ac8 100755 --- a/connect/src/spirc.rs +++ b/connect/src/spirc.rs @@ -171,8 +171,6 @@ fn initial_device_state(config: ConnectConfig, volume: u16) -> DeviceState { } } - - fn calc_logarithmic_volume(volume: u16) -> u16 { // Volume conversion taken from https://www.dr-lex.be/info-stuff/volumecontrols.html#ideal2 // Convert the given volume [0..0xffff] to a dB gain @@ -532,8 +530,10 @@ impl SpircTask { MessageType::kMessageTypeVolume => { self.device.set_volume(frame.get_volume()); - self.mixer - .set_volume(volume_to_mixer(frame.get_volume() as u16, self.linear_volume)); + self.mixer.set_volume(volume_to_mixer( + frame.get_volume() as u16, + self.linear_volume, + )); self.notify(None); } @@ -657,7 +657,8 @@ impl SpircTask { volume = 0xFFFF; } self.device.set_volume(volume); - self.mixer.set_volume(volume_to_mixer(volume as u16, self.linear_volume)); + self.mixer + .set_volume(volume_to_mixer(volume as u16, self.linear_volume)); } fn handle_volume_down(&mut self) { @@ -666,7 +667,8 @@ impl SpircTask { volume = 0; } self.device.set_volume(volume as u32); - self.mixer.set_volume(volume_to_mixer(volume as u16, self.linear_volume)); + self.mixer + .set_volume(volume_to_mixer(volume as u16, self.linear_volume)); } fn handle_end_of_track(&mut self) { diff --git a/src/main.rs b/src/main.rs index 6a39544..7f1b14a 100755 --- a/src/main.rs +++ b/src/main.rs @@ -287,7 +287,7 @@ fn setup(args: &[String]) -> Setup { name: name, device_type: device_type, volume: initial_volume, - linear_volume: matches.opt_present("linear-volume") + linear_volume: matches.opt_present("linear-volume"), } };