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

pressing shift key suppresses auto-load-folder

Browse Source
This commit is contained in:
Frank Skare
2019-10-14 11:47:22 +02:00
parent 857926696c
commit 7371949730
5 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mpv.net/Misc/App.cs
View File

@@ -28,6 +28,7 @@ namespace mpvnet
public static bool RememberVolume { get; set; } = true;
public static bool AutoLoadFolder { get; set; } = true;
public static bool ThemedMenu { get; set; }
public static bool Queue { get; set; }
public static int StartThreshold { get; set; } = 1500;
public static int RecentCount { get; set; } = 15;
@@ -121,6 +122,7 @@ namespace mpvnet
case "auto-load-folder": AutoLoadFolder = value == "yes"; return true;
case "themed-menu": ThemedMenu = value == "yes"; return true;
case "recent-count": RecentCount = value.Int(); return true;
case "queue": Queue = value == "yes"; return true;
}
return false;
}

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

@@ -40,8 +40,12 @@ namespace mpvnet
files.Add(App.ProcessInstance);
foreach (string arg in args)
{
if (!arg.StartsWith("--") && (arg == "-" || arg.Contains("://") || arg.Contains(":\\") || arg.StartsWith("\\\\")))
files.Add(arg);
else if (arg == "--queue")
files[0] = "queue";
}
Process[] procs = Process.GetProcessesByName("mpvnet");

2
mpv.net/Resources/mpvNetConfToml.txt
View File

@@ -58,7 +58,7 @@ options = [{ name = "yes" },
name = "auto-load-folder"
default = "yes"
filter = "Playback"
help = "For single files automatically load the entire directory into the playlist. (mpv.net specific setting)"
help = "For single files automatically load the entire directory into the playlist. Can be suppressed via shift key. (mpv.net specific setting)"
options = [{ name = "yes" },
{ name = "no" }]

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

@@ -117,7 +117,8 @@ namespace mpvnet
public static void ProcessProperty(string name, string value)
{
if (name.Any(char.IsUpper)) Msg.ShowError("Uppercase char detected: " + name, "mpv properties using the command line and the mpv.conf config file are required to be lowercase.");
if (name.Any(char.IsUpper))
Msg.ShowError("Uppercase char detected: " + name, "mpv properties using the command line and the mpv.conf config file are required to be lowercase.");
switch (name)
{
@@ -637,7 +638,7 @@ namespace mpvnet
}
}
Load(files.ToArray(), App.ProcessInstance != "queue", Control.ModifierKeys.HasFlag(Keys.Control));
Load(files.ToArray(), !App.Queue, Control.ModifierKeys.HasFlag(Keys.Control) || App.Queue);
if (files.Count == 0 || files[0].Contains("://"))
{
@@ -665,7 +666,9 @@ namespace mpvnet
public static void Load(string[] files, bool loadFolder, bool append)
{
if (files is null || files.Length == 0) return;
if (files is null || files.Length == 0)
return;
HideLogo();
if ((DateTime.Now - LastLoad).TotalMilliseconds < 500)
@@ -685,15 +688,18 @@ namespace mpvnet
if (string.IsNullOrEmpty(get_property_string("path")))
set_property_int("playlist-pos", 0);
if (loadFolder && !append) Task.Run(() => LoadFolder()); // user reported race condition
if (loadFolder && !append)
Task.Run(() => LoadFolder()); // user reported race condition
}
public static void LoadFolder()
{
if (!App.AutoLoadFolder) return;
if (!App.AutoLoadFolder || Control.ModifierKeys.HasFlag(Keys.Shift))
return;
Thread.Sleep(200); // user reported race condition
string path = get_property_string("path");
if (!File.Exists(path) || get_property_int("playlist-count") != 1) return;
if (!File.Exists(path) || get_property_int("playlist-count") != 1)
return;
List<string> files = Directory.GetFiles(Path.GetDirectoryName(path)).ToList();
files = files.Where(file =>
App.VideoTypes.Contains(file.ShortExt()) ||
@@ -704,7 +710,8 @@ namespace mpvnet
files.Remove(path);
foreach (string i in files)
commandv("loadfile", i, "append");
if (index > 0) commandv("playlist-move", "0", (index + 1).ToString());
if (index > 0)
commandv("playlist-move", "0", (index + 1).ToString());
}
public static IntPtr AllocateUtf8IntPtrArrayWithSentinel(string[] arr, out IntPtr[] byteArrayPointers)