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

TAStudio - stuff

This commit is contained in:
adelikat 2014-07-13 14:13:20 +00:00
parent 3e37207617
commit 6b1bfc2d4a
10 changed files with 103 additions and 299 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,9 +13,11 @@ namespace BizHawk.Client.Common
{
private List<bool> LagLog = new List<bool>();
private readonly TasStateManager StateManager = new TasStateManager();
private readonly TasMovieMarkerList Markers = new TasMovieMarkerList();
public TasMovie(string path) : base(path) { }
public TasMovie(string path) : base(path)
{
Markers = new TasMovieMarkerList();
}
public TasMovie()
: base()
@ -30,6 +32,8 @@ namespace BizHawk.Client.Common
public new const string Extension = "tasproj";
public TasMovieMarkerList Markers { get; set; }
public TasMovieRecord this[int index]
{
get
@ -56,16 +60,6 @@ namespace BizHawk.Client.Common
base.StartNewRecording();
}
public void Marker(int frame, string message)
{
Markers.Add(frame, message);
}
public void DeleteMarker(int frame)
{
Markers.Remove(frame);
}
/// <summary>
/// Removes lag log and greenzone after this frame
/// </summary>

16
BizHawk.Client.Common/movie/tasproj/TasMovieMarker.cs
View File

@ -121,5 +121,21 @@ namespace BizHawk.Client.Common
this.Remove(existingItem);
}
}
public TasMovieMarker Previous(int currentFrame)
{
return this
.Where(m => m.Frame < currentFrame)
.OrderBy(m => m.Frame)
.Last();
}
public TasMovieMarker Next(int currentFrame)
{
return this
.Where(m => m.Frame > currentFrame)
.OrderBy(m => m.Frame)
.First();
}
}
}

9
BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
View File

@ -885,12 +885,6 @@
<Compile Include="tools\TAStudio\RecorderBox.Designer.cs">
<DependentUpon>RecorderBox.cs</DependentUpon>
</Compile>
<Compile Include="tools\TAStudio\SplicerBox.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="tools\TAStudio\SplicerBox.Designer.cs">
<DependentUpon>SplicerBox.cs</DependentUpon>
</Compile>
<Compile Include="tools\TAStudio\TAStudio.cs">
<SubType>Form</SubType>
</Compile>
@ -1291,9 +1285,6 @@
<EmbeddedResource Include="tools\TAStudio\RecorderBox.resx">
<DependentUpon>RecorderBox.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="tools\TAStudio\SplicerBox.resx">
<DependentUpon>SplicerBox.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="tools\TAStudio\TAStudio.resx">
<DependentUpon>TAStudio.cs</DependentUpon>
</EmbeddedResource>

66
BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.Designer.cs generated
View File

@ -28,47 +28,63 @@
/// </summary>
private void InitializeComponent()
{
this.MarkerLabel = new System.Windows.Forms.Label();
this.MarkerBox = new System.Windows.Forms.TextBox();
this.MarkerView = new BizHawk.Client.EmuHawk.VirtualListView();
this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.SuspendLayout();
//
// MarkerLabel
// MarkerView
//
this.MarkerLabel.AutoSize = true;
this.MarkerLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.MarkerLabel.ForeColor = System.Drawing.Color.DeepSkyBlue;
this.MarkerLabel.Location = new System.Drawing.Point(0, 4);
this.MarkerLabel.Name = "MarkerLabel";
this.MarkerLabel.Size = new System.Drawing.Size(100, 16);
this.MarkerLabel.TabIndex = 5;
this.MarkerLabel.Text = "Marker 99999";
//
// MarkerBox
//
this.MarkerBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
this.MarkerView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.MarkerBox.Location = new System.Drawing.Point(103, 1);
this.MarkerBox.Name = "MarkerBox";
this.MarkerBox.Size = new System.Drawing.Size(188, 20);
this.MarkerBox.TabIndex = 5;
this.MarkerView.BlazingFast = false;
this.MarkerView.CheckBoxes = true;
this.MarkerView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.columnHeader1,
this.columnHeader2});
this.MarkerView.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.MarkerView.FullRowSelect = true;
this.MarkerView.GridLines = true;
this.MarkerView.HideSelection = false;
this.MarkerView.ItemCount = 0;
this.MarkerView.Location = new System.Drawing.Point(3, 0);
this.MarkerView.Name = "MarkerView";
this.MarkerView.SelectAllInProgress = false;
this.MarkerView.selectedItem = -1;
this.MarkerView.Size = new System.Drawing.Size(198, 209);
this.MarkerView.TabIndex = 5;
this.MarkerView.TabStop = false;
this.MarkerView.UseCompatibleStateImageBehavior = false;
this.MarkerView.View = System.Windows.Forms.View.Details;
//
// columnHeader1
//
this.columnHeader1.Text = "Frame";
this.columnHeader1.Width = 64;
//
// columnHeader2
//
this.columnHeader2.Text = "Label";
this.columnHeader2.Width = 113;
//
// MarkerControl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.MarkerBox);
this.Controls.Add(this.MarkerLabel);
this.Controls.Add(this.MarkerView);
this.Name = "MarkerControl";
this.Size = new System.Drawing.Size(292, 24);
this.Size = new System.Drawing.Size(204, 215);
this.Load += new System.EventHandler(this.MarkerControl_Load);
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.Label MarkerLabel;
private System.Windows.Forms.TextBox MarkerBox;
private VirtualListView MarkerView;
public System.Windows.Forms.ColumnHeader columnHeader1;
private System.Windows.Forms.ColumnHeader columnHeader2;
}
}

