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

Small fixups to movie & tastudio code

This commit is contained in:
andres.delikat 2011-06-12 18:31:42 +00:00
parent 59173e4e44
commit f36da18f97
5 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
BizHawk.MultiClient/movie/Movie.cs
View File

@ -85,9 +85,9 @@ namespace BizHawk.MultiClient
{ {
Log.Truncate(Global.Emulator.Frame); Log.Truncate(Global.Emulator.Frame);
} }
if (Global.MainForm.TAStudio1.Engaged) // if (Global.MainForm.TAStudio1.Engaged)
Log.AddFrame(Global.MainForm.TAStudio1.GetMnemonic()); // Log.AddFrame(Global.MainForm.TAStudio1.GetMnemonic());
else // else
Log.AddFrame(Global.ActiveController.GetControllersAsMnemonic()); Log.AddFrame(Global.ActiveController.GetControllersAsMnemonic());
} }
} }
@ -102,12 +102,12 @@ namespace BizHawk.MultiClient
} }
//Movie editing tools may like to have something like this //Movie editing tools may like to have something like this
public void AddFrame(string record) public void AppendFrame(string record)
{ {
Log.AddFrame(record); Log.AddFrame(record);
} }
public void AddFrameAt(string record, int frame) public void InsertFrame(string record, int frame)
{ {
Log.AddFrameAt(record, frame); Log.AddFrameAt(record, frame);
} }

4
BizHawk.MultiClient/movie/MovieConvert.cs
View File

@ -113,7 +113,7 @@ namespace BizHawk.MultiClient
frame += "|"; frame += "|";
r.ReadBytes(3); //Lose remaining controllers for now r.ReadBytes(3); //Lose remaining controllers for now
m.AddFrame(frame); m.AppendFrame(frame);
} }
@ -236,7 +236,7 @@ namespace BizHawk.MultiClient
frame += start; frame += start;
frame += ".|"; frame += ".|";
m.AddFrame(frame); m.AppendFrame(frame);
} }
m.WriteMovie(); m.WriteMovie();
return m; return m;

3
BizHawk.MultiClient/tools/TAStudio.Designer.cs generated
View File

@ -354,7 +354,7 @@
this.toolStripSeparator4}); this.toolStripSeparator4});
this.toolStrip2.Location = new System.Drawing.Point(3, 25); this.toolStrip2.Location = new System.Drawing.Point(3, 25);
this.toolStrip2.Name = "toolStrip2"; this.toolStrip2.Name = "toolStrip2";
this.toolStrip2.Size = new System.Drawing.Size(62, 25); this.toolStrip2.Size = new System.Drawing.Size(93, 25);
this.toolStrip2.TabIndex = 1; this.toolStrip2.TabIndex = 1;
// //
// StopButton // StopButton
@ -375,6 +375,7 @@
this.PlayMovieFromBeginning.Size = new System.Drawing.Size(23, 22); this.PlayMovieFromBeginning.Size = new System.Drawing.Size(23, 22);
this.PlayMovieFromBeginning.Text = "|"; this.PlayMovieFromBeginning.Text = "|";
this.PlayMovieFromBeginning.ToolTipText = "Rewind to Beginning"; this.PlayMovieFromBeginning.ToolTipText = "Rewind to Beginning";
this.PlayMovieFromBeginning.Click += new System.EventHandler(this.PlayMovieFromBeginning_Click);
// //
// toolStripSeparator4 // toolStripSeparator4
// //

10
BizHawk.MultiClient/tools/TAStudio.cs
View File

@ -11,6 +11,10 @@ namespace BizHawk.MultiClient
{ {
public partial class TAStudio : Form public partial class TAStudio : Form
{ {
//TODO:
//Right-click - Go to current frame
//Clicking a frame should go there
int defaultWidth; //For saving the default size of the dialog, so the user can restore if desired int defaultWidth; //For saving the default size of the dialog, so the user can restore if desired
int defaultHeight; int defaultHeight;
@ -80,6 +84,7 @@ namespace BizHawk.MultiClient
private void SaveConfigSettings() private void SaveConfigSettings()
{ {
Engaged = false;
Global.Config.TASWndx = this.Location.X; Global.Config.TASWndx = this.Location.X;
Global.Config.TASWndy = this.Location.Y; Global.Config.TASWndy = this.Location.Y;
Global.Config.TASWidth = this.Right - this.Left; Global.Config.TASWidth = this.Right - this.Left;
@ -186,5 +191,10 @@ namespace BizHawk.MultiClient
if (Global.MainForm.ReadOnly) if (Global.MainForm.ReadOnly)
return; return;
} }
private void PlayMovieFromBeginning_Click(object sender, EventArgs e)
{
}
} }
} }

3
BizHawk.MultiClient/tools/TAStudio.resx
View File

@ -145,9 +145,6 @@
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>324, 17</value> <value>324, 17</value>
</metadata> </metadata>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>324, 17</value>
</metadata>
<metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>416, 17</value> <value>416, 17</value>
</metadata> </metadata>