From 744c100159ff7b79e01c40ec57e42d37650d139b Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Tue, 12 Mar 2019 00:27:11 +0100 Subject: make discord optional --- src/discord_rich_presence.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'src/discord_rich_presence.cpp') diff --git a/src/discord_rich_presence.cpp b/src/discord_rich_presence.cpp index 10f5833e..0bb7f9fb 100644 --- a/src/discord_rich_presence.cpp +++ b/src/discord_rich_presence.cpp @@ -4,6 +4,7 @@ namespace AttorneyOnline { Discord::Discord() { + #ifdef DISCORD DiscordEventHandlers handlers; std::memset(&handlers, 0, sizeof(handlers)); handlers = {}; @@ -18,15 +19,19 @@ Discord::Discord() }; qInfo() << "Initializing Discord RPC"; Discord_Initialize(APPLICATION_ID, &handlers, 1, nullptr); + #endif } Discord::~Discord() { + #ifdef DISCORD Discord_Shutdown(); + #endif } void Discord::state_lobby() { + #ifdef DISCORD DiscordRichPresence presence; std::memset(&presence, 0, sizeof(presence)); presence.largeImageKey = "ao2-logo"; @@ -36,12 +41,13 @@ void Discord::state_lobby() presence.state = "In Lobby"; presence.details = "Idle"; Discord_UpdatePresence(&presence); + #endif } void Discord::state_server(std::string name, std::string server_id) { qDebug() << "Discord RPC: Setting server state"; - + #ifdef DISCORD DiscordRichPresence presence; std::memset(&presence, 0, sizeof(presence)); presence.largeImageKey = "ao2-logo"; @@ -59,6 +65,7 @@ void Discord::state_server(std::string name, std::string server_id) this->server_name = name; this->timestamp = timestamp; Discord_UpdatePresence(&presence); + #endif } void Discord::state_character(std::string name) @@ -67,7 +74,7 @@ void Discord::state_character(std::string name) auto name_friendly = QString(name.c_str()).replace('_', ' ').toStdString(); const std::string playing_as = "Playing as " + name_friendly; qDebug() << "Discord RPC: Setting character state (" << playing_as.c_str() << ")"; - + #ifdef DISCORD DiscordRichPresence presence; std::memset(&presence, 0, sizeof(presence)); presence.largeImageKey = "ao2-logo"; @@ -81,12 +88,13 @@ void Discord::state_character(std::string name) presence.smallImageKey = name_internal.c_str(); // presence.smallImageText = name_internal.c_str(); Discord_UpdatePresence(&presence); + #endif } void Discord::state_spectate() { qDebug() << "Discord RPC: Setting specator state"; - + #ifdef DISCORD DiscordRichPresence presence; std::memset(&presence, 0, sizeof(presence)); presence.largeImageKey = "ao2-logo"; @@ -98,6 +106,7 @@ void Discord::state_spectate() presence.state = "Spectating"; Discord_UpdatePresence(&presence); + #endif } } -- cgit From 92c54ba2ebee12a87360d00f2982a9083f06166d Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Tue, 12 Mar 2019 19:27:13 +0100 Subject: Revert "make discord optional" This reverts commit 744c100159ff7b79e01c40ec57e42d37650d139b. --- src/discord_rich_presence.cpp | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'src/discord_rich_presence.cpp') diff --git a/src/discord_rich_presence.cpp b/src/discord_rich_presence.cpp index 0bb7f9fb..10f5833e 100644 --- a/src/discord_rich_presence.cpp +++ b/src/discord_rich_presence.cpp @@ -4,7 +4,6 @@ namespace AttorneyOnline { Discord::Discord() { - #ifdef DISCORD DiscordEventHandlers handlers; std::memset(&handlers, 0, sizeof(handlers)); handlers = {}; @@ -19,19 +18,15 @@ Discord::Discord() }; qInfo() << "Initializing Discord RPC"; Discord_Initialize(APPLICATION_ID, &handlers, 1, nullptr); - #endif } Discord::~Discord() { - #ifdef DISCORD Discord_Shutdown(); - #endif } void Discord::state_lobby() { - #ifdef DISCORD DiscordRichPresence presence; std::memset(&presence, 0, sizeof(presence)); presence.largeImageKey = "ao2-logo"; @@ -41,13 +36,12 @@ void Discord::state_lobby() presence.state = "In Lobby"; presence.details = "Idle"; Discord_UpdatePresence(&presence); - #endif } void Discord::state_server(std::string name, std::string server_id) { qDebug() << "Discord RPC: Setting server state"; - #ifdef DISCORD + DiscordRichPresence presence; std::memset(&presence, 0, sizeof(presence)); presence.largeImageKey = "ao2-logo"; @@ -65,7 +59,6 @@ void Discord::state_server(std::string name, std::string server_id) this->server_name = name; this->timestamp = timestamp; Discord_UpdatePresence(&presence); - #endif } void Discord::state_character(std::string name) @@ -74,7 +67,7 @@ void Discord::state_character(std::string name) auto name_friendly = QString(name.c_str()).replace('_', ' ').toStdString(); const std::string playing_as = "Playing as " + name_friendly; qDebug() << "Discord RPC: Setting character state (" << playing_as.c_str() << ")"; - #ifdef DISCORD + DiscordRichPresence presence; std::memset(&presence, 0, sizeof(presence)); presence.largeImageKey = "ao2-logo"; @@ -88,13 +81,12 @@ void Discord::state_character(std::string name) presence.smallImageKey = name_internal.c_str(); // presence.smallImageText = name_internal.c_str(); Discord_UpdatePresence(&presence); - #endif } void Discord::state_spectate() { qDebug() << "Discord RPC: Setting specator state"; - #ifdef DISCORD + DiscordRichPresence presence; std::memset(&presence, 0, sizeof(presence)); presence.largeImageKey = "ao2-logo"; @@ -106,7 +98,6 @@ void Discord::state_spectate() presence.state = "Spectating"; Discord_UpdatePresence(&presence); - #endif } } -- cgit From 6e93d6e1bea8fd539499625f2a980acd83ef424e Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Tue, 12 Mar 2019 19:30:03 +0100 Subject: discord optional v2 --- src/discord_rich_presence.cpp | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'src/discord_rich_presence.cpp') diff --git a/src/discord_rich_presence.cpp b/src/discord_rich_presence.cpp index 10f5833e..a310a684 100644 --- a/src/discord_rich_presence.cpp +++ b/src/discord_rich_presence.cpp @@ -2,6 +2,7 @@ namespace AttorneyOnline { +#ifdef DISCORD Discord::Discord() { DiscordEventHandlers handlers; @@ -99,5 +100,36 @@ void Discord::state_spectate() presence.state = "Spectating"; Discord_UpdatePresence(&presence); } +#else +Discord::Discord() +{ + +} + +Discord::~Discord() +{ + +} + +void Discord::state_lobby() +{ + +} +void Discord::state_server(std::string name, std::string server_id) +{ + qDebug() << "Discord RPC: Setting server state"; +} + +void Discord::state_character(std::string name) +{ + qDebug() << "Discord RPC: Setting character state"; +} + +void Discord::state_spectate() +{ + qDebug() << "Discord RPC: Setting specator state"; + +} +#endif } -- cgit From 5eccabcad15a52691228aded1d9c1fd5074fb70e Mon Sep 17 00:00:00 2001 From: David Skoland Date: Fri, 12 Jul 2019 23:00:25 +0000 Subject: Less insane debugging; minor refactoring (!75) --- src/discord_rich_presence.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/discord_rich_presence.cpp') diff --git a/src/discord_rich_presence.cpp b/src/discord_rich_presence.cpp index 10f5833e..ac14bb21 100644 --- a/src/discord_rich_presence.cpp +++ b/src/discord_rich_presence.cpp @@ -11,10 +11,10 @@ Discord::Discord() qInfo() << "Discord RPC ready"; }; handlers.disconnected = [](int errorCode, const char* message) { - qInfo() << "Discord RPC disconnected! " << message; + qInfo() << "Discord RPC disconnected! " << message << errorCode; }; handlers.errored = [](int errorCode, const char* message) { - qWarning() << "Discord RPC errored out! " << message; + qWarning() << "Discord RPC errored out! " << message << errorCode; }; qInfo() << "Initializing Discord RPC"; Discord_Initialize(APPLICATION_ID, &handlers, 1, nullptr); -- cgit