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

Use `Movie.NotActive` extension instead of negated `IsActive`

This commit is contained in:
YoshiRulz 2022-11-07 06:10:37 +10:00
parent 84cc71e454
commit 948084a97e
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
6 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BizHawk.Client.Common/movie/MovieSession.cs
View File

@ -64,7 +64,7 @@ namespace BizHawk.Client.Common
public void HandleFrameBefore()
{
if (!Movie.IsActive())
if (Movie.NotActive())
{
LatchInputToUser();
}

8
src/BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -1251,7 +1251,7 @@ namespace BizHawk.Client.EmuHawk
return;
}
const int DONT_PROMPT_BEFORE_FRAME = 2 * 60 * 60; // 2 min @ 60 fps
if (!MovieSession.Movie.IsActive() && Emulator.Frame > DONT_PROMPT_BEFORE_FRAME // if playing casually (not recording) AND played for enough frames (prompting always would be annoying)...
if (MovieSession.Movie.NotActive() && Emulator.Frame > DONT_PROMPT_BEFORE_FRAME // if playing casually (not recording) AND played for enough frames (prompting always would be annoying)...
&& !this.ModalMessageBox2("This will reload the rom without saving. Launch TAStudio anyway?", "Confirmation")) // ...AND user responds "No" to "Open TAStudio?", then cancel
{
return;
@ -1326,11 +1326,9 @@ namespace BizHawk.Client.EmuHawk
|| (Emulator is SubNESHawk sub && sub.IsVs);
NESSoundChannelsMenuItem.Enabled = Tools.IsAvailable<NESSoundConfig>();
MovieSettingsMenuItem.Enabled = (Emulator is NES || Emulator is SubNESHawk)
&& !MovieSession.Movie.IsActive();
MovieSettingsMenuItem.Enabled = Emulator is NES or SubNESHawk && MovieSession.Movie.NotActive();
NesControllerSettingsMenuItem.Enabled = Tools.IsAvailable<NesControllerSettings>()
&& !MovieSession.Movie.IsActive();
NesControllerSettingsMenuItem.Enabled = Tools.IsAvailable<NesControllerSettings>() && MovieSession.Movie.NotActive();
BarcodeReaderMenuItem.Enabled = ServiceInjector.IsAvailable(Emulator.ServiceProvider, typeof(BarcodeEntry));

2
src/BizHawk.Client.EmuHawk/MainForm.Movie.cs
View File

@ -75,7 +75,7 @@ namespace BizHawk.Client.EmuHawk
PlayRecordStatusButton.ToolTipText = "Movie is in record mode";
PlayRecordStatusButton.Visible = true;
}
else if (!MovieSession.Movie.IsActive())
else if (MovieSession.Movie.NotActive())
{
PlayRecordStatusButton.Image = Properties.Resources.Blank;
PlayRecordStatusButton.ToolTipText = "No movie is active";

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

@ -4006,7 +4006,7 @@ namespace BizHawk.Client.EmuHawk
Config.PutCoreSettings(settable.GetSettings(), t);
}
if (settable.HasSyncSettings && !MovieSession.Movie.IsActive())
if (settable.HasSyncSettings && MovieSession.Movie.NotActive())
{
// don't trample config with loaded-from-movie settings
Config.PutCoreSyncSettings(settable.GetSyncSettings(), t);

2
src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs
View File

@ -125,7 +125,7 @@ namespace BizHawk.Client.EmuHawk
{
// Movie recording must be active (check TAStudio because opening a project re-loads the ROM,
// which resets tools before the movie session becomes active)
if (!CurrentMovie.IsActive() && !Tools.IsLoaded<TAStudio>())
if (CurrentMovie.NotActive() && !Tools.IsLoaded<TAStudio>())
{
DialogController.ShowMessageBox("In order to use this tool you must be recording a movie.");
Close();

2
src/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs
View File

@ -41,7 +41,7 @@ namespace BizHawk.Client.EmuHawk
{
// Movie recording must be active (check TAStudio because opening a project re-loads the ROM,
// which resets tools before the movie session becomes active)
if (!CurrentMovie.IsActive() && !Tools.IsLoaded<TAStudio>())
if (CurrentMovie.NotActive() && !Tools.IsLoaded<TAStudio>())
{
DialogController.ShowMessageBox("In order to use this tool you must be recording a movie.");
Close();