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

IMovie.PopulateWithDefaultHeaderValues() - pass in dependencies instead of using Globals

This commit is contained in:
adelikat 2020-04-14 17:30:32 -05:00
parent ce4037fad8
commit 03a7ea8438
3 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs
View File

@ -278,25 +278,30 @@ namespace BizHawk.Client.Common.MovieConversionExtensions
}
// TODO: This doesn't really belong here, but not sure where to put it
public static void PopulateWithDefaultHeaderValues(this IMovie movie, string author = null)
public static void PopulateWithDefaultHeaderValues(
this IMovie movie,
IEmulator emulator,
GameInfo game,
FirmwareManager firmwareManager,
string author)
{
movie.Author = author ?? Global.Config.DefaultAuthor;
movie.Author = author;
movie.EmulatorVersion = VersionInfo.GetEmuVersion();
movie.SystemID = Global.Emulator.SystemId;
movie.SystemID = emulator.SystemId;
var settable = new SettingsAdapter(Global.Emulator);
var settable = new SettingsAdapter(emulator);
if (settable.HasSyncSettings)
{
movie.SyncSettingsJson = ConfigService.SaveWithType(settable.GetSyncSettings());
}
if (Global.Game != null)
if (game.IsNullInstance())
{
movie.GameName = Global.Game.FilesystemSafeName();
movie.Hash = Global.Game.Hash;
if (Global.Game.FirmwareHash != null)
movie.GameName = game.FilesystemSafeName();
movie.Hash = game.Hash;
if (game.FirmwareHash != null)
{
movie.FirmwareHash = Global.Game.FirmwareHash;
movie.FirmwareHash = game.FirmwareHash;
}
}
else
@ -304,23 +309,23 @@ namespace BizHawk.Client.Common.MovieConversionExtensions
movie.GameName = "NULL";
}
if (Global.Emulator.HasBoardInfo())
if (emulator.HasBoardInfo())
{
movie.BoardName = Global.Emulator.AsBoardInfo().BoardName;
movie.BoardName = emulator.AsBoardInfo().BoardName;
}
if (Global.Emulator.HasRegions())
if (emulator.HasRegions())
{
var region = Global.Emulator.AsRegionable().Region;
var region = emulator.AsRegionable().Region;
if (region == Emulation.Common.DisplayType.PAL)
{
movie.HeaderEntries.Add(HeaderKeys.Pal, "1");
}
}
if (Global.FirmwareManager.RecentlyServed.Any())
if (firmwareManager.RecentlyServed.Any())
{
foreach (var firmware in Global.FirmwareManager.RecentlyServed)
foreach (var firmware in firmwareManager.RecentlyServed)
{
var key = $"{firmware.SystemId}_Firmware_{firmware.FirmwareId}";
@ -331,12 +336,12 @@ namespace BizHawk.Client.Common.MovieConversionExtensions
}
}
if (Global.Emulator is GBHawk gbHawk && gbHawk.IsCGBMode())
if (emulator is GBHawk gbHawk && gbHawk.IsCGBMode())
{
movie.HeaderEntries.Add("IsCGBMode", "1");
}
if (Global.Emulator is Gameboy gb)
if (emulator is Gameboy gb)
{
if (gb.IsCGBMode())
{
@ -346,7 +351,7 @@ namespace BizHawk.Client.Common.MovieConversionExtensions
movie.HeaderEntries.Add(HeaderKeys.CycleCount, "0");
}
if (Global.Emulator is SMS sms)
if (emulator is SMS sms)
{
if (sms.IsSG1000)
{
@ -359,23 +364,23 @@ namespace BizHawk.Client.Common.MovieConversionExtensions
}
}
if (Global.Emulator is GPGX gpgx && gpgx.IsMegaCD)
if (emulator is GPGX gpgx && gpgx.IsMegaCD)
{
movie.HeaderEntries.Add("IsSegaCDMode", "1");
}
if (Global.Emulator is PicoDrive pico && pico.Is32XActive)
if (emulator is PicoDrive pico && pico.Is32XActive)
{
movie.HeaderEntries.Add("Is32X", "1");
}
if (Global.Emulator is SubNESHawk || Global.Emulator is SubGBHawk)
if (emulator is SubNESHawk || emulator is SubGBHawk)
{
movie.HeaderEntries.Add(HeaderKeys.VBlankCount, "0");
}
movie.Core = ((CoreAttribute)Attribute
.GetCustomAttribute(Global.Emulator.GetType(), typeof(CoreAttribute)))
.GetCustomAttribute(emulator.GetType(), typeof(CoreAttribute)))
.CoreName;
}
}

6
BizHawk.Client.EmuHawk/movie/RecordMovie.cs
View File

@ -134,7 +134,11 @@ namespace BizHawk.Client.EmuHawk
movieToRecord.SaveRam = core.CloneSaveRam();
}
movieToRecord.PopulateWithDefaultHeaderValues(AuthorBox.Text);
movieToRecord.PopulateWithDefaultHeaderValues(
_emulator,
Global.Game,
Global.FirmwareManager,
AuthorBox.Text ?? _config.DefaultAuthor);
movieToRecord.Save();
_mainForm.StartNewMovie(movieToRecord, true);

6
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
View File

@ -705,7 +705,11 @@ namespace BizHawk.Client.EmuHawk
CurrentTasMovie.PropertyChanged += TasMovie_OnPropertyChanged;
CurrentTasMovie.Filename = DefaultTasProjName(); // TODO don't do this, take over any mainform actions that can crash without a filename
CurrentTasMovie.PopulateWithDefaultHeaderValues();
CurrentTasMovie.PopulateWithDefaultHeaderValues(
Emulator,
Global.Game,
Global.FirmwareManager,
Config.DefaultAuthor);
SetTasMovieCallbacks();
CurrentTasMovie.ClearChanges(); // Don't ask to save changes here.