mirrors/discord-rpc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Miscellaneous Unity Fixes (#3)

Browse source 
* Use simplified attribute names and ensure function calls are made with CallingConvention.Cdecl

* Remove unused imports
This commit is contained in:
Josh Wood 2017-09-28 11:15:15 -04:00 committed by Chris Marsh
parent e7cdfaa64e
commit 25b6f1dcde
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/button-clicker/Assets/DiscordController.cs
View file

@ -1,6 +1,4 @@
using System.Collections; using UnityEngine;
using System.Collections.Generic;
using UnityEngine;
public class DiscordController : MonoBehaviour { public class DiscordController : MonoBehaviour {
public DiscordRpc.RichPresence presence; public DiscordRpc.RichPresence presence;

18
examples/button-clicker/Assets/DiscordRpc.cs
View file

@ -2,19 +2,19 @@
public class DiscordRpc public class DiscordRpc
{ {
[UnmanagedFunctionPointerAttribute(CallingConvention.Cdecl)] [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
public delegate void ReadyCallback(); public delegate void ReadyCallback();
[UnmanagedFunctionPointerAttribute(CallingConvention.Cdecl)] [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
public delegate void DisconnectedCallback(int errorCode, string message); public delegate void DisconnectedCallback(int errorCode, string message);
[UnmanagedFunctionPointerAttribute(CallingConvention.Cdecl)] [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
public delegate void ErrorCallback(int errorCode, string message); public delegate void ErrorCallback(int errorCode, string message);
[UnmanagedFunctionPointerAttribute(CallingConvention.Cdecl)] [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
public delegate void JoinCallback(string secret); public delegate void JoinCallback(string secret);
[UnmanagedFunctionPointerAttribute(CallingConvention.Cdecl)] [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
public delegate void SpectateCallback(string secret); public delegate void SpectateCallback(string secret);
public struct EventHandlers public struct EventHandlers
@ -46,16 +46,16 @@ public class DiscordRpc
public bool instance; public bool instance;
} }
[DllImport("discord-rpc", EntryPoint = "Discord_Initialize")] [DllImport("discord-rpc", EntryPoint = "Discord_Initialize", CallingConvention = CallingConvention.Cdecl)]
public static extern void Initialize(string applicationId, ref EventHandlers handlers, bool autoRegister, string optionalSteamId); public static extern void Initialize(string applicationId, ref EventHandlers handlers, bool autoRegister, string optionalSteamId);
[DllImport("discord-rpc", EntryPoint = "Discord_Shutdown")] [DllImport("discord-rpc", EntryPoint = "Discord_Shutdown", CallingConvention = CallingConvention.Cdecl)]
public static extern void Shutdown(); public static extern void Shutdown();
[DllImport("discord-rpc", EntryPoint = "Discord_RunCallbacks")] [DllImport("discord-rpc", EntryPoint = "Discord_RunCallbacks", CallingConvention = CallingConvention.Cdecl)]
public static extern void RunCallbacks(); public static extern void RunCallbacks();
[DllImport("discord-rpc", EntryPoint = "Discord_UpdatePresence")] [DllImport("discord-rpc", EntryPoint = "Discord_UpdatePresence", CallingConvention = CallingConvention.Cdecl)]
public static extern void UpdatePresence(ref RichPresence presence); public static extern void UpdatePresence(ref RichPresence presence);
} }