mirrors/gst-plugins-rs
mirrors/gst-plugins-rs
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git synced 2024-06-10 18:29:22 +00:00
Code Issues Projects Releases Wiki Activity

spotifyaudiosrc: Update to librespot 0.4

Browse source
This commit is contained in:
Sebastian Dröge 2022-05-22 16:28:59 +03:00
parent 11a1bbbe69
commit 583aaa36d1
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
audio/spotify/Cargo.toml
View file

@ -12,7 +12,7 @@ rust-version = "1.56"
gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "0.18", version = "0.18" }
gst-base = { package = "gstreamer-base", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "0.18", version = "0.18" }
once_cell = "1.0"
librespot = { version = "0.3", default-features = false }
librespot = { version = "0.4", default-features = false }
tokio = "1.0"
futures = "0.3"
anyhow = "1.0"

17
audio/spotify/src/spotifyaudiosrc/imp.rs
View file

@ -27,6 +27,7 @@ use librespot::playback::{
config::PlayerConfig,
convert::Converter,
decoder::AudioPacket,
mixer::NoOpVolume,
player::{Player, PlayerEvent},
};
@ -327,7 +328,7 @@ impl SpotifyAudioSrc {
None
};
let cache = Cache::new(credentials_cache, files_cache, max_size)?;
let cache = Cache::new(credentials_cache, None, files_cache, max_size)?;
let credentials = match cache.credentials() {
Some(cached_cred) => {
@ -359,7 +360,8 @@ impl SpotifyAudioSrc {
let state = self.state.clone();
let session = Session::connect(SessionConfig::default(), credentials, Some(cache)).await?;
let (session, _credentials) =
Session::connect(SessionConfig::default(), credentials, Some(cache), false).await?;
let player_config = PlayerConfig {
passthrough: true,
@ -371,7 +373,7 @@ impl SpotifyAudioSrc {
let sender_clone = sender.clone();
let (mut player, mut player_event_channel) =
Player::new(player_config, session, None, || {
Player::new(player_config, session, Box::new(NoOpVolume), || {
Box::new(BufferSink { sender })
});
@ -414,9 +416,12 @@ struct BufferSink {
}
impl Sink for BufferSink {
fn write(&mut self, packet: &AudioPacket, _converter: &mut Converter) -> SinkResult<()> {
let ogg = packet.oggdata().unwrap();
let buffer = gst::Buffer::from_slice(Vec::from(ogg));
fn write(&mut self, packet: AudioPacket, _converter: &mut Converter) -> SinkResult<()> {
let oggdata = match packet {
AudioPacket::OggData(data) => data,
AudioPacket::Samples(_) => unimplemented!(),
};
let buffer = gst::Buffer::from_slice(oggdata);
// ignore if sending fails as that means the source element is being shutdown
let _ = self.sender.send(Message::Buffer(buffer));