no libzedmd and libserialport logging on x86

Author: mkalkbrenner

LibDmd/Output/ZeDMD/ZeDMDBase.cs

@@ -29,19 +29,25 @@ public abstract class ZeDMDBase
 
 		protected void LogHandler(string format, IntPtr args, IntPtr pUserData)
 	    {
+#if PLATFORM_X64
 			Logger.Debug("Trying to convert libzedmd log message: " + format);
         	Logger.Info("libzedmd: " + Marshal.PtrToStringAnsi(ZeDMD_FormatLogMessage(format, args, pUserData)));
+#endif
     	}
 
 		protected void Init()
 		{
 			_pZeDMD = ZeDMD_GetInstance();
 			Logger.Info("Using libzedmd version " + DriverVersion);
 
+#if PLATFORM_X64
 			ZeDMD_LogCallback callbackDelegate = new ZeDMD_LogCallback(LogHandler);
 			// Keep a reference to the delegate to prevent GC from collecting it
 			handle = GCHandle.Alloc(callbackDelegate);
 	        ZeDMD_SetLogCallback(_pZeDMD, callbackDelegate, IntPtr.Zero);
+#else
+			Logger.Warn("Forwarding libzedmd and libserialport logging is not working on x86.");
+#endif
 		}
 
 		protected void SendConfiguration()
@@ -70,6 +76,10 @@ public void Dispose()
 				}
 				IsAvailable = false;
 			}
+
+			if (handle.IsAllocated) {
+				handle.Free();
+			}
 		}
 
 		public void RenderRgb24(DmdFrame frame)
@@ -112,25 +122,18 @@ public void ClearColor()
 		[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_GetInstance();
 
+#if PLATFORM_X64
 		[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
     	protected delegate void ZeDMD_LogCallback(string 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 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(string format, IntPtr args, IntPtr pUserData);
+#endif
 
 #if PLATFORM_X64
 		[DllImport("zedmd64.dll", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)]