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

Fix encapsulation of Config in FFmpegWriterForm

This commit is contained in:
YoshiRulz 2020-11-30 20:30:26 +10:00
parent 756f9f50e8
commit 0a9f93c433
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BizHawk.Client.EmuHawk/AVOut/FFmpegWriter.cs
View File

@ -323,7 +323,7 @@ namespace BizHawk.Client.EmuHawk
public void SetDefaultVideoCodecToken(Config config)
{
_token = FFmpegWriterForm.FormatPreset.GetDefaultPreset(config.FFmpegFormat);
_token = FFmpegWriterForm.FormatPreset.GetDefaultPreset(config);
}
public bool UsesAudio => true;

17
src/BizHawk.Client.EmuHawk/AVOut/FFmpegWriterForm.cs
View File

@ -42,7 +42,7 @@ namespace BizHawk.Client.EmuHawk
/// <summary>
/// get a list of canned presets
/// </summary>
public static FormatPreset[] GetPresets()
public static FormatPreset[] GetPresets(string customCommand)
{
return new[]
{
@ -69,20 +69,20 @@ namespace BizHawk.Client.EmuHawk
new FormatPreset("FLV", "AVC video and AAC audio in a Flash Video container.",
"-c:a aac -c:v libx264 -f flv", false, "flv"),
new FormatPreset("[Custom]", "Write your own ffmpeg command. For advanced users only.",
"-c:a foo -c:v bar -f baz", true, "foobar")
customCommand, true, "foobar")
};
}
/// <summary>
/// get the default format preset (from config files)
/// </summary>
public static FormatPreset GetDefaultPreset(string ffmpegFormat)
public static FormatPreset GetDefaultPreset(Config config)
{
FormatPreset[] fps = GetPresets();
FormatPreset[] fps = GetPresets(config.FFmpegCustomCommand);
foreach (var fp in fps)
{
if (fp.ToString() == ffmpegFormat)
if (fp.ToString() == config.FFmpegFormat)
{
if (fp.Custom)
{
@ -120,12 +120,9 @@ namespace BizHawk.Client.EmuHawk
{
Name = name;
Desc = desc;
Commandline = commandline;
Custom = custom;
Commandline = Custom
? GlobalWin.Config.FFmpegCustomCommand
: commandline;
DeduceFormat(Commandline);
}
}
@ -152,7 +149,7 @@ namespace BizHawk.Client.EmuHawk
public static FormatPreset DoFFmpegWriterDlg(IWin32Window owner, Config config)
{
FFmpegWriterForm dlg = new FFmpegWriterForm();
dlg.listBox1.Items.AddRange(FormatPreset.GetPresets());
dlg.listBox1.Items.AddRange(FormatPreset.GetPresets(config.FFmpegCustomCommand));
int i = dlg.listBox1.FindStringExact(config.FFmpegFormat);
if (i != ListBox.NoMatches)