28
BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs
View File

@ -13,14 +13,42 @@ namespace BizHawk.Client.EmuHawk
{
public partial class MarkerControl : UserControl
{
public TasMovieMarkerList Markers {get; set; }
public MarkerControl()
{
InitializeComponent();
MarkerView.QueryItemBkColor += MarkerView_QueryItemBkColor;
MarkerView.QueryItemText += MarkerView_QueryItemText;
}
private void MarkerControl_Load(object sender, EventArgs e)
{
}
public void UpdateValues()
{
Refresh();
}
private void MarkerView_QueryItemBkColor(int index, int column, ref Color color)
{
}
private void MarkerView_QueryItemText(int index, int column, out string text)
{
text = "";
if (column == 0)
{
text = Markers[index].Frame.ToString();
}
else if (column == 1)
{
text = Markers[index].Message;
}
}
}
}

114
BizHawk.Client.EmuHawk/tools/TAStudio/SplicerBox.Designer.cs generated
View File

@ -1,114 +0,0 @@
namespace BizHawk.Client.EmuHawk
{
partial class SplicerBox
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Component Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.SplicerGroupBox = new System.Windows.Forms.GroupBox();
this.ClipboardStatsLabel = new System.Windows.Forms.Label();
this.SelectionStatsLabel = new System.Windows.Forms.Label();
this.ClipboardNameLabel = new System.Windows.Forms.Label();
this.SelectionNameLabel = new System.Windows.Forms.Label();
this.SplicerGroupBox.SuspendLayout();
this.SuspendLayout();
//
// SplicerGroupBox
//
this.SplicerGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.SplicerGroupBox.Controls.Add(this.ClipboardStatsLabel);
this.SplicerGroupBox.Controls.Add(this.SelectionStatsLabel);
this.SplicerGroupBox.Controls.Add(this.ClipboardNameLabel);
this.SplicerGroupBox.Controls.Add(this.SelectionNameLabel);
this.SplicerGroupBox.Location = new System.Drawing.Point(3, 3);
this.SplicerGroupBox.Name = "SplicerGroupBox";
this.SplicerGroupBox.Size = new System.Drawing.Size(198, 59);
this.SplicerGroupBox.TabIndex = 0;
this.SplicerGroupBox.TabStop = false;
this.SplicerGroupBox.Text = "Splicer";
//
// ClipboardStatsLabel
//
this.ClipboardStatsLabel.AutoSize = true;
this.ClipboardStatsLabel.Enabled = false;
this.ClipboardStatsLabel.Location = new System.Drawing.Point(66, 33);
this.ClipboardStatsLabel.Name = "ClipboardStatsLabel";
this.ClipboardStatsLabel.Size = new System.Drawing.Size(35, 13);
this.ClipboardStatsLabel.TabIndex = 3;
this.ClipboardStatsLabel.Text = "empty";
//
// SelectionStatsLabel
//
this.SelectionStatsLabel.AutoSize = true;
this.SelectionStatsLabel.Enabled = false;
this.SelectionStatsLabel.Location = new System.Drawing.Point(66, 16);
this.SelectionStatsLabel.Name = "SelectionStatsLabel";
this.SelectionStatsLabel.Size = new System.Drawing.Size(87, 13);
this.SelectionStatsLabel.TabIndex = 2;
this.SelectionStatsLabel.Text = "1 row, 8 columns";
//
// ClipboardNameLabel
//
this.ClipboardNameLabel.AutoSize = true;
this.ClipboardNameLabel.Location = new System.Drawing.Point(6, 33);
this.ClipboardNameLabel.Name = "ClipboardNameLabel";
this.ClipboardNameLabel.Size = new System.Drawing.Size(54, 13);
this.ClipboardNameLabel.TabIndex = 1;
this.ClipboardNameLabel.Text = "Clipboard:";
//
// SelectionNameLabel
//
this.SelectionNameLabel.AutoSize = true;
this.SelectionNameLabel.Location = new System.Drawing.Point(6, 16);
this.SelectionNameLabel.Name = "SelectionNameLabel";
this.SelectionNameLabel.Size = new System.Drawing.Size(54, 13);
this.SelectionNameLabel.TabIndex = 0;
this.SelectionNameLabel.Text = "Selection:";
//
// SplicerBox
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.SplicerGroupBox);
this.Name = "SplicerBox";
this.Size = new System.Drawing.Size(204, 65);
this.SplicerGroupBox.ResumeLayout(false);
this.SplicerGroupBox.PerformLayout();
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.GroupBox SplicerGroupBox;
private System.Windows.Forms.Label ClipboardStatsLabel;
private System.Windows.Forms.Label SelectionStatsLabel;
private System.Windows.Forms.Label ClipboardNameLabel;
private System.Windows.Forms.Label SelectionNameLabel;
}
}

