diff --git a/Assets/uDesktopDuplication/Plugins/uDesktopDuplication.dll b/Assets/uDesktopDuplication/Plugins/uDesktopDuplication.dll index dda2000..80e7005 100644 Binary files a/Assets/uDesktopDuplication/Plugins/uDesktopDuplication.dll and b/Assets/uDesktopDuplication/Plugins/uDesktopDuplication.dll differ diff --git a/Assets/uDesktopDuplication/Scripts/Lib.cs b/Assets/uDesktopDuplication/Scripts/Lib.cs index 21ef19d..be67491 100644 --- a/Assets/uDesktopDuplication/Scripts/Lib.cs +++ b/Assets/uDesktopDuplication/Scripts/Lib.cs @@ -23,9 +23,9 @@ public static class Lib public delegate void MessageHandler(Message message); [DllImport("uDesktopDuplication")] - public static extern void Initialize(); + public static extern void InitializeUDD(); [DllImport("uDesktopDuplication")] - public static extern void Finalize(); + public static extern void FinalizeUDD(); [DllImport("uDesktopDuplication")] public static extern void Update(); [DllImport("uDesktopDuplication")] diff --git a/Assets/uDesktopDuplication/Scripts/Manager.cs b/Assets/uDesktopDuplication/Scripts/Manager.cs index 968ce67..6d28681 100644 --- a/Assets/uDesktopDuplication/Scripts/Manager.cs +++ b/Assets/uDesktopDuplication/Scripts/Manager.cs @@ -41,11 +41,10 @@ public class Manager : MonoBehaviour int timeout = 0; private Coroutine renderCoroutine_ = null; - Message message_ = Message.None; void Awake() { - Lib.Initialize(); + Lib.InitializeUDD(); if (instance_ != null) return; instance_ = this; @@ -57,7 +56,7 @@ public class Manager : MonoBehaviour void OnApplicationQuit() { - Lib.Finalize(); + Lib.FinalizeUDD(); } void OnEnable() @@ -89,8 +88,6 @@ public class Manager : MonoBehaviour } message = Lib.PopMessage(); } - - message_ = Message.None; } IEnumerator OnRender() @@ -114,11 +111,6 @@ public class Manager : MonoBehaviour } } - void OnMessage(Message message) - { - message_ = message; - } - void Reinitialize() { for (int i = 0; i < monitorCount; ++i) { diff --git a/Plugins/uDesktopDuplication/uDesktopDuplication/main.cpp b/Plugins/uDesktopDuplication/uDesktopDuplication/main.cpp index ee035b1..76afd1b 100644 --- a/Plugins/uDesktopDuplication/uDesktopDuplication/main.cpp +++ b/Plugins/uDesktopDuplication/uDesktopDuplication/main.cpp @@ -49,7 +49,7 @@ void SendMessageToUnity(Message message) extern "C" { - UNITY_INTERFACE_EXPORT void UNITY_INTERFACE_API Initialize() + UNITY_INTERFACE_EXPORT void UNITY_INTERFACE_API InitializeUDD() { if (g_unity && !g_manager) { @@ -57,7 +57,7 @@ extern "C" } } - UNITY_INTERFACE_EXPORT void UNITY_INTERFACE_API Finalize() + UNITY_INTERFACE_EXPORT void UNITY_INTERFACE_API FinalizeUDD() { g_manager.reset(); } @@ -65,13 +65,13 @@ extern "C" UNITY_INTERFACE_EXPORT void UNITY_INTERFACE_API UnityPluginLoad(IUnityInterfaces* unityInterfaces) { g_unity = unityInterfaces; - Initialize(); + InitializeUDD(); } UNITY_INTERFACE_EXPORT void UNITY_INTERFACE_API UnityPluginUnload() { g_unity = nullptr; - Finalize(); + FinalizeUDD(); } void UNITY_INTERFACE_API OnRenderEvent(int id)