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

Ripped out inputlog, for now

This commit is contained in:
andres.delikat 2011-07-22 00:19:25 +00:00
parent 66a854d75b
commit bc2293a482
2 changed files with 1 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BizHawk.MultiClient/MainForm.MenuItems.cs
View File

@ -163,12 +163,6 @@ namespace BizHawk.MultiClient
} }
} }
public void StopInputLog()
{
if (InputLog.Mode == MOVIEMODE.RECORD)
InputLog.StopMovie();
}
private void stopMovieToolStripMenuItem_Click(object sender, EventArgs e) private void stopMovieToolStripMenuItem_Click(object sender, EventArgs e)
{ {
StopUserMovie(); StopUserMovie();

42
BizHawk.MultiClient/MainForm.cs
View File

@ -24,7 +24,6 @@ namespace BizHawk.MultiClient
SavestateManager StateSlots = new SavestateManager(); SavestateManager StateSlots = new SavestateManager();
//Movie variables //Movie variables
public Movie InputLog = new Movie();
public Movie UserMovie = new Movie(); public Movie UserMovie = new Movie();
public bool PressFrameAdvance = false; public bool PressFrameAdvance = false;
@ -105,7 +104,6 @@ namespace BizHawk.MultiClient
Closing += (o, e) => Closing += (o, e) =>
{ {
CloseGame(); CloseGame();
InputLog.StopMovie();
UserMovie.StopMovie(); UserMovie.StopMovie();
SaveConfig(); SaveConfig();
}; };
@ -173,7 +171,6 @@ namespace BizHawk.MultiClient
Movie m = new Movie(cmdMovie, MOVIEMODE.PLAY); Movie m = new Movie(cmdMovie, MOVIEMODE.PLAY);
ReadOnly = true; ReadOnly = true;
StartNewMovie(m, false); StartNewMovie(m, false);
CreateNewInputLog(false);
Global.Config.RecentMovies.Add(cmdMovie); Global.Config.RecentMovies.Add(cmdMovie);
} }
} }
@ -186,13 +183,8 @@ namespace BizHawk.MultiClient
Movie m = new Movie(Global.Config.RecentMovies.GetRecentFileByPosition(0), MOVIEMODE.PLAY); Movie m = new Movie(Global.Config.RecentMovies.GetRecentFileByPosition(0), MOVIEMODE.PLAY);
ReadOnly = true; ReadOnly = true;
StartNewMovie(m, false); StartNewMovie(m, false);
CreateNewInputLog(false);
} }
} }
else
{
CreateNewInputLog(true);
}
if (cmdLoadState != null && Global.Game != null) if (cmdLoadState != null && Global.Game != null)
LoadState("QuickSave" + cmdLoadState); LoadState("QuickSave" + cmdLoadState);
@ -228,16 +220,6 @@ namespace BizHawk.MultiClient
PauseEmulator(); PauseEmulator();
} }
void CreateNewInputLog(bool active)
{
MOVIEMODE m;
if (active)
m = MOVIEMODE.RECORD;
else
m = MOVIEMODE.INACTIVE;
InputLog = new Movie(PathManager.MakeAbsolutePath(Global.Config.MoviesPath, "") + "\\log.tas", m);
}
void SyncCoreInputComm() void SyncCoreInputComm()
{ {
Global.CoreInputComm.NES_BackdropColor = Global.Config.NESBackgroundColor; Global.CoreInputComm.NES_BackdropColor = Global.Config.NESBackgroundColor;
@ -930,15 +912,6 @@ namespace BizHawk.MultiClient
if (File.Exists(game.SaveRamPath)) if (File.Exists(game.SaveRamPath))
LoadSaveRam(); LoadSaveRam();
if (UserMovie.Mode == MOVIEMODE.INACTIVE)
{
InputLog.Header.SetHeaderLine(MovieHeader.PLATFORM, Global.Emulator.SystemId);
InputLog.Header.SetHeaderLine(MovieHeader.GAMENAME, Global.Game.FilesystemSafeName);
InputLog.Header.SetHeaderLine(MovieHeader.GUID, MovieHeader.MakeGUID());
InputLog.Header.SetHeaderLine(MovieHeader.AUTHOR, Global.Config.DefaultAuthor);
CreateNewInputLog(true);
}
//setup the throttle based on platform's specifications //setup the throttle based on platform's specifications
//(one day later for some systems we will need to modify it at runtime as the display mode changes) //(one day later for some systems we will need to modify it at runtime as the display mode changes)
{ {
@ -1043,7 +1016,6 @@ namespace BizHawk.MultiClient
Global.Emulator = new NullEmulator(); Global.Emulator = new NullEmulator();
Global.ActiveController = Global.NullControls; Global.ActiveController = Global.NullControls;
UserMovie.StopMovie(); UserMovie.StopMovie();
InputLog.StopMovie();
} }
void OnSelectSlot(int num) void OnSelectSlot(int num)
@ -1432,7 +1404,6 @@ namespace BizHawk.MultiClient
if (UserMovie.Mode == MOVIEMODE.INACTIVE) if (UserMovie.Mode == MOVIEMODE.INACTIVE)
{ {
UserMovie.LatchInputFromPlayer(); UserMovie.LatchInputFromPlayer();
InputLog.CommitFrame();
} }
if (UserMovie.Mode == MOVIEMODE.PLAY) if (UserMovie.Mode == MOVIEMODE.PLAY)
@ -1541,8 +1512,6 @@ namespace BizHawk.MultiClient
{ {
UserMovie.DumpLogIntoSavestateText(writer); UserMovie.DumpLogIntoSavestateText(writer);
} }
else if (InputLog.Mode != MOVIEMODE.INACTIVE)
InputLog.DumpLogIntoSavestateText(writer);
} }
private void SaveState(string name) private void SaveState(string name)
@ -1664,11 +1633,6 @@ namespace BizHawk.MultiClient
} }
} }
} }
else
{
if (InputLog.Mode == MOVIEMODE.RECORD)
InputLog.LoadLogFromSavestateText(reader);
}
} }
private void LoadStateFile(string path, string name) private void LoadStateFile(string path, string name)
@ -2371,7 +2335,6 @@ namespace BizHawk.MultiClient
{ {
UserMovie = m; UserMovie = m;
InputLog.StopMovie();
LoadRom(Global.MainForm.CurrentlyOpenRom); LoadRom(Global.MainForm.CurrentlyOpenRom);
UserMovie.LoadMovie(); UserMovie.LoadMovie();
Global.Config.RecentMovies.Add(m.Filename); Global.Config.RecentMovies.Add(m.Filename);
@ -2388,12 +2351,11 @@ namespace BizHawk.MultiClient
SetMainformMovieInfo(); SetMainformMovieInfo();
} }
/*TODO: remove this or make usermovie private*/
public Movie GetActiveMovie() public Movie GetActiveMovie()
{ {
if (UserMovie.Mode != MOVIEMODE.INACTIVE) if (UserMovie.Mode != MOVIEMODE.INACTIVE)
return UserMovie; return UserMovie;
else if (InputLog.Mode != MOVIEMODE.INACTIVE)
return InputLog;
else else
return null; return null;
} }
@ -2402,8 +2364,6 @@ namespace BizHawk.MultiClient
{ {
if (UserMovie.Mode != MOVIEMODE.INACTIVE) if (UserMovie.Mode != MOVIEMODE.INACTIVE)
return true; return true;
else if (InputLog.Mode != MOVIEMODE.INACTIVE)
return true;
else else
return false; return false;
} }