Merge pull request #1362 from fabienjuif/hotfix_librespot_0.7

chore: bump librespot to 0.7.1

Author: eladyn

Cargo.lock

@@ -26,14 +26,14 @@ sha-1 = "0.10"
 tokio = {version = "1.44.2", features = ["signal", "rt-multi-thread", "process", "io-std"] }
 tokio-stream = "0.1.7"
 url = "2.2.2"
-librespot-audio = { version = "0.6", default-features = false }
-librespot-playback = { version = "0.6", default-features = false }
-librespot-core = "0.6"
-librespot-discovery = "0.6"
-librespot-connect = "0.6"
-librespot-metadata = "0.6"
-librespot-protocol = "0.6"
-librespot-oauth = "0.6"
+librespot-audio = { version = "0.7.1", default-features = false }
+librespot-playback = { version = "0.7.1", default-features = false }
+librespot-core = "0.7.1"
+librespot-discovery = "0.7.1"
+librespot-connect = "0.7.1"
+librespot-metadata = "0.7.1"
+librespot-protocol = "0.7.1"
+librespot-oauth = "0.7.1"
 toml = "0.8.19"
 color-eyre = "0.6"
 directories = "6.0.0"
@@ -61,7 +61,7 @@ env_logger = "0.11"
 [features]
 alsa_backend = ["librespot-playback/alsa-backend", "dep:alsa"]
 dbus_mpris = ["dep:dbus", "dep:dbus-tokio", "dep:dbus-crossroads"]
-default = ["alsa_backend"]
+default = ["alsa_backend", "pulseaudio_backend", "dbus_mpris"]
 portaudio_backend = ["librespot-playback/portaudio-backend"]
 pulseaudio_backend = ["librespot-playback/pulseaudio-backend"]
 rodio_backend = ["librespot-playback/rodio-backend"]

Cargo.toml

@@ -1,30 +1,38 @@
+use color_eyre::eyre::{self, Context, eyre};
 use librespot_playback::mixer::{Mixer, MixerConfig};
 use log::error;
-use std::error::Error;
+use std::sync::{Arc, Mutex, MutexGuard};
 
