cleanup variable naming in IMovieSession
This commit is contained in:
parent
bfd33e5399
commit
880f584674
|
@ -417,9 +417,9 @@ namespace BizHawk.Client.Common
|
||||||
|
|
||||||
// The behavior here is to only temporarily override these settings when playing a movie and then restore the user's preferred settings
|
// The behavior here is to only temporarily override these settings when playing a movie and then restore the user's preferred settings
|
||||||
// A more elegant approach would be appreciated
|
// A more elegant approach would be appreciated
|
||||||
public bool? PreviousNES_InQuickNES { get; set; }
|
public bool? PreviousNesInQuickNES { get; set; }
|
||||||
public bool? PreviousSNES_InSnes9x { get; set; }
|
public bool? PreviousSnesInSnes9x { get; set; }
|
||||||
public bool? PreviousGBA_UsemGBA { get; set; }
|
public bool? PreviousGbaUsemGba { get; set; }
|
||||||
|
|
||||||
/// <exception cref="MoviePlatformMismatchException"><paramref name="record"/> is <see langword="false"/> and <paramref name="movie"/>.<see cref="IMovie.SystemID"/> does not match <paramref name="emulator"/>.<see cref="IEmulator.SystemId"/></exception>
|
/// <exception cref="MoviePlatformMismatchException"><paramref name="record"/> is <see langword="false"/> and <paramref name="movie"/>.<see cref="IMovie.SystemID"/> does not match <paramref name="emulator"/>.<see cref="IEmulator.SystemId"/></exception>
|
||||||
public void QueueNewMovie(IMovie movie, bool record, IEmulator emulator)
|
public void QueueNewMovie(IMovie movie, bool record, IEmulator emulator)
|
||||||
|
@ -447,12 +447,12 @@ namespace BizHawk.Client.Common
|
||||||
// If either is specified use that, else use whatever is currently set
|
// If either is specified use that, else use whatever is currently set
|
||||||
if (movie.Core == quicknesName)
|
if (movie.Core == quicknesName)
|
||||||
{
|
{
|
||||||
PreviousNES_InQuickNES = Global.Config.NesInQuickNes;
|
PreviousNesInQuickNES = Global.Config.NesInQuickNes;
|
||||||
Global.Config.NesInQuickNes = true;
|
Global.Config.NesInQuickNes = true;
|
||||||
}
|
}
|
||||||
else if (movie.Core == neshawkName)
|
else if (movie.Core == neshawkName)
|
||||||
{
|
{
|
||||||
PreviousNES_InQuickNES = Global.Config.NesInQuickNes;
|
PreviousNesInQuickNES = Global.Config.NesInQuickNes;
|
||||||
Global.Config.NesInQuickNes = false;
|
Global.Config.NesInQuickNes = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -463,12 +463,12 @@ namespace BizHawk.Client.Common
|
||||||
|
|
||||||
if (movie.Core == snes9xName)
|
if (movie.Core == snes9xName)
|
||||||
{
|
{
|
||||||
PreviousSNES_InSnes9x = Global.Config.SnesInSnes9x;
|
PreviousSnesInSnes9x = Global.Config.SnesInSnes9x;
|
||||||
Global.Config.SnesInSnes9x = true;
|
Global.Config.SnesInSnes9x = true;
|
||||||
}
|
}
|
||||||
else if (movie.Core == bsnesName)
|
else if (movie.Core == bsnesName)
|
||||||
{
|
{
|
||||||
PreviousSNES_InSnes9x = Global.Config.SnesInSnes9x;
|
PreviousSnesInSnes9x = Global.Config.SnesInSnes9x;
|
||||||
Global.Config.SnesInSnes9x = false;
|
Global.Config.SnesInSnes9x = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -479,12 +479,12 @@ namespace BizHawk.Client.Common
|
||||||
|
|
||||||
if (movie.Core == mGBAName)
|
if (movie.Core == mGBAName)
|
||||||
{
|
{
|
||||||
PreviousGBA_UsemGBA = Global.Config.GbaUsemGba;
|
PreviousGbaUsemGba = Global.Config.GbaUsemGba;
|
||||||
Global.Config.GbaUsemGba = true;
|
Global.Config.GbaUsemGba = true;
|
||||||
}
|
}
|
||||||
else if (movie.Core == vbaNextName)
|
else if (movie.Core == vbaNextName)
|
||||||
{
|
{
|
||||||
PreviousGBA_UsemGBA = Global.Config.GbaUsemGba;
|
PreviousGbaUsemGba = Global.Config.GbaUsemGba;
|
||||||
Global.Config.GbaUsemGba = false;
|
Global.Config.GbaUsemGba = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,9 +17,9 @@ namespace BizHawk.Client.Common
|
||||||
bool ReadOnly { get; set; }
|
bool ReadOnly { get; set; }
|
||||||
bool MovieIsQueued { get; }
|
bool MovieIsQueued { get; }
|
||||||
|
|
||||||
bool? PreviousNES_InQuickNES { get; set; }
|
bool? PreviousNesInQuickNES { get; set; }
|
||||||
bool? PreviousSNES_InSnes9x { get; set; }
|
bool? PreviousSnesInSnes9x { get; set; }
|
||||||
bool? PreviousGBA_UsemGBA { get; set; }
|
bool? PreviousGbaUsemGba { get; set; }
|
||||||
|
|
||||||
void HandleMovieOnFrameLoop();
|
void HandleMovieOnFrameLoop();
|
||||||
void HandleMovieAfterFrameLoop();
|
void HandleMovieAfterFrameLoop();
|
||||||
|
|
|
@ -32,22 +32,22 @@ namespace BizHawk.Client.EmuHawk
|
||||||
|
|
||||||
RebootCore();
|
RebootCore();
|
||||||
|
|
||||||
if (MovieSession.PreviousNES_InQuickNES.HasValue)
|
if (MovieSession.PreviousNesInQuickNES.HasValue)
|
||||||
{
|
{
|
||||||
Config.NesInQuickNes = MovieSession.PreviousNES_InQuickNES.Value;
|
Config.NesInQuickNes = MovieSession.PreviousNesInQuickNES.Value;
|
||||||
MovieSession.PreviousNES_InQuickNES = null;
|
MovieSession.PreviousNesInQuickNES = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (MovieSession.PreviousSNES_InSnes9x.HasValue)
|
if (MovieSession.PreviousSnesInSnes9x.HasValue)
|
||||||
{
|
{
|
||||||
Config.SnesInSnes9x = MovieSession.PreviousSNES_InSnes9x.Value;
|
Config.SnesInSnes9x = MovieSession.PreviousSnesInSnes9x.Value;
|
||||||
MovieSession.PreviousSNES_InSnes9x = null;
|
MovieSession.PreviousSnesInSnes9x = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (MovieSession.PreviousGBA_UsemGBA.HasValue)
|
if (MovieSession.PreviousGbaUsemGba.HasValue)
|
||||||
{
|
{
|
||||||
Config.GbaUsemGba = MovieSession.PreviousGBA_UsemGBA.Value;
|
Config.GbaUsemGba = MovieSession.PreviousGbaUsemGba.Value;
|
||||||
MovieSession.PreviousGBA_UsemGBA = null;
|
MovieSession.PreviousGbaUsemGba = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
Config.RecentMovies.Add(movie.Filename);
|
Config.RecentMovies.Add(movie.Filename);
|
||||||
|
|
Loading…
Reference in New Issue