19
BizHawk.Client.EmuHawk/tools/TAStudio/SplicerBox.cs
View File

@ -1,19 +0,0 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Data;
using System.Linq;
using System.Text;
using System.Windows.Forms;
namespace BizHawk.Client.EmuHawk
{
public partial class SplicerBox : UserControl
{
public SplicerBox()
{
InitializeComponent();
}
}
}

120
BizHawk.Client.EmuHawk/tools/TAStudio/SplicerBox.resx
View File

@ -1,120 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

11
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs generated
View File

@ -107,6 +107,7 @@ namespace BizHawk.Client.EmuHawk
this.MessageStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
this.SplicerStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
this.TasPlaybackBox = new BizHawk.Client.EmuHawk.PlaybackBox();
this.MarkerControl = new BizHawk.Client.EmuHawk.MarkerControl();
this.TASMenu.SuspendLayout();
this.TasStatusStrip.SuspendLayout();
this.SuspendLayout();
@ -735,11 +736,20 @@ namespace BizHawk.Client.EmuHawk
this.TasPlaybackBox.Size = new System.Drawing.Size(204, 120);
this.TasPlaybackBox.TabIndex = 5;
//
// MarkerControl
//
this.MarkerControl.Location = new System.Drawing.Point(302, 151);
this.MarkerControl.Markers = null;
this.MarkerControl.Name = "MarkerControl";
this.MarkerControl.Size = new System.Drawing.Size(204, 215);
this.MarkerControl.TabIndex = 6;
//
// TAStudio
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(506, 519);
this.Controls.Add(this.MarkerControl);
this.Controls.Add(this.TasPlaybackBox);
this.Controls.Add(this.TasStatusStrip);
this.Controls.Add(this.TASMenu);
@ -839,5 +849,6 @@ namespace BizHawk.Client.EmuHawk
private System.Windows.Forms.ToolStripMenuItem CommentsMenuItem;
private System.Windows.Forms.ToolStripMenuItem SubtitlesMenuItem;
private System.Windows.Forms.ToolStripMenuItem GreenzoneSettingsMenuItem;
private MarkerControl MarkerControl;
}
}

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

@ -145,6 +145,7 @@ namespace BizHawk.Client.EmuHawk
GlobalWin.MainForm.PauseEmulator();
GlobalWin.MainForm.RelinquishControl(this);
_originalRewindStatus = Global.Rewinder.RewindActive;
MarkerControl.Markers = _tas.Markers;
GlobalWin.MainForm.EnableRewind(false);
}