-#[derive(Clone)]
 pub struct AlsaMixer {
-    pub device: String,
-    pub mixer: String,
-    pub linear_scaling: bool,
+    pub mixer: Arc<Mutex<alsa::Mixer>>,
+    pub config: MixerConfig,
 }
 
 impl AlsaMixer {
-    fn set_volume_with_err(&self, volume: u16) -> Result<(), Box<dyn Error>> {
-        let mixer = alsa::mixer::Mixer::new(&self.device, false)?;
-
-        let selem_id = alsa::mixer::SelemId::new(&self.mixer, 0);
-        let elem = mixer.find_selem(&selem_id).ok_or_else(|| {
-            format!(
-                "Couldn't find selem with name '{}'.",
-                selem_id.get_name().unwrap_or("unnamed")
+    fn get_selem<'a>(
+        &'a self,
+        lock: &'a MutexGuard<'a, alsa::Mixer>,
+    ) -> eyre::Result<alsa::mixer::Selem<'a>> {
+        let selem_id = alsa::mixer::SelemId::new(&self.config.control, self.config.index);
+        let selem = lock.find_selem(&selem_id).ok_or_else(|| {
+            eyre!(
+                "No control with name '{}' in alsa device '{}'",
+                self.config.control,
+                self.config.device,
             )
         })?;
-
+        Ok(selem)
+    }
+    fn set_volume_with_err(&self, volume: u16) -> eyre::Result<()> {
+        let lock = self.mixer.lock().expect("lock shouldn't be poisoned");
+        let elem = self.get_selem(&lock)?;
         let (min, max) = elem.get_playback_volume_range();
 
         let volume_steps = (max - min) as f64;
-        let normalised_volume = if self.linear_scaling {
+        let normalised_volume = if matches!(
+            self.config.volume_ctrl,
+            librespot_playback::config::VolumeCtrl::Linear
+        ) {
             (((volume as f64) / (u16::MAX as f64)) * volume_steps) as i64 + min
         } else {
             ((volume as f64 + 1.0).log((u16::MAX as f64) + 1.0) * volume_steps).floor() as i64 + min
@@ -33,39 +41,41 @@ impl AlsaMixer {
         elem.set_playback_volume_all(normalised_volume)?;
         Ok(())
     }
+
+    fn get_volume_with_err(&self) -> eyre::Result<u16> {
+        let lock = self.mixer.lock().expect("lock shouldn't be poisoned");
+        let elem = self.get_selem(&lock)?;
+        let (min, max) = elem.get_playback_volume_range();
+        let volume_steps = (max - min) as f64;
+        let vol = elem.get_playback_volume(alsa::mixer::SelemChannelId::mono())?;
+        let normalized_volume = if matches!(
+            self.config.volume_ctrl,
+            librespot_playback::config::VolumeCtrl::Linear
+        ) {
+            ((vol - min) as f64 * u16::MAX as f64 / volume_steps).floor() as u16
+        } else {
+            ((u16::MAX as f64 + 1.0).powf(((vol - min) as f64) / volume_steps) - 1.0).floor() as u16
+        };
+        Ok(normalized_volume)
+    }
 }
 
 impl Mixer for AlsaMixer {
-    fn open(_: MixerConfig) -> AlsaMixer {
-        AlsaMixer {
-            device: "default".to_string(),
-            mixer: "Master".to_string(),
-            linear_scaling: false,
-        }
+    fn open(config: MixerConfig) -> Result<AlsaMixer, librespot_core::Error> {
+        let mixer = alsa::Mixer::new(&config.device, false)
+            .wrap_err("failed to open mixer")
+            .map_err(librespot_core::Error::invalid_argument)?;
+        Ok(AlsaMixer {
+            mixer: Arc::new(Mutex::new(mixer)),
+            config,
+        })
     }
 
     fn volume(&self) -> u16 {
-        let selem_id = alsa::mixer::SelemId::new(&self.mixer, 0);
-        let mixer = alsa::mixer::Mixer::new(&self.device, false).ok();
-        let vol = mixer
-            .as_ref()
-            .and_then(|mixer| mixer.find_selem(&selem_id))
-            .and_then(|elem| {
-                let (min, max) = elem.get_playback_volume_range();
-                elem.get_playback_volume(alsa::mixer::SelemChannelId::mono())
-                    .ok()
-                    .map(|volume| {
-                        (((volume - min) as f64 / (max - min) as f64) * (u16::MAX as f64)).floor()
-                            as u16
-                    })
-            });
-        match vol {
-            Some(vol) => vol,
-            None => {
-                error!(
-                    "Couldn't read volume from alsa device with name \"{}\".",
-                    self.device
-                );
+        match self.get_volume_with_err() {
+            Ok(vol) => vol,
+            Err(err) => {
+                error!("failed to get volume from alsa device: {err:?}");
                 0
             }
         }
@@ -74,7 +84,7 @@ impl Mixer for AlsaMixer {
     fn set_volume(&self, volume: u16) {
         match self.set_volume_with_err(volume) {
             Ok(_) => (),
-            Err(e) => error!("Couldn't set volume: {:?}", e),
+            Err(err) => error!("Couldn't set volume of alsa device: {err:?}"),
         }
     }
 }

src/alsa_mixer.rs

@@ -69,7 +69,6 @@ pub enum DeviceType {
     UnknownSpotify,
     CarThing,
     Observer,
-    HomeThing,
 }
 
 impl From<DeviceType> for LSDeviceType {
@@ -93,7 +92,6 @@ impl From<DeviceType> for LSDeviceType {
             DeviceType::UnknownSpotify => LSDeviceType::UnknownSpotify,
             DeviceType::CarThing => LSDeviceType::CarThing,
             DeviceType::Observer => LSDeviceType::Observer,
-            DeviceType::HomeThing => LSDeviceType::HomeThing,
         }
     }
 }
@@ -600,7 +598,7 @@ impl SharedConfigValues {
 }
 
 pub(crate) fn get_config_file() -> Option<PathBuf> {
-    let etc_conf = format!("/etc/{}", CONFIG_FILE_NAME);
+    let etc_conf = format!("/etc/{CONFIG_FILE_NAME}");
     let dirs = directories::ProjectDirs::from("", "", "spotifyd")?;
     let mut path = dirs.config_dir().to_path_buf();
     path.push(CONFIG_FILE_NAME);
@@ -626,7 +624,7 @@ pub(crate) struct SpotifydConfig {
     pub(crate) audio_device: Option<String>,
     pub(crate) audio_format: LSAudioFormat,
     pub(crate) volume_controller: VolumeController,
-    pub(crate) initial_volume: Option<u16>,
+    pub(crate) initial_volume: u16,
     pub(crate) device_name: String,
     pub(crate) player_config: PlayerConfig,
     pub(crate) session_config: SessionConfig,
@@ -675,7 +673,8 @@ pub(crate) fn get_internal_config(config: CliConfig) -> SpotifydConfig {
         .volume_controller
         .unwrap_or(VolumeController::SoftVolume);
 
-    let initial_volume: Option<u16> = config
+    let default_initial_volume = 90;
+    let initial_volume: u16 = config
         .shared_config
         .initial_volume
         .filter(|val| {
@@ -686,7 +685,8 @@ pub(crate) fn get_internal_config(config: CliConfig) -> SpotifydConfig {
                 false
             }
         })
-        .map(|volume| (volume as i32 * (u16::MAX as i32) / 100) as u16);
+        .map(|volume| (volume as i32 * (u16::MAX as i32) / 100) as u16)
+        .unwrap_or((default_initial_volume * (u16::MAX as i32) / 100) as u16);
 
     let device_name = config
         .shared_config