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

small tastudio progress

This commit is contained in:
adelikat 2014-07-08 13:33:01 +00:00
parent 5787ed4563
commit 863d6f09ee
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Client.Common/movie/bk2/Bk2Movie.ModeApi.cs
View File

@ -27,7 +27,7 @@ namespace BizHawk.Client.Common
get { return _mode == Moviemode.Finished; }
}
public void StartNewRecording()
public virtual void StartNewRecording()
{
_mode = Moviemode.Record;
if (Global.Config.EnableBackupMovies && _makeBackup && _log.Any())

7
BizHawk.Client.Common/movie/tasproj/TasMovie.cs
View File

@ -41,5 +41,12 @@ namespace BizHawk.Client.Common
};
}
}
public override void StartNewRecording()
{
LagLog.Clear();
StateManager.Clear();
base.StartNewRecording();
}
}
}

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

@ -180,6 +180,7 @@ namespace BizHawk.Client.EmuHawk
private void Tastudio_Load(object sender, EventArgs e)
{
// Start Scenario 1: A regular movie is active
if (Global.MovieSession.Movie.IsActive && !(Global.MovieSession.Movie is TasMovie))
{
var result = MessageBox.Show("In order to use Tastudio, a new project must be created from the current movie\nThe current movie will be saved and closed, and a new project file will be created\nProceed?", "Convert movie", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
@ -196,16 +197,22 @@ namespace BizHawk.Client.EmuHawk
return;
}
}
// Start Scenario 2: A tasproj is already active
else if (Global.MovieSession.Movie.IsActive && Global.MovieSession.Movie is TasMovie)
{
_tas = Global.MovieSession.Movie as TasMovie;
}
// Start Scenario 3: No movie, but user wants to autload their last project
else if (Global.Config.AutoloadTAStudioProject)
{
Global.MovieSession.Movie = new TasMovie();
_tas = Global.MovieSession.Movie as TasMovie;
LoadFileFromRecent(Global.Config.RecentTas[0]);
}
// Start Scenario 4: No movie, default behavior of engaging tastudio with a new default project
else
{
EngageTasStudio();
@ -219,17 +226,14 @@ namespace BizHawk.Client.EmuHawk
{
GlobalWin.OSD.AddMessage("TAStudio engaged");
Global.MovieSession.Movie = newMovie ?? new TasMovie();
_tas = Global.MovieSession.Movie as TasMovie;
_tas.StartNewRecording();
GlobalWin.MainForm.StartNewMovie(_tas, record: true);
StartNewSession();
}
private void StartNewSession()
{
if (AskSave())
{
GlobalWin.OSD.AddMessage("new TAStudio session started");
_tas.StartNewRecording();
GlobalWin.MainForm.StartNewMovie(_tas, record: true);
TasView.ItemCount = _tas.InputLogLength;
@ -374,6 +378,7 @@ namespace BizHawk.Client.EmuHawk
private void NewTasMenuItem_Click(object sender, EventArgs e)
{
GlobalWin.OSD.AddMessage("new TAStudio session started");
StartNewSession();
}