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:03:14 +02:00
parent 005ba6e5ea
commit 064ae44ecf
2 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mpv.net/Misc/Program.cs
View File

@@ -25,8 +25,8 @@ namespace mpvnet
return;
}
Mutex mutex = new Mutex(true, "mpvnetProcessInstance", out bool isFirst);
App.Init();
Mutex mutex = new Mutex(true, "mpvnetProcessInstance", out bool isFirst);
if ((App.ProcessInstance == "single" || App.ProcessInstance == "queue") && !isFirst)
{
@@ -49,6 +49,7 @@ namespace mpvnet
} catch {}
}
mutex.Dispose();
return;
}

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

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