rename initialize/finalize to suppress warning.

This commit is contained in:
hecomi
2016-11-04 21:35:34 +09:00
parent 8f7659d7c2
commit 0f72396540
4 changed files with 8 additions and 16 deletions
+2 -2
View File
@@ -23,9 +23,9 @@ public static class Lib
public delegate void MessageHandler(Message message); public delegate void MessageHandler(Message message);
[DllImport("uDesktopDuplication")] [DllImport("uDesktopDuplication")]
public static extern void Initialize(); public static extern void InitializeUDD();
[DllImport("uDesktopDuplication")] [DllImport("uDesktopDuplication")]
public static extern void Finalize(); public static extern void FinalizeUDD();
[DllImport("uDesktopDuplication")] [DllImport("uDesktopDuplication")]
public static extern void Update(); public static extern void Update();
[DllImport("uDesktopDuplication")] [DllImport("uDesktopDuplication")]
+2 -10
View File
@@ -41,11 +41,10 @@ public class Manager : MonoBehaviour
int timeout = 0; int timeout = 0;
private Coroutine renderCoroutine_ = null; private Coroutine renderCoroutine_ = null;
Message message_ = Message.None;
void Awake() void Awake()
{ {
Lib.Initialize(); Lib.InitializeUDD();
if (instance_ != null) return; if (instance_ != null) return;
instance_ = this; instance_ = this;
@@ -57,7 +56,7 @@ public class Manager : MonoBehaviour
void OnApplicationQuit() void OnApplicationQuit()
{ {
Lib.Finalize(); Lib.FinalizeUDD();
} }
void OnEnable() void OnEnable()
@@ -89,8 +88,6 @@ public class Manager : MonoBehaviour
} }
message = Lib.PopMessage(); message = Lib.PopMessage();
} }
message_ = Message.None;
} }
IEnumerator OnRender() IEnumerator OnRender()
@@ -114,11 +111,6 @@ public class Manager : MonoBehaviour
} }
} }
void OnMessage(Message message)
{
message_ = message;
}
void Reinitialize() void Reinitialize()
{ {
for (int i = 0; i < monitorCount; ++i) { for (int i = 0; i < monitorCount; ++i) {
@@ -49,7 +49,7 @@ void SendMessageToUnity(Message message)
extern "C" extern "C"
{ {
UNITY_INTERFACE_EXPORT void UNITY_INTERFACE_API Initialize() UNITY_INTERFACE_EXPORT void UNITY_INTERFACE_API InitializeUDD()
{ {
if (g_unity && !g_manager) 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(); g_manager.reset();
} }
@@ -65,13 +65,13 @@ extern "C"
UNITY_INTERFACE_EXPORT void UNITY_INTERFACE_API UnityPluginLoad(IUnityInterfaces* unityInterfaces) UNITY_INTERFACE_EXPORT void UNITY_INTERFACE_API UnityPluginLoad(IUnityInterfaces* unityInterfaces)
{ {
g_unity = unityInterfaces; g_unity = unityInterfaces;
Initialize(); InitializeUDD();
} }
UNITY_INTERFACE_EXPORT void UNITY_INTERFACE_API UnityPluginUnload() UNITY_INTERFACE_EXPORT void UNITY_INTERFACE_API UnityPluginUnload()
{ {
g_unity = nullptr; g_unity = nullptr;
Finalize(); FinalizeUDD();
} }
void UNITY_INTERFACE_API OnRenderEvent(int id) void UNITY_INTERFACE_API OnRenderEvent(int id)