aaru-dps/RedBookPlayer
1
0
Fork 0
mirror of https://github.com/aaru-dps/RedBookPlayer.git synced 2025-12-16 11:14:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Current track order?

Browse Source
This commit is contained in:
Matt Nadareski
2021-10-06 10:16:44 -07:00
parent 8472059232
commit 879154b0f4
1 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
RedBookPlayer.Models/Hardware/Player.cs
View File

@@ -307,6 +307,11 @@ namespace RedBookPlayer.Models.Hardware
/// </summary>
private List<KeyValuePair<int, int>> _trackPlaybackOrder;
/// <summary>
/// Current track in playback order list
/// </summary>
private int _currentTrackInOrder;
/// <summary>
/// Last volume for mute toggling
/// </summary>
@@ -355,6 +360,7 @@ namespace RedBookPlayer.Models.Hardware
}
_trackPlaybackOrder = new List<KeyValuePair<int, int>>();
_currentTrackInOrder = 0;
PropertyChanged += HandlePlaybackModes;
}
@@ -447,6 +453,26 @@ namespace RedBookPlayer.Models.Hardware
_trackPlaybackOrder.AddRange(availableTracks.Select(t => new KeyValuePair<int, int>(i, t)));
}
}
// Try to get back to the last loaded track
int currentFoundTrack = 0;
if(_trackPlaybackOrder == null || _trackPlaybackOrder.Count == 0)
{
currentFoundTrack = 0;
}
else if(_trackPlaybackOrder.Any(kvp => kvp.Key == CurrentDisc))
{
currentFoundTrack = _trackPlaybackOrder.FindIndex(kvp => kvp.Key == CurrentDisc && kvp.Value == CurrentTrackNumber);
if(currentFoundTrack == -1)
currentFoundTrack = _trackPlaybackOrder.Where(kvp => kvp.Key == CurrentDisc).Min(kvp => kvp.Value);
}
else
{
int lowestDiscNumber = _trackPlaybackOrder.Min(kvp => kvp.Key);
currentFoundTrack = _trackPlaybackOrder.Where(kvp => kvp.Key == lowestDiscNumber).Min(kvp => kvp.Value);
}
_currentTrackInOrder = currentFoundTrack;
}
#region Playback (UI)
@@ -581,11 +607,13 @@ namespace RedBookPlayer.Models.Hardware
/// <summary>
/// Move to the next playable track
/// </summary>
/// <remarks>This should follow the track playback order</remarks>
public void NextTrack() => SelectTrack(CurrentTrackNumber + 1);
/// <summary>
/// Move to the previous playable track
/// </summary>
/// <remarks>This should follow the track playback order</remarks>
public void PreviousTrack() => SelectTrack(CurrentTrackNumber - 1);
/// <summary>