linus/mpv.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-

Browse Source
This commit is contained in:
Frank Skare
2019-06-19 18:22:40 +02:00
parent 064ae44ecf
commit c0a8e895f7
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mpv.net/mpv/mp.cs
View File

@@ -574,20 +574,24 @@ namespace mpvnet
else else
mp.commandv("loadfile", files[i], "append"); mp.commandv("loadfile", files[i], "append");
Task.Run(() => LoadFolder()); // user reported race condition
}
static void LoadFolder()
{
Thread.Sleep(50); // user reported race condition Thread.Sleep(50); // user reported race condition
string path = files[0]; string path = mp.get_property_string("path");
if (files.Length != 1 || !File.Exists(path)) return; if (!File.Exists(path) || get_property_int("playlist-count") != 1) return;
List<string> filesInFolder = Directory.GetFiles(Path.GetDirectoryName(path)).ToList(); List<string> files = Directory.GetFiles(Path.GetDirectoryName(path)).ToList();
filesInFolder = filesInFolder.Where((file) => files = files.Where((file) =>
App.VideoTypes.Contains(Path.GetExtension(file).TrimStart('.').ToLower()) || App.VideoTypes.Contains(Path.GetExtension(file).TrimStart('.').ToLower()) ||
App.AudioTypes.Contains(Path.GetExtension(file).TrimStart('.').ToLower())).ToList(); App.AudioTypes.Contains(Path.GetExtension(file).TrimStart('.').ToLower())).ToList();
filesInFolder.Sort(new StringLogicalComparer()); files.Sort(new StringLogicalComparer());
int index = filesInFolder.IndexOf(path); int index = files.IndexOf(path);
filesInFolder.Remove(path); files.Remove(path);
foreach (string i in filesInFolder) foreach (string i in files)
commandv("loadfile", i, "append"); commandv("loadfile", i, "append");
if (index > 0) if (index > 0) commandv("playlist-move", "0", (index + 1).ToString());
commandv("playlist-move", "0", (index + 1).ToString());
} }
static IntPtr AllocateUtf8IntPtrArrayWithSentinel(string[] arr, out IntPtr[] byteArrayPointers) static IntPtr AllocateUtf8IntPtrArrayWithSentinel(string[] arr, out IntPtr[] byteArrayPointers)