forward libzedmd logging, libzedmd 0.9.3

freezy · Feb 10, 2025 · e280c01 · e280c01
1 parent a0380c5
commit e280c01
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/LibDmd/Costura32/zedmd.dll b/LibDmd/Costura32/zedmd.dll
diff --git a/LibDmd/Costura64/zedmd64.dll b/LibDmd/Costura64/zedmd64.dll
diff --git a/LibDmd/Output/ZeDMD/ZeDMDBase.cs b/LibDmd/Output/ZeDMD/ZeDMDBase.cs
@@ -27,9 +27,9 @@ public abstract class ZeDMDBase
 		protected ColoredFrame _lastFrame = null;
 		private GCHandle handle;
 
-		protected static void LogHandler(string format, IntPtr args, IntPtr userData)
+		protected void LogHandler(IntPtr format, IntPtr args, IntPtr pUserData)
 	    {
-        	Logger.Info(format);
+        	Logger.Info("libzedmd: " + Marshal.PtrToStringAnsi(ZeDMD_FormatLogMessage(format, args, pUserData)));
     	}
 
 		protected void Init()
@@ -114,15 +114,21 @@ public void ClearColor()
 		protected static extern IntPtr ZeDMD_GetInstance();
 
 		[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-    	protected delegate void ZeDMD_LogCallback(string format, IntPtr args, IntPtr userData);
+    	protected delegate void ZeDMD_LogCallback(IntPtr format, IntPtr args, IntPtr pUserData);
 
 #if PLATFORM_X64
 		[DllImport("zedmd64.dll", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)]
 #else
 		[DllImport("zedmd.dll", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)]
 #endif
-		protected static extern void ZeDMD_SetLogCallback(IntPtr pZeDMD, ZeDMD_LogCallback callback, IntPtr userData);
+		protected static extern void ZeDMD_SetLogCallback(IntPtr pZeDMD, ZeDMD_LogCallback callback, IntPtr pUserData);
 
+#if PLATFORM_X64
+		[DllImport("zedmd64.dll", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)]
+#else
+		[DllImport("zedmd.dll", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)]
+#endif
+		protected static extern IntPtr ZeDMD_FormatLogMessage(IntPtr format, IntPtr args, IntPtr pUserData);
 
 #if PLATFORM_X64
 		[DllImport("zedmd64.dll", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)]