Mirrors/flowframes
1
0
Fork 0
mirror of https://github.com/n00mkrad/flowframes.git synced 2026-08-29 10:08:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant GetCmdArg

Browse Source
This commit is contained in:
n00mkrad
2025-12-20 23:25:15 +01:00
parent 6e809734e8
commit e553e71c30
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
CodeLegacy/Media/AvProcess.cs
View File

@@ -70,9 +70,9 @@ namespace Flowframes
string beforeArgs = $"-hide_banner -stats -loglevel {loglevel} -y"; string beforeArgs = $"-hide_banner -stats -loglevel {loglevel} -y";
if (!string.IsNullOrWhiteSpace(workingDir)) if (!string.IsNullOrWhiteSpace(workingDir))
ffmpeg.StartInfo.Arguments = $"{GetCmdArg()} cd /D {workingDir.Wrap()} & {Path.Combine(GetAvDir(), "ffmpeg.exe").Wrap()} {beforeArgs} {args}"; ffmpeg.StartInfo.Arguments = $"/C cd /D {workingDir.Wrap()} & {Path.Combine(GetAvDir(), "ffmpeg.exe").Wrap()} {beforeArgs} {args}";
else else
ffmpeg.StartInfo.Arguments = $"{GetCmdArg()} cd /D {GetAvDir().Wrap()} & ffmpeg {beforeArgs} {args}"; ffmpeg.StartInfo.Arguments = $"/C cd /D {GetAvDir().Wrap()} & ffmpeg {beforeArgs} {args}";
if (logMode != LogMode.Hidden) Logger.Log("Running FFmpeg...", false); if (logMode != LogMode.Hidden) Logger.Log("Running FFmpeg...", false);
Logger.Log($"ffmpeg {beforeArgs} {args}", true, false, "ffmpeg"); Logger.Log($"ffmpeg {beforeArgs} {args}", true, false, "ffmpeg");
@@ -103,9 +103,9 @@ namespace Flowframes
string beforeArgs = $"-hide_banner -stats -loglevel {loglevel} -y"; string beforeArgs = $"-hide_banner -stats -loglevel {loglevel} -y";
if (!string.IsNullOrWhiteSpace(workingDir)) if (!string.IsNullOrWhiteSpace(workingDir))
ffmpeg.StartInfo.Arguments = $"{GetCmdArg()} cd /D {workingDir.Wrap()} & {Path.Combine(GetAvDir(), "ffmpeg.exe").Wrap()} {beforeArgs} {args}"; ffmpeg.StartInfo.Arguments = $"/C cd /D {workingDir.Wrap()} & {Path.Combine(GetAvDir(), "ffmpeg.exe").Wrap()} {beforeArgs} {args}";
else else
ffmpeg.StartInfo.Arguments = $"{GetCmdArg()} cd /D {GetAvDir().Wrap()} & ffmpeg {beforeArgs} {args}"; ffmpeg.StartInfo.Arguments = $"/C cd /D {GetAvDir().Wrap()} & ffmpeg {beforeArgs} {args}";
if (logMode != LogMode.Hidden) Logger.Log("Running FFmpeg...", false); if (logMode != LogMode.Hidden) Logger.Log("Running FFmpeg...", false);
Logger.Log($"ffmpeg {beforeArgs} {args}", true, false, "ffmpeg"); Logger.Log($"ffmpeg {beforeArgs} {args}", true, false, "ffmpeg");
@@ -145,7 +145,7 @@ namespace Flowframes
bool concat = settings.Args.Split(" \"").Last().Remove("\"").Trim().EndsWith(".concat"); bool concat = settings.Args.Split(" \"").Last().Remove("\"").Trim().EndsWith(".concat");
string args = $"-v {settings.LogLevel} {(concat ? "-f concat -safe 0 " : "")}{settings.Args}"; string args = $"-v {settings.LogLevel} {(concat ? "-f concat -safe 0 " : "")}{settings.Args}";
ffprobe.StartInfo.Arguments = $"{GetCmdArg()} cd /D {GetAvDir().Wrap()} & ffprobe {args}"; ffprobe.StartInfo.Arguments = $"/C cd /D {GetAvDir().Wrap()} & ffprobe {args}";
if (settings.LoggingMode != LogMode.Hidden) Logger.Log("Running FFprobe...", false); if (settings.LoggingMode != LogMode.Hidden) Logger.Log("Running FFprobe...", false);
Logger.Log($"ffprobe {args}", true, false, "ffmpeg"); Logger.Log($"ffprobe {args}", true, false, "ffmpeg");
@@ -170,7 +170,7 @@ namespace Flowframes
public static string GetFfprobeOutput(string args) public static string GetFfprobeOutput(string args)
{ {
Process ffprobe = OsUtils.NewProcess(true); Process ffprobe = OsUtils.NewProcess(true);
ffprobe.StartInfo.Arguments = $"{GetCmdArg()} cd /D {GetAvDir().Wrap()} & ffprobe.exe {args}"; ffprobe.StartInfo.Arguments = $"/C cd /D {GetAvDir().Wrap()} & ffprobe.exe {args}";
Logger.Log($"ffprobe {args}", true, false, "ffmpeg"); Logger.Log($"ffprobe {args}", true, false, "ffmpeg");
ffprobe.Start(); ffprobe.Start();
ffprobe.WaitForExit(); ffprobe.WaitForExit();
@@ -185,11 +185,6 @@ namespace Flowframes
return Path.Combine(Paths.GetPkgPath(), Paths.audioVideoDir); return Path.Combine(Paths.GetPkgPath(), Paths.audioVideoDir);
} }
public static string GetCmdArg()
{
return "/C";
}
public static async Task SetBusyWhileRunning() public static async Task SetBusyWhileRunning()
{ {
if (Program.busy) return; if (Program.busy) return;