From 5d6c33f0803186703b09c529725cb95cd7b868c6 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Fri, 1 Nov 2019 15:56:26 -0500
Subject: [PATCH] remove TAStudio ui that was picking the renderer (it's
 automatic now)

---
 .../tools/TAStudio/TAStudio.Designer.cs       | 35 -----------
 .../tools/TAStudio/TAStudio.MenuItems.cs      | 58 -------------------
 2 files changed, 93 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs
index 279a0980d9..9fe6286f25 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs
@@ -125,9 +125,6 @@ namespace BizHawk.Client.EmuHawk
 			this.DefaultStateSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.SettingsSubMenu = new System.Windows.Forms.ToolStripMenuItem();
 			this.RotateMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.RendererOptionsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.SetRenderer0 = new System.Windows.Forms.ToolStripMenuItem();
-			this.SetRenderer1 = new System.Windows.Forms.ToolStripMenuItem();
 			this.HideLagFramesSubMenu = new System.Windows.Forms.ToolStripMenuItem();
 			this.HideLagFrames0 = new System.Windows.Forms.ToolStripMenuItem();
 			this.HideLagFrames1 = new System.Windows.Forms.ToolStripMenuItem();
@@ -965,7 +962,6 @@ namespace BizHawk.Client.EmuHawk
 			// 
 			this.SettingsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.RotateMenuItem,
-            this.RendererOptionsMenuItem,
             this.HideLagFramesSubMenu,
             this.iconsToolStripMenuItem,
             this.toolStripSeparator23,
@@ -984,34 +980,6 @@ namespace BizHawk.Client.EmuHawk
 			this.RotateMenuItem.Text = "Rotate";
 			this.RotateMenuItem.Click += new System.EventHandler(this.RotateMenuItem_Click);
 			// 
-			// RendererOptionsMenuItem
-			// 
-			this.RendererOptionsMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-				this.SetRenderer0,
-				this.SetRenderer1});
-			this.RendererOptionsMenuItem.Name = "RendererOptionsMenuItem";
-			this.RendererOptionsMenuItem.Size = new System.Drawing.Size(183, 22);
-			this.RendererOptionsMenuItem.Text = "Renderer";
-			this.RendererOptionsMenuItem.DropDownOpened += new System.EventHandler(this.SelectedRendererSubMenu_DropDownOpened);
-			// 
-			// SetRenderer0
-			// 
-			this.SetRenderer0.CheckOnClick = true;
-			this.SetRenderer0.Name = "SetRenderer0";
-			this.SetRenderer0.Size = new System.Drawing.Size(180, 22);
-			this.SetRenderer0.Tag = 0;
-			this.SetRenderer0.Text = "GDI";
-			this.SetRenderer0.Click += new System.EventHandler(this.SetRenderer_Click);
-			// 
-			// SetRenderer1
-			// 
-			this.SetRenderer1.CheckOnClick = true;
-			this.SetRenderer1.Name = "SetRenderer1";
-			this.SetRenderer1.Size = new System.Drawing.Size(180, 22);
-			this.SetRenderer1.Tag = 1;
-			this.SetRenderer1.Text = "GDI+ (Experimental)";
-			this.SetRenderer1.Click += new System.EventHandler(this.SetRenderer_Click);
-			// 
 			// HideLagFramesSubMenu
 			// 
 			this.HideLagFramesSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -1826,8 +1794,5 @@ namespace BizHawk.Client.EmuHawk
 		private System.Windows.Forms.ToolStripMenuItem AutoRestoreOnMouseUpOnlyMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem SingleClickFloatEditMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem LoadBranchOnDoubleclickMenuItem;
-		private System.Windows.Forms.ToolStripMenuItem RendererOptionsMenuItem;
-		private System.Windows.Forms.ToolStripMenuItem SetRenderer0;
-		private System.Windows.Forms.ToolStripMenuItem SetRenderer1;
 	}
 }
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
index 6e5933349b..09b915a012 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
@@ -1103,52 +1103,6 @@ namespace BizHawk.Client.EmuHawk
 			RotateMenuItem.ShortcutKeyDisplayString = TasView.RotateHotkeyStr;
 		}
 
-		private void SelectedRendererSubMenu_DropDownOpened(object sender, EventArgs e)
-		{
-			// TODO: Merge TODO: adelikat: delete all this and the UI that goes with it
-			//if (OSTailoredCode.CurrentOS == OSTailoredCode.DistinctOS.Windows)
-			//{
-			//	if (Global.Config.TasStudioRenderer != InputRollRenderer)
-			//	{
-			//		switch (Global.Config.TasStudioRenderer)
-			//		{
-			//			case 0:
-			//				SetRenderer0.Text = "GDI (Pending TAStudio Restart)";
-			//				SetRenderer0.Enabled = false;
-			//				SetRenderer0.Checked = true;
-			//				SetRenderer1.Text = "GDI+ (Experimental)";
-			//				SetRenderer1.Checked = false;
-			//				break;
-			//			case 1:
-			//				SetRenderer1.Text = "GDI+ (Pending TAStudio Restart)";
-			//				SetRenderer1.Enabled = false;
-			//				SetRenderer1.Checked = true;
-			//				SetRenderer0.Text = "GDI";
-			//				SetRenderer0.Checked = false;
-			//				break;
-			//		}
-			//	}
-			//	else
-			//	{
-			//		SetRenderer0.Text = "GDI";
-			//		SetRenderer0.Enabled = true;
-			//		SetRenderer1.Text = "GDI+ (Experimental)";
-			//		SetRenderer1.Enabled = true;
-			//		SetRenderer0.Checked = Global.Config.TasStudioRenderer == 0;
-			//		SetRenderer1.Checked = Global.Config.TasStudioRenderer == 1;
-			//	}
-			//}
-			//else
-			//{
-			//	SetRenderer0.Checked = false;
-			//	SetRenderer0.Enabled = false;
-			//	SetRenderer0.Visible = false;
-			//	SetRenderer1.Checked = true;
-			//	SetRenderer1.Enabled = false;
-			//	SetRenderer1.Visible = true;
-			//}
-		}
-
 		private void HideLagFramesSubMenu_DropDownOpened(object sender, EventArgs e)
 		{
 			HideLagFrames0.Checked = TasView.LagFramesToHide == 0;
@@ -1197,18 +1151,6 @@ namespace BizHawk.Client.EmuHawk
 			CurrentTasMovie.FlagChanges();
 		}
 
-		private void SetRenderer_Click(object sender, EventArgs e)
-		{
-			var incoming = (int)(sender as ToolStripMenuItem).Tag;
-
-			// Merge adelikat: TODO: what does this do???
-			//if (incoming != InputRollRenderer)
-			//{
-			//	MessageBox.Show("Changing the input roll renderer requires a\nmanual restart of TAStudio", "Renderer Change Warning", MessageBoxButtons.OK, MessageBoxIcon.Information);
-			//}
-			Global.Config.TasStudioRenderer = incoming;
-		}
-
 		private void HideLagFramesX_Click(object sender, EventArgs e)
 		{
 			TasView.LagFramesToHide = (int)((ToolStripMenuItem)sender).Tag;