From be88ddc3bd034fb28c150a74659783c3e3c91b45 Mon Sep 17 00:00:00 2001
From: Nick Steel <nick@nsteel.co.uk>
Date: Thu, 26 Sep 2024 09:54:27 +0100
Subject: [PATCH] spotify: depend on librespot-core and librespot-playback only

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1821>
---
 audio/spotify/Cargo.toml                 | 3 ++-
 audio/spotify/src/common.rs              | 2 +-
 audio/spotify/src/spotifyaudiosrc/imp.rs | 2 +-
 audio/spotify/src/spotifyaudiosrc/mod.rs | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/audio/spotify/Cargo.toml b/audio/spotify/Cargo.toml
index 0375696ab..5f22f9c56 100644
--- a/audio/spotify/Cargo.toml
+++ b/audio/spotify/Cargo.toml
@@ -11,7 +11,8 @@ rust-version.workspace = true
 [dependencies]
 gst.workspace = true
 gst-base.workspace = true
-librespot = { version = "0.4", default-features = false }
+librespot-core = "0.4"
+librespot-playback = "0.4"
 tokio = "1.0"
 futures = "0.3"
 anyhow = "1.0"
diff --git a/audio/spotify/src/common.rs b/audio/spotify/src/common.rs
index 94b622398..617f90263 100644
--- a/audio/spotify/src/common.rs
+++ b/audio/spotify/src/common.rs
@@ -11,7 +11,7 @@ use anyhow::bail;
 use gst::glib;
 use gst::prelude::*;
 
-use librespot::core::{
+use librespot_core::{
     authentication::Credentials, cache::Cache, config::SessionConfig, session::Session,
     spotify_id::SpotifyId,
 };
diff --git a/audio/spotify/src/spotifyaudiosrc/imp.rs b/audio/spotify/src/spotifyaudiosrc/imp.rs
index 1c51dc6f4..67ecec86b 100644
--- a/audio/spotify/src/spotifyaudiosrc/imp.rs
+++ b/audio/spotify/src/spotifyaudiosrc/imp.rs
@@ -17,7 +17,7 @@ use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst_base::subclass::{base_src::CreateSuccess, prelude::*};
 
-use librespot::playback::{
+use librespot_playback::{
     audio_backend::{Sink, SinkResult},
     config::PlayerConfig,
     convert::Converter,
diff --git a/audio/spotify/src/spotifyaudiosrc/mod.rs b/audio/spotify/src/spotifyaudiosrc/mod.rs
index 3f19a8b97..ef91b8ae4 100644
--- a/audio/spotify/src/spotifyaudiosrc/mod.rs
+++ b/audio/spotify/src/spotifyaudiosrc/mod.rs
@@ -29,7 +29,7 @@ impl Default for Bitrate {
     }
 }
 
-impl From<Bitrate> for librespot::playback::config::Bitrate {
+impl From<Bitrate> for librespot_playback::config::Bitrate {
     fn from(value: Bitrate) -> Self {
         match value {
             Bitrate::B96 => Self::Bitrate96,