Choose pipe number on initialize (#250)
* Choose pipe number on initialize * Get pipe from base connection instance * UE4 support * Warnings as errors yelling * Fix windows connection * Oops all variables * maybe this fixes it * This one actually works!!!! * Fix double function declaration
This commit is contained in:
@ -78,7 +78,7 @@ public class DiscordRpc
|
||||
Ignore = 2
|
||||
}
|
||||
|
||||
public static void Initialize(string applicationId, ref EventHandlers handlers, bool autoRegister, string optionalSteamId)
|
||||
public static void Initialize(string applicationId, ref EventHandlers handlers, bool autoRegister, string optionalSteamId, int pipe = 0)
|
||||
{
|
||||
Callbacks = handlers;
|
||||
|
||||
@ -90,11 +90,11 @@ public class DiscordRpc
|
||||
staticEventHandlers.spectateCallback += DiscordRpc.SpectateCallback;
|
||||
staticEventHandlers.requestCallback += DiscordRpc.RequestCallback;
|
||||
|
||||
InitializeInternal(applicationId, ref staticEventHandlers, autoRegister, optionalSteamId);
|
||||
InitializeInternal(applicationId, ref staticEventHandlers, autoRegister, optionalSteamId, pipe);
|
||||
}
|
||||
|
||||
[DllImport("discord-rpc", EntryPoint = "Discord_Initialize", CallingConvention = CallingConvention.Cdecl)]
|
||||
static extern void InitializeInternal(string applicationId, ref EventHandlers handlers, bool autoRegister, string optionalSteamId);
|
||||
static extern void InitializeInternal(string applicationId, ref EventHandlers handlers, bool autoRegister, string optionalSteamId, int pipe);
|
||||
|
||||
[DllImport("discord-rpc", EntryPoint = "Discord_Shutdown", CallingConvention = CallingConvention.Cdecl)]
|
||||
public static extern void Shutdown();
|
||||
|
@ -129,7 +129,7 @@ static void discordInit()
|
||||
handlers.joinGame = handleDiscordJoin;
|
||||
handlers.spectateGame = handleDiscordSpectate;
|
||||
handlers.joinRequest = handleDiscordJoinRequest;
|
||||
Discord_Initialize(APPLICATION_ID, &handlers, 1, NULL);
|
||||
Discord_Initialize(APPLICATION_ID, &handlers, 1, NULL, 0);
|
||||
}
|
||||
|
||||
static void gameLoop()
|
||||
|
@ -82,7 +82,8 @@ static void JoinRequestHandler(const DiscordUser* request)
|
||||
|
||||
void UDiscordRpc::Initialize(const FString& applicationId,
|
||||
bool autoRegister,
|
||||
const FString& optionalSteamId)
|
||||
const FString& optionalSteamId,
|
||||
int pipe)
|
||||
{
|
||||
self = this;
|
||||
IsConnected = false;
|
||||
@ -102,7 +103,7 @@ void UDiscordRpc::Initialize(const FString& applicationId,
|
||||
auto appId = StringCast<ANSICHAR>(*applicationId);
|
||||
auto steamId = StringCast<ANSICHAR>(*optionalSteamId);
|
||||
Discord_Initialize(
|
||||
(const char*)appId.Get(), &handlers, autoRegister, (const char*)steamId.Get());
|
||||
(const char*)appId.Get(), &handlers, autoRegister, (const char*)steamId.Get(), pipe);
|
||||
}
|
||||
|
||||
void UDiscordRpc::Shutdown()
|
||||
|
@ -99,7 +99,8 @@ public:
|
||||
Category = "Discord")
|
||||
void Initialize(const FString& applicationId,
|
||||
bool autoRegister,
|
||||
const FString& optionalSteamId);
|
||||
const FString& optionalSteamId,
|
||||
int optionalPipeNumber);
|
||||
|
||||
UFUNCTION(BlueprintCallable,
|
||||
meta = (DisplayName = "Shut down connection", Keywords = "Discord rpc"),
|
||||
|
Reference in New Issue
Block a user