From f19d15d1ed2dab8c02b2e840b6bacda21a8760a5 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Tue, 20 May 2014 20:25:18 +0000
Subject: [PATCH] Lua - add a Log callback to the LuaLibraryBase class instead
 of having misc libraries have to build out this behavior when they need it

---
 BizHawk.Client.Common/lua/EmuLuaLibrary.Events.cs        | 9 ---------
 BizHawk.Client.Common/lua/EmuLuaLibrary.MainMemory.cs    | 9 ---------
 BizHawk.Client.Common/lua/EmuLuaLibrary.Memory.cs        | 9 ---------
 BizHawk.Client.Common/lua/LuaLibraryBase.cs              | 9 +++++++++
 .../tools/Lua/Libraries/EmuLuaLibrary.Client.cs          | 9 ---------
 5 files changed, 9 insertions(+), 36 deletions(-)

diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.Events.cs b/BizHawk.Client.Common/lua/EmuLuaLibrary.Events.cs
index 1f9c76379b..45b37589fe 100644
--- a/BizHawk.Client.Common/lua/EmuLuaLibrary.Events.cs
+++ b/BizHawk.Client.Common/lua/EmuLuaLibrary.Events.cs
@@ -16,19 +16,10 @@ namespace BizHawk.Client.Common
 
 		public override string Name { get { return "event"; } }
 
-		public Action<object> LogOutputCallback { get; set; }
 		public Lua CurrentThread { get; set; }
 
 		#region Events Library Helpers
 
-		private void Log(string message)
-		{
-			if (LogOutputCallback != null)
-			{
-				LogOutputCallback(message);
-			}
-		}
-
 		public LuaFunctionList RegisteredFunctions { get { return _luaFunctions; } }
 
 		public void CallSaveStateEvent(string name)
diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.MainMemory.cs b/BizHawk.Client.Common/lua/EmuLuaLibrary.MainMemory.cs
index 55e65ed9b7..e92fdac4bd 100644
--- a/BizHawk.Client.Common/lua/EmuLuaLibrary.MainMemory.cs
+++ b/BizHawk.Client.Common/lua/EmuLuaLibrary.MainMemory.cs
@@ -15,18 +15,9 @@ namespace BizHawk.Client.Common
 		}
 
 		public override string Name { get { return "mainmemory"; } }
-		public Action<string> LogOutputCallback { get; set; }
 
 		#region Main Memory Library Helpers
 
-		private void Log(object message)
-		{
-			if (LogOutputCallback != null)
-			{
-				LogOutputCallback(message.ToString());
-			}
-		}
-
 		private static int U2S(uint u, int size)
 		{
 			var s = (int)u;
diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.Memory.cs b/BizHawk.Client.Common/lua/EmuLuaLibrary.Memory.cs
index 5a9e2fe2eb..dd86928980 100644
--- a/BizHawk.Client.Common/lua/EmuLuaLibrary.Memory.cs
+++ b/BizHawk.Client.Common/lua/EmuLuaLibrary.Memory.cs
@@ -16,18 +16,9 @@ namespace BizHawk.Client.Common
 		}
 
 		public override string Name { get { return "memory"; } }
-		public Action<string> LogOutputCallback { get; set; }
 
 		#region Memory Library Helpers
 
-		private void Log(object message)
-		{
-			if (LogOutputCallback != null)
-			{
-				LogOutputCallback(message.ToString());
-			}
-		}
-
 		private static int U2S(uint u, int size)
 		{
 			var s = (int)u;
diff --git a/BizHawk.Client.Common/lua/LuaLibraryBase.cs b/BizHawk.Client.Common/lua/LuaLibraryBase.cs
index 89691bc41f..fb5d5b09a6 100644
--- a/BizHawk.Client.Common/lua/LuaLibraryBase.cs
+++ b/BizHawk.Client.Common/lua/LuaLibraryBase.cs
@@ -8,6 +8,15 @@ namespace BizHawk.Client.Common
 	public abstract class LuaLibraryBase
 	{
 		public abstract string Name { get; }
+		public Action<string> LogOutputCallback { get; set; }
+
+		protected void Log(object message)
+		{
+			if (LogOutputCallback != null)
+			{
+				LogOutputCallback(message.ToString());
+			}
+		}
 
 		public virtual void LuaRegister(Lua lua, ILuaDocumentation docs = null)
 		{
diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Client.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Client.cs
index 233b9974f1..770829d023 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Client.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Client.cs
@@ -24,15 +24,6 @@ namespace BizHawk.Client.EmuHawk
 		public EmuHawkLuaLibrary() { }
 
 		public override string Name { get { return "client"; } }
-		public Action<object> LogOutputCallback { get; set; }
-
-		private void Log(string message)
-		{
-			if (LogOutputCallback != null)
-			{
-				LogOutputCallback(message);
-			}
-		}
 
 		[LuaMethodAttributes(
 			"clearautohold",