diff --git a/BOXVR Playlist Manager/App.config b/BOXVR Playlist Manager/App.config
index e3ad060..ea90831 100644
--- a/BOXVR Playlist Manager/App.config
+++ b/BOXVR Playlist Manager/App.config
@@ -7,7 +7,7 @@
-
+
diff --git a/BOXVR Playlist Manager/BOXVR Playlist Manager.csproj b/BOXVR Playlist Manager/BOXVR Playlist Manager.csproj
index 2939980..280cd3a 100644
--- a/BOXVR Playlist Manager/BOXVR Playlist Manager.csproj
+++ b/BOXVR Playlist Manager/BOXVR Playlist Manager.csproj
@@ -52,6 +52,9 @@
..\packages\z440.atl.core.2.5.0\lib\net30\ATL.dll
+
+ ..\..\SpotiSharp\bin\Debug\netcoreapp3.1\HtmlAgilityPack.dll
+
..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll
@@ -141,7 +144,6 @@
-
MSBuild:Compile
diff --git a/BOXVR Playlist Manager/FitXr/BeatStructure/FFmpegQueue.cs b/BOXVR Playlist Manager/FitXr/BeatStructure/FFmpegQueue.cs
index 529aa75..e687949 100644
--- a/BOXVR Playlist Manager/FitXr/BeatStructure/FFmpegQueue.cs
+++ b/BOXVR Playlist Manager/FitXr/BeatStructure/FFmpegQueue.cs
@@ -19,7 +19,8 @@ private void RunFFMPEG(FFmpegJob job)
{
Directory.CreateDirectory(Paths.TrackDataFolder(LocationMode.PlayerData));
App.logger.Debug(("FFMPEG start: " + FFmpegQueue.binaryPath + " " + job.GetCommand()));
- bool done = false;
+ CancellationTokenSource doneCts = new CancellationTokenSource();
+ var done = doneCts.Token;
string exepath = FFmpegQueue.binaryPath;
string command = job.GetCommand();
new Thread((ThreadStart)(() =>
@@ -38,9 +39,9 @@ private void RunFFMPEG(FFmpegJob job)
process.WaitForExit();
process.Close();
job._message = output;
- done = true;
+ doneCts.Cancel();
})).Start();
- while(!done) { }
+ while(!done.IsCancellationRequested) { }
job._onFinished.Invoke(job);
App.logger.Debug("FFMEG done");
}
diff --git a/BOXVR Playlist Manager/Helpers/NotifyingObject.cs b/BOXVR Playlist Manager/Helpers/NotifyingObject.cs
index 9b4b893..ada419b 100644
--- a/BOXVR Playlist Manager/Helpers/NotifyingObject.cs
+++ b/BOXVR Playlist Manager/Helpers/NotifyingObject.cs
@@ -6,7 +6,7 @@ namespace BoxVR_Playlist_Manager.Helpers
{
public class NotifyingObject : INotifyPropertyChanged
{
- Dispatcher _dispatcher;
+ protected Dispatcher _dispatcher;
public NotifyingObject(Dispatcher dispatcher)
{
_dispatcher = dispatcher;
diff --git a/BOXVR Playlist Manager/MainWindow.xaml b/BOXVR Playlist Manager/MainWindow.xaml
index 293d7e5..78bdca6 100644
--- a/BOXVR Playlist Manager/MainWindow.xaml
+++ b/BOXVR Playlist Manager/MainWindow.xaml
@@ -25,7 +25,6 @@
-
M444.788 291.1l42.616 24.599c4.867 2.809 7.126 8.618 5.459 13.985-11.07 35.642-29.97 67.842-54.689 94.586a12.016 12.016 0 0 1-14.832 2.254l-42.584-24.595a191.577 191.577 0 0 1-60.759 35.13v49.182a12.01 12.01 0 0 1-9.377 11.718c-34.956 7.85-72.499 8.256-109.219.007-5.49-1.233-9.403-6.096-9.403-11.723v-49.184a191.555 191.555 0 0 1-60.759-35.13l-42.584 24.595a12.016 12.016 0 0 1-14.832-2.254c-24.718-26.744-43.619-58.944-54.689-94.586-1.667-5.366.592-11.175 5.459-13.985L67.212 291.1a193.48 193.48 0 0 1 0-70.199l-42.616-24.599c-4.867-2.809-7.126-8.618-5.459-13.985 11.07-35.642 29.97-67.842 54.689-94.586a12.016 12.016 0 0 1 14.832-2.254l42.584 24.595a191.577 191.577 0 0 1 60.759-35.13V25.759a12.01 12.01 0 0 1 9.377-11.718c34.956-7.85 72.499-8.256 109.219-.007 5.49 1.233 9.403 6.096 9.403 11.723v49.184a191.555 191.555 0 0 1 60.759 35.13l42.584-24.595a12.016 12.016 0 0 1 14.832 2.254c24.718 26.744 43.619 58.944 54.689 94.586 1.667 5.366-.592 11.175-5.459 13.985L444.788 220.9a193.485 193.485 0 0 1 0 70.2zM336 256c0-44.112-35.888-80-80-80s-80 35.888-80 80 35.888 80 80 80 80-35.888 80-80z
@@ -69,7 +68,7 @@
-->
-