Add Capture OSD menu item to the AVI sub-menu, toggling turns on/off the OSD in AVI capture
This commit is contained in:
parent
e10e351e03
commit
7bf325cb81
|
@ -181,6 +181,7 @@ namespace BizHawk.MultiClient
|
|||
public bool SkipLagFrame = false;
|
||||
public string MovieExtension = "bkm";
|
||||
public bool SupressAskSave = false;
|
||||
public bool AVI_CaptureOSD = false;
|
||||
|
||||
// Run-Control settings
|
||||
public int FrameProgressDelayMs = 500; //how long until a frame advance hold turns into a frame progress?
|
||||
|
|
|
@ -106,6 +106,7 @@
|
|||
this.rebootCoreToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
|
||||
this.resetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.hardResetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.viewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.windowFilterMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.DisplayFilterNoneMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
|
@ -284,7 +285,8 @@
|
|||
this.cmiScreenshotClipboard = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.cmiCloseRom = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.cmiShowMenu = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.hardResetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.toolStripSeparator19 = new System.Windows.Forms.ToolStripSeparator();
|
||||
this.captureOSDToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||
this.menuStrip1.SuspendLayout();
|
||||
this.StatusSlot0.SuspendLayout();
|
||||
this.contextMenuStrip1.SuspendLayout();
|
||||
|
@ -341,7 +343,7 @@
|
|||
//
|
||||
this.openROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile;
|
||||
this.openROMToolStripMenuItem.Name = "openROMToolStripMenuItem";
|
||||
this.openROMToolStripMenuItem.Size = new System.Drawing.Size(140, 22);
|
||||
this.openROMToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
|
||||
this.openROMToolStripMenuItem.Text = "Open ROM";
|
||||
this.openROMToolStripMenuItem.Click += new System.EventHandler(this.openROMToolStripMenuItem_Click);
|
||||
//
|
||||
|
@ -354,7 +356,7 @@
|
|||
this.autoloadMostRecentToolStripMenuItem});
|
||||
this.recentROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent;
|
||||
this.recentROMToolStripMenuItem.Name = "recentROMToolStripMenuItem";
|
||||
this.recentROMToolStripMenuItem.Size = new System.Drawing.Size(140, 22);
|
||||
this.recentROMToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
|
||||
this.recentROMToolStripMenuItem.Text = "Recent ROM";
|
||||
this.recentROMToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentROMToolStripMenuItem_DropDownOpened);
|
||||
//
|
||||
|
@ -387,14 +389,14 @@
|
|||
//
|
||||
this.closeROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Close;
|
||||
this.closeROMToolStripMenuItem.Name = "closeROMToolStripMenuItem";
|
||||
this.closeROMToolStripMenuItem.Size = new System.Drawing.Size(140, 22);
|
||||
this.closeROMToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
|
||||
this.closeROMToolStripMenuItem.Text = "&Close ROM";
|
||||
this.closeROMToolStripMenuItem.Click += new System.EventHandler(this.closeROMToolStripMenuItem_Click);
|
||||
//
|
||||
// toolStripMenuItem1
|
||||
//
|
||||
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
|
||||
this.toolStripMenuItem1.Size = new System.Drawing.Size(137, 6);
|
||||
this.toolStripMenuItem1.Size = new System.Drawing.Size(149, 6);
|
||||
//
|
||||
// saveStateToolStripMenuItem
|
||||
//
|
||||
|
@ -412,7 +414,7 @@
|
|||
this.toolStripSeparator6,
|
||||
this.saveNamedStateToolStripMenuItem});
|
||||
this.saveStateToolStripMenuItem.Name = "saveStateToolStripMenuItem";
|
||||
this.saveStateToolStripMenuItem.Size = new System.Drawing.Size(140, 22);
|
||||
this.saveStateToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
|
||||
this.saveStateToolStripMenuItem.Text = "Save State";
|
||||
this.saveStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveStateToolStripMenuItem_DropDownOpened);
|
||||
//
|
||||
|
@ -516,7 +518,7 @@
|
|||
this.toolStripSeparator21,
|
||||
this.autoLoadLastSlotToolStripMenuItem});
|
||||
this.loadStateToolStripMenuItem.Name = "loadStateToolStripMenuItem";
|
||||
this.loadStateToolStripMenuItem.Size = new System.Drawing.Size(140, 22);
|
||||
this.loadStateToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
|
||||
this.loadStateToolStripMenuItem.Text = "Load State";
|
||||
this.loadStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.loadStateToolStripMenuItem_DropDownOpened);
|
||||
//
|
||||
|
@ -633,7 +635,7 @@
|
|||
this.saveToCurrentSlotToolStripMenuItem,
|
||||
this.loadCurrentSlotToolStripMenuItem});
|
||||
this.saveSlotToolStripMenuItem.Name = "saveSlotToolStripMenuItem";
|
||||
this.saveSlotToolStripMenuItem.Size = new System.Drawing.Size(140, 22);
|
||||
this.saveSlotToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
|
||||
this.saveSlotToolStripMenuItem.Text = "SaveSlot";
|
||||
this.saveSlotToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveSlotToolStripMenuItem_DropDownOpened);
|
||||
//
|
||||
|
@ -745,7 +747,7 @@
|
|||
// toolStripMenuItem2
|
||||
//
|
||||
this.toolStripMenuItem2.Name = "toolStripMenuItem2";
|
||||
this.toolStripMenuItem2.Size = new System.Drawing.Size(137, 6);
|
||||
this.toolStripMenuItem2.Size = new System.Drawing.Size(149, 6);
|
||||
//
|
||||
// movieToolStripMenuItem
|
||||
//
|
||||
|
@ -762,7 +764,7 @@
|
|||
this.bindSavestatesToMoviesToolStripMenuItem,
|
||||
this.automaticallyBackupMoviesToolStripMenuItem});
|
||||
this.movieToolStripMenuItem.Name = "movieToolStripMenuItem";
|
||||
this.movieToolStripMenuItem.Size = new System.Drawing.Size(140, 22);
|
||||
this.movieToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
|
||||
this.movieToolStripMenuItem.Text = "Movie";
|
||||
this.movieToolStripMenuItem.DropDownOpened += new System.EventHandler(this.movieToolStripMenuItem_DropDownOpened);
|
||||
//
|
||||
|
@ -878,9 +880,11 @@
|
|||
//
|
||||
this.AVIWAVToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||
this.recordAVIToolStripMenuItem,
|
||||
this.stopAVIToolStripMenuItem});
|
||||
this.stopAVIToolStripMenuItem,
|
||||
this.toolStripSeparator19,
|
||||
this.captureOSDToolStripMenuItem});
|
||||
this.AVIWAVToolStripMenuItem.Name = "AVIWAVToolStripMenuItem";
|
||||
this.AVIWAVToolStripMenuItem.Size = new System.Drawing.Size(140, 22);
|
||||
this.AVIWAVToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
|
||||
this.AVIWAVToolStripMenuItem.Text = "AVI/WAV";
|
||||
this.AVIWAVToolStripMenuItem.DropDownOpened += new System.EventHandler(this.aVIWAVToolStripMenuItem_DropDownOpened);
|
||||
//
|
||||
|
@ -910,7 +914,7 @@
|
|||
this.makeAnimatedGIFToolStripMenuItem,
|
||||
this.makeAnimatedGifAsToolStripMenuItem});
|
||||
this.screenshotToolStripMenuItem.Name = "screenshotToolStripMenuItem";
|
||||
this.screenshotToolStripMenuItem.Size = new System.Drawing.Size(140, 22);
|
||||
this.screenshotToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
|
||||
this.screenshotToolStripMenuItem.Text = "Screenshot";
|
||||
//
|
||||
// screenshotF12ToolStripMenuItem
|
||||
|
@ -960,13 +964,13 @@
|
|||
// toolStripSeparator4
|
||||
//
|
||||
this.toolStripSeparator4.Name = "toolStripSeparator4";
|
||||
this.toolStripSeparator4.Size = new System.Drawing.Size(137, 6);
|
||||
this.toolStripSeparator4.Size = new System.Drawing.Size(149, 6);
|
||||
//
|
||||
// exitToolStripMenuItem
|
||||
//
|
||||
this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
|
||||
this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4)));
|
||||
this.exitToolStripMenuItem.Size = new System.Drawing.Size(140, 22);
|
||||
this.exitToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
|
||||
this.exitToolStripMenuItem.Text = "Exit";
|
||||
this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
|
||||
//
|
||||
|
@ -987,7 +991,7 @@
|
|||
//
|
||||
this.pauseToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Pause;
|
||||
this.pauseToolStripMenuItem.Name = "pauseToolStripMenuItem";
|
||||
this.pauseToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
|
||||
this.pauseToolStripMenuItem.Size = new System.Drawing.Size(140, 22);
|
||||
this.pauseToolStripMenuItem.Text = "&Pause";
|
||||
this.pauseToolStripMenuItem.Click += new System.EventHandler(this.pauseToolStripMenuItem_Click);
|
||||
//
|
||||
|
@ -995,22 +999,29 @@
|
|||
//
|
||||
this.rebootCoreToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.reboot;
|
||||
this.rebootCoreToolStripMenuItem.Name = "rebootCoreToolStripMenuItem";
|
||||
this.rebootCoreToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
|
||||
this.rebootCoreToolStripMenuItem.Size = new System.Drawing.Size(140, 22);
|
||||
this.rebootCoreToolStripMenuItem.Text = "&Reboot Core";
|
||||
this.rebootCoreToolStripMenuItem.Click += new System.EventHandler(this.powerToolStripMenuItem_Click);
|
||||
//
|
||||
// toolStripSeparator1
|
||||
//
|
||||
this.toolStripSeparator1.Name = "toolStripSeparator1";
|
||||
this.toolStripSeparator1.Size = new System.Drawing.Size(149, 6);
|
||||
this.toolStripSeparator1.Size = new System.Drawing.Size(137, 6);
|
||||
//
|
||||
// resetToolStripMenuItem
|
||||
//
|
||||
this.resetToolStripMenuItem.Name = "resetToolStripMenuItem";
|
||||
this.resetToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
|
||||
this.resetToolStripMenuItem.Size = new System.Drawing.Size(140, 22);
|
||||
this.resetToolStripMenuItem.Text = "&Soft Reset";
|
||||
this.resetToolStripMenuItem.Click += new System.EventHandler(this.resetToolStripMenuItem_Click);
|
||||
//
|
||||
// hardResetToolStripMenuItem
|
||||
//
|
||||
this.hardResetToolStripMenuItem.Name = "hardResetToolStripMenuItem";
|
||||
this.hardResetToolStripMenuItem.Size = new System.Drawing.Size(140, 22);
|
||||
this.hardResetToolStripMenuItem.Text = "&Hard Reset";
|
||||
this.hardResetToolStripMenuItem.Click += new System.EventHandler(this.hardResetToolStripMenuItem_Click);
|
||||
//
|
||||
// viewToolStripMenuItem
|
||||
//
|
||||
this.viewToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
|
||||
|
@ -2447,12 +2458,17 @@
|
|||
this.cmiShowMenu.Text = "Show Menu";
|
||||
this.cmiShowMenu.Click += new System.EventHandler(this.showMenuToolStripMenuItem_Click);
|
||||
//
|
||||
// hardResetToolStripMenuItem
|
||||
// toolStripSeparator19
|
||||
//
|
||||
this.hardResetToolStripMenuItem.Name = "hardResetToolStripMenuItem";
|
||||
this.hardResetToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
|
||||
this.hardResetToolStripMenuItem.Text = "&Hard Reset";
|
||||
this.hardResetToolStripMenuItem.Click += new System.EventHandler(this.hardResetToolStripMenuItem_Click);
|
||||
this.toolStripSeparator19.Name = "toolStripSeparator19";
|
||||
this.toolStripSeparator19.Size = new System.Drawing.Size(160, 6);
|
||||
//
|
||||
// captureOSDToolStripMenuItem
|
||||
//
|
||||
this.captureOSDToolStripMenuItem.Name = "captureOSDToolStripMenuItem";
|
||||
this.captureOSDToolStripMenuItem.Size = new System.Drawing.Size(163, 22);
|
||||
this.captureOSDToolStripMenuItem.Text = "Capture OSD";
|
||||
this.captureOSDToolStripMenuItem.Click += new System.EventHandler(this.captureOSDToolStripMenuItem_Click);
|
||||
//
|
||||
// MainForm
|
||||
//
|
||||
|
@ -2751,6 +2767,8 @@
|
|||
private System.Windows.Forms.ToolStripMenuItem multicartCompatibilityToolStripMenuItem;
|
||||
private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
|
||||
private System.Windows.Forms.ToolStripMenuItem hardResetToolStripMenuItem;
|
||||
private System.Windows.Forms.ToolStripSeparator toolStripSeparator19;
|
||||
private System.Windows.Forms.ToolStripMenuItem captureOSDToolStripMenuItem;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1120,6 +1120,7 @@ namespace BizHawk.MultiClient
|
|||
{
|
||||
recordAVIToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.AVIRecordBinding;
|
||||
stopAVIToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.AVIStopBinding;
|
||||
captureOSDToolStripMenuItem.Checked = Global.Config.AVI_CaptureOSD;
|
||||
|
||||
if (CurrAviWriter == null)
|
||||
{
|
||||
|
@ -1892,5 +1893,25 @@ namespace BizHawk.MultiClient
|
|||
oBJ2ToolStripMenuItem.Checked = Global.Config.SNES_ShowOBJ3;
|
||||
oBJ3ToolStripMenuItem.Checked = Global.Config.SNES_ShowOBJ4;
|
||||
}
|
||||
|
||||
private void captureOSDToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
Global.Config.AVI_CaptureOSD ^= true;
|
||||
}
|
||||
|
||||
private void forceDMGModeToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
Global.Config.GB_ForceDMG ^= true;
|
||||
}
|
||||
|
||||
private void gBAInCGBModeToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
Global.Config.GB_GBACGB ^= true;
|
||||
}
|
||||
|
||||
private void multicartCompatibilityToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
Global.Config.GB_MulticartCompat ^= true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2132,8 +2132,7 @@ namespace BizHawk.MultiClient
|
|||
//DumpProxy.GetSamples(temp);
|
||||
//genSound = false;
|
||||
|
||||
// TODO: WRAP ME IN SOME UI SETTING
|
||||
if (true)
|
||||
if (Global.Config.AVI_CaptureOSD)
|
||||
{
|
||||
// this code captures the emu display with OSD and lua composited onto it.
|
||||
|
||||
|
@ -3584,20 +3583,5 @@ namespace BizHawk.MultiClient
|
|||
GBtools.ColorChooserForm.DoColorChooserFormDialog(((Gameboy)Global.Emulator).ChangeDMGColors, this);
|
||||
}
|
||||
}
|
||||
|
||||
private void forceDMGModeToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
Global.Config.GB_ForceDMG ^= true;
|
||||
}
|
||||
|
||||
private void gBAInCGBModeToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
Global.Config.GB_GBACGB ^= true;
|
||||
}
|
||||
|
||||
private void multicartCompatibilityToolStripMenuItem_Click(object sender, EventArgs e)
|
||||
{
|
||||
Global.Config.GB_MulticartCompat ^= true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue