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

Fix playback order; add shuffle method

Browse Source
This commit is contained in:
Matt Nadareski
2021-10-06 10:03:25 -07:00
parent ef95acef8f
commit 8472059232
1 changed files with 39 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -418,7 +418,7 @@ namespace RedBookPlayer.Models.Hardware
// If the disc exists, add it to the dictionary
if(_opticalDiscs[CurrentDisc] != null)
{
if (opticalDisc is CompactDisc compactDisc)
if(opticalDisc is CompactDisc compactDisc)
_availableTrackList[CurrentDisc] = compactDisc.Tracks.Select(t => (int)t.TrackSequence).OrderBy(s => s).ToList();
else
_availableTrackList[CurrentDisc] = Enumerable.Range(1, opticalDisc.TotalTracks).ToList();
@@ -430,14 +430,22 @@ namespace RedBookPlayer.Models.Hardware
_availableTrackList[CurrentDisc] = new List<int>();
}
// Loop through the dictionary and repopulate the playback order
for(int i = 0; i < _numberOfDiscs; i++)
// Repopulate the playback order
_trackPlaybackOrder = new List<KeyValuePair<int, int>>();
if(DiscHandling == DiscHandling.SingleDisc)
{
if(_availableTrackList[i] == null || _availableTrackList[i].Count == 0)
continue;
List<int> availableTracks = _availableTrackList[i];
_trackPlaybackOrder.AddRange(availableTracks.Select(t => new KeyValuePair<int, int>(i, t)));
List<int> availableTracks = _availableTrackList[CurrentDisc];
if(availableTracks != null && availableTracks.Count > 0)
_trackPlaybackOrder.AddRange(availableTracks.Select(t => new KeyValuePair<int, int>(CurrentDisc, t)));
}
else if(DiscHandling == DiscHandling.MultiDisc)
{
for(int i = 0; i < _numberOfDiscs; i++)
{
List<int> availableTracks = _availableTrackList[i];
if(availableTracks != null && availableTracks.Count > 0)
_trackPlaybackOrder.AddRange(availableTracks.Select(t => new KeyValuePair<int, int>(i, t)));
}
}
}
@@ -497,6 +505,24 @@ namespace RedBookPlayer.Models.Hardware
}
}
/// <summary>
/// Shuffle the current track order
/// </summary>
public void ShuffleTracks()
{
List<KeyValuePair<int, int>> newPlaybackOrder = new List<KeyValuePair<int, int>>();
Random random = new Random();
while(_trackPlaybackOrder.Count > 0)
{
int next = random.Next(0, _trackPlaybackOrder.Count - 1);
newPlaybackOrder.Add(_trackPlaybackOrder[next]);
_trackPlaybackOrder.RemoveAt(next);
}
_trackPlaybackOrder = newPlaybackOrder;
}
/// <summary>
/// Stop current playback
/// </summary>
@@ -1127,7 +1153,11 @@ namespace RedBookPlayer.Models.Hardware
/// Set disc handling method
/// </summary>
/// <param name="discHandling">New playback value</param>
public void SetDiscHandling(DiscHandling discHandling) => DiscHandling = discHandling;
public void SetDiscHandling(DiscHandling discHandling)
{
DiscHandling = discHandling;
LoadTrackList();
}
/// <summary>
/// Set the value for loading hidden tracks [CompactDisc only]