ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Omit ".exe" from FFmpeg on Unix, and hack a note into the downloader

This commit is contained in:
YoshiRulz 2020-08-30 09:03:18 +10:00
parent 252e878b53
commit 7e99989746
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/BizHawk.Client.EmuHawk/AVOut/FFmpegDownloaderForm.cs
View File

@ -1,5 +1,6 @@
using System;
using System.IO;
using System.Linq;
using System.Threading;
using System.Windows.Forms;
@ -18,6 +19,8 @@ namespace BizHawk.Client.EmuHawk
txtLocation.Text = FFmpegService.FFmpegPath;
txtUrl.Text = FFmpegService.Url;
if (OSTailoredCode.IsUnixHost) textBox1.Text = string.Join("\n", textBox1.Text.Split('\n').Take(3)) + $"\n\n(Linux user: Create a symlink with the below filename pointing to the ffmpeg binary with version {FFmpegService.Version}.)";
}
int pct = 0;

2
src/BizHawk.Client.EmuHawk/Program.cs
View File

@ -130,7 +130,7 @@ namespace BizHawk.Client.EmuHawk
}
GlobalWin.Config.ResolveDefaults();
FFmpegService.FFmpegPath = Path.Combine(PathUtils.DllDirectoryPath, "ffmpeg.exe");
FFmpegService.FFmpegPath = Path.Combine(PathUtils.DllDirectoryPath, OSTC.IsUnixHost ? "ffmpeg" : "ffmpeg.exe");
StringLogUtil.DefaultToDisk = GlobalWin.Config.Movies.MoviesOnDisk;