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

Fix regression in track cycling

Browse source
This commit is contained in:
ashthespy 2020-05-13 13:24:30 +02:00
parent 172cb945c4
commit 9cacc2d09f
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
connect/src/spirc.rs
View file

@ -1170,9 +1170,9 @@ impl SpircTask {
} }
fn get_track_id_to_play_from_playlist(&self, index: u32) -> Option<(SpotifyId, u32)> { fn get_track_id_to_play_from_playlist(&self, index: u32) -> Option<(SpotifyId, u32)> {
let tracks_len = self.state.get_track().len() as u32; let tracks_len = self.state.get_track().len();
let mut new_playlist_index = index; let mut new_playlist_index = index as usize;
if new_playlist_index >= tracks_len { if new_playlist_index >= tracks_len {
new_playlist_index = 0; new_playlist_index = 0;
@ -1184,7 +1184,7 @@ impl SpircTask {
// tracks in each frame either have a gid or uri (that may or may not be a valid track) // tracks in each frame either have a gid or uri (that may or may not be a valid track)
// E.g - context based frames sometimes contain tracks with <spotify:meta:page:> // E.g - context based frames sometimes contain tracks with <spotify:meta:page:>
let mut track_ref = self.state.get_track()[new_playlist_index as usize].clone(); let mut track_ref = self.state.get_track()[new_playlist_index].clone();
let mut track_id = self.get_spotify_id_for_track(&track_ref); let mut track_id = self.get_spotify_id_for_track(&track_ref);
while track_id.is_err() || track_id.unwrap().audio_type == SpotifyAudioType::NonPlayable { while track_id.is_err() || track_id.unwrap().audio_type == SpotifyAudioType::NonPlayable {
warn!( warn!(
@ -1203,12 +1203,12 @@ impl SpircTask {
warn!("No playable track found in state: {:?}", self.state); warn!("No playable track found in state: {:?}", self.state);
return None; return None;
} }
track_ref = self.state.get_track()[index as usize].clone(); track_ref = self.state.get_track()[new_playlist_index].clone();
track_id = self.get_spotify_id_for_track(&track_ref); track_id = self.get_spotify_id_for_track(&track_ref);
} }
match track_id { match track_id {
Ok(track_id) => Some((track_id, new_playlist_index)), Ok(track_id) => Some((track_id, new_playlist_index as u32)),
Err(_) => None, Err(_) => None,
} }
} }