mirrors/FRESHMusicPlayer
1
0
Fork 0
mirror of https://github.com/Royce551/FRESHMusicPlayer.git synced 2025-01-22 10:51:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify code; fix queue showing non shuffled queue when enqueuing while shuffled

Browse source
This commit is contained in:
Royce551 2022-03-13 18:28:55 -05:00
parent 818484e90c
commit 3a140a684f
1 changed files with 26 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
FRESHMusicPlayer/FRESHMusicPlayer-WPF/Pages/QueueManagement/QueueManagementPage.xaml.cs
View file

@ -21,8 +21,6 @@ namespace FRESHMusicPlayer.Pages
{
private bool taskIsRunning;
private readonly Queue<List<string>> displayqueue = new Queue<List<string>>();
private int currentIndex = 0;
private List<string> lastQueue = new List<string>();
private readonly MainWindow window;
public QueueManagement(MainWindow window)
@ -59,59 +57,39 @@ namespace FRESHMusicPlayer.Pages
async void GetResults()
{
var list = displayqueue.Dequeue();
var nextLength = 0; // length of the tracks that come after the current
int number = 1;
SetControlEnabled(false);
await Task.Run(() =>
{
if (!list.SequenceEqual(lastQueue)) // has the contents of the queue changed, or just the positions?
{ // yes; refresh list
var difference = QueueList.Items.Count - window.Player.Queue.Queue.Count;
while (difference > 0)
{
Dispatcher.Invoke(() => QueueList.Items.RemoveAt(QueueList.Items.Count - 1));
difference--;
}
while (difference < 0)
{
Dispatcher.Invoke(() => QueueList.Items.Add(new QueueEntry(null, null, null, null, 0, 0, window.Player)));
difference++;
}
for (int i = 0; i < QueueList.Items.Count; i++)
{
var entry = QueueList.Items[i] as QueueEntry;
var correspondingQueueEntry = window.Library.GetFallbackTrack(window.Player.Queue.Queue[i]);
Dispatcher.Invoke(() =>
{
entry.Artist = correspondingQueueEntry.Artist;
entry.Album = correspondingQueueEntry.Album;
entry.Title = correspondingQueueEntry.Title;
entry.Index = i;
entry.Position = (i + 1).ToString();
entry.Length = correspondingQueueEntry.Length;
entry.UpdatePosition();
});
}
}
else // no; just update positions (massively faster)
var difference = QueueList.Items.Count - window.Player.Queue.Queue.Count;
while (difference > 0)
{
foreach (var item in QueueList.Items)
Dispatcher.Invoke(() => QueueList.Items.RemoveAt(QueueList.Items.Count - 1));
difference--;
}
while (difference < 0)
{
Dispatcher.Invoke(() => QueueList.Items.Add(new QueueEntry(null, null, null, null, 0, 0, window.Player)));
difference++;
}
for (int i = 0; i < QueueList.Items.Count; i++)
{
var entry = QueueList.Items[i] as QueueEntry;
var correspondingQueueEntry = window.Library.GetFallbackTrack(window.Player.Queue.Queue[i]);
Dispatcher.Invoke(() =>
{
if (item is QueueEntry entry)
{
Dispatcher.Invoke(() => entry.UpdatePosition());
if (entry.Index + 1 == window.Player.Queue.Position) currentIndex = entry.Index;
if (window.Player.Queue.Position < number) nextLength += entry.Length;
}
number++;
}
} // convert the items in the listbox into a list of file paths to be compared with `list`
lastQueue = Dispatcher.Invoke(() => QueueList.Items.Cast<QueueEntry>().Select(x => window.Player.Queue.Queue[x.Index]).ToList());
entry.Artist = correspondingQueueEntry.Artist;
entry.Album = correspondingQueueEntry.Album;
entry.Title = correspondingQueueEntry.Title;
entry.Index = i;
entry.Position = (i + 1).ToString();
entry.Length = correspondingQueueEntry.Length;
entry.UpdatePosition();
});
}
});
if (QueueList.Items.Count > 0) (QueueList.Items[currentIndex] as QueueEntry).BringIntoView(); // Bring current track into view
//if (QueueList.Items.Count > 0) (QueueList.Items[currentIndex] as QueueEntry).BringIntoView(); // Bring current track into view
SetControlEnabled(true);
taskIsRunning = false;
if (displayqueue.Count != 0) GetResults();