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

misc

Browse Source
This commit is contained in:
stax76
2022-06-03 18:38:53 +02:00
parent 971fe1fe7c
commit 8ee389e8cb
8 changed files with 106 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Misc/App.cs
View File

@@ -23,11 +23,10 @@ namespace mpvnet
public static bool AutoLoadFolder { get; set; } = true;
public static bool AutoPlay { get; set; }
public static bool DebuggerAttached { get; set; } = Debugger.IsAttached;
public static bool DebugMode { get; set; }
public static bool Exit { get; set; }
public static bool IsTerminalAttached { get; } = Environment.GetEnvironmentVariable("_started_from_console") == "yes";
public static bool MediaInfo { get; set; } = true;
public static bool MediaInfo { get; set; }
public static bool Queue { get; set; }
public static bool RememberVolume { get; set; } = true;
public static bool RememberWindowPosition { get; set; }

13
src/Misc/Commands.cs
View File

@@ -157,8 +157,19 @@ namespace mpvnet
}
}
static int LastShowInfo;
public static void ShowInfo()
{
if (Environment.TickCount - LastShowInfo < 5000)
{
Core.Command("script-message mpv.net show-media-info osd");
LastShowInfo = 0;
return;
}
LastShowInfo = Environment.TickCount;
string performer, title, album, genre, date, duration, text = "";
long fileSize = 0;
string path = Core.GetPropertyString("path");
@@ -438,7 +449,7 @@ namespace mpvnet
if (editor)
ShowTextWithEditor("media-info", text);
else if (osd)
Core.CommandV("show-text", text.Replace("\r", ""), "5000");
ShowText(text.Replace("\r", ""), 5000, 15);
else
{
MsgBoxEx.MessageBoxEx.MsgFontFamily = new FontFamily("Consolas");

3
src/Misc/MainForm.cs
View File

@@ -722,6 +722,9 @@ namespace mpvnet
string path = Core.GetPropertyString("path");
if (path.Contains(":/") && !path.Contains("://"))
path = path.Replace("/", "\\");
if (path.Contains("://"))
{
string title = Core.GetPropertyString("media-title");

42
src/Misc/Player.cs
View File

@@ -722,7 +722,7 @@ namespace mpvnet
{
mpv_error err = mpv_command_string(Handle, command);
if (err < 0)
HandleError(err, "error executing command:", command);
HandleError(err, "error executing command: " + command);
}
public void CommandV(params string[] args)
@@ -747,7 +747,7 @@ namespace mpvnet
Marshal.FreeHGlobal(rootPtr);
if (err < 0)
HandleError(err, "error executing command:", string.Join("\n", args));
HandleError(err, "error executing command: " + string.Join("\n", args));
}
public string Expand(string value)
@@ -782,7 +782,7 @@ namespace mpvnet
if (err < 0)
{
HandleError(err, "error executing command:", string.Join("\n", args));
HandleError(err, "error executing command: " + string.Join("\n", args));
Marshal.FreeHGlobal(resultNodePtr);
return "property expansion error";
}
@@ -799,7 +799,7 @@ namespace mpvnet
mpv_error err = mpv_get_property(Handle, GetUtf8Bytes(name),
mpv_format.MPV_FORMAT_FLAG, out IntPtr lpBuffer);
if (err < 0)
HandleError(err, $"error getting property: {name}");
HandleError(err, "error getting property: " + name);
return lpBuffer.ToInt32() != 0;
}
@@ -815,8 +815,8 @@ namespace mpvnet
{
mpv_error err = mpv_get_property(Handle, GetUtf8Bytes(name),
mpv_format.MPV_FORMAT_INT64, out IntPtr lpBuffer);
if (err < 0 && (App.DebugMode || App.DebuggerAttached))
HandleError(err, $"error getting property: {name}");
if (err < 0 && App.DebugMode)
HandleError(err, "error getting property: " + name);
return lpBuffer.ToInt32();
}
@@ -840,7 +840,7 @@ namespace mpvnet
mpv_error err = mpv_get_property(Handle, GetUtf8Bytes(name),
mpv_format.MPV_FORMAT_INT64, out IntPtr lpBuffer);
if (err < 0)
HandleError(err, $"error getting property: {name}");
HandleError(err, "error getting property: " + name);
return lpBuffer.ToInt64();
}
@@ -848,8 +848,8 @@ namespace mpvnet
{
mpv_error err = mpv_get_property(Handle, GetUtf8Bytes(name),
mpv_format.MPV_FORMAT_DOUBLE, out double value);
if (err < 0 && handleError && (App.DebugMode || App.DebuggerAttached))
HandleError(err, $"error getting property: {name}");
if (err < 0 && handleError && App.DebugMode)
HandleError(err, "error getting property: " + name);
return value;
}
@@ -873,8 +873,8 @@ namespace mpvnet
return ret;
}
if (err < 0 && (App.DebugMode || App.DebuggerAttached))
HandleError(err, $"error getting property: {name}");
if (err < 0 && App.DebugMode)
HandleError(err, "error getting property: " + name);
return "";
}
@@ -884,7 +884,7 @@ namespace mpvnet
byte[] bytes = GetUtf8Bytes(value);
mpv_error err = mpv_set_property(Handle, GetUtf8Bytes(name), mpv_format.MPV_FORMAT_STRING, ref bytes);
if (err < 0)
HandleError(err, $"error setting property: {name} = " + value);
HandleError(err, $"error setting property: {name} = {value}");
}
public string GetPropertyOsdString(string name)
@@ -900,7 +900,7 @@ namespace mpvnet
}
if (err < 0)
HandleError(err, $"error getting property: {name}");
HandleError(err, "error getting property: " + name);
return "";
}
@@ -937,7 +937,7 @@ namespace mpvnet
mpv_error err = mpv_observe_property(NamedHandle, 0, name, mpv_format.MPV_FORMAT_INT64);
if (err < 0)
HandleError(err, $"error observing property: {name}");
HandleError(err, "error observing property: " + name);
else
IntPropChangeActions[name] = new List<Action<int>>();
}
@@ -956,7 +956,7 @@ namespace mpvnet
mpv_error err = mpv_observe_property(NamedHandle, 0, name, mpv_format.MPV_FORMAT_DOUBLE);
if (err < 0)
HandleError(err, $"error observing property: {name}");
HandleError(err, "error observing property: " + name);
else
DoublePropChangeActions[name] = new List<Action<double>>();
}
@@ -975,7 +975,7 @@ namespace mpvnet
mpv_error err = mpv_observe_property(NamedHandle, 0, name, mpv_format.MPV_FORMAT_FLAG);
if (err < 0)
HandleError(err, $"error observing property: {name}");
HandleError(err, "error observing property: " + name);
else
BoolPropChangeActions[name] = new List<Action<bool>>();
}
@@ -994,7 +994,7 @@ namespace mpvnet
mpv_error err = mpv_observe_property(NamedHandle, 0, name, mpv_format.MPV_FORMAT_STRING);
if (err < 0)
HandleError(err, $"error observing property: {name}");
HandleError(err, "error observing property: " + name);
else
StringPropChangeActions[name] = new List<Action<string>>();
}
@@ -1013,7 +1013,7 @@ namespace mpvnet
mpv_error err = mpv_observe_property(NamedHandle, 0, name, mpv_format.MPV_FORMAT_NONE);
if (err < 0)
HandleError(err, $"error observing property: {name}");
HandleError(err, "error observing property: " + name);
else
PropChangeActions[name] = new List<Action>();
}
@@ -1023,11 +1023,9 @@ namespace mpvnet
}
}
public void HandleError(mpv_error err, params string[] messages)
public void HandleError(mpv_error err, string msg)
{
foreach (string msg in messages)
Terminal.WriteError(msg);
Terminal.WriteError(msg);
Terminal.WriteError(GetError(err));
}