Discord RPC implementation
This commit is contained in:
committed by
Jonas Kvinge
parent
2a4fc185ac
commit
9fa9012c70
@@ -364,6 +364,8 @@ optional_component(STREAMTAGREADER ON "Stream tagreader"
|
|||||||
DEPENDS "sparsehash" LIBSPARSEHASH_FOUND
|
DEPENDS "sparsehash" LIBSPARSEHASH_FOUND
|
||||||
)
|
)
|
||||||
|
|
||||||
|
optional_component(DISCORD_RPC ON "Discord Rich Presence")
|
||||||
|
|
||||||
if(HAVE_SONGFINGERPRINTING OR HAVE_MUSICBRAINZ)
|
if(HAVE_SONGFINGERPRINTING OR HAVE_MUSICBRAINZ)
|
||||||
set(HAVE_CHROMAPRINT ON)
|
set(HAVE_CHROMAPRINT ON)
|
||||||
endif()
|
endif()
|
||||||
@@ -1237,6 +1239,11 @@ optional_source(HAVE_STREAMTAGREADER
|
|||||||
HEADERS src/tagreader/tagreaderreadstreamreply.h
|
HEADERS src/tagreader/tagreaderreadstreamreply.h
|
||||||
)
|
)
|
||||||
|
|
||||||
|
optional_source(HAVE_DISCORD_RPC
|
||||||
|
SOURCES src/discord/richpresence.cpp
|
||||||
|
HEADERS src/discord/richpresence.h
|
||||||
|
)
|
||||||
|
|
||||||
if(HAVE_GLOBALSHORTCUTS)
|
if(HAVE_GLOBALSHORTCUTS)
|
||||||
|
|
||||||
optional_source(HAVE_GLOBALSHORTCUTS
|
optional_source(HAVE_GLOBALSHORTCUTS
|
||||||
@@ -1481,6 +1488,11 @@ if(LINUX AND LSB_RELEASE_EXEC AND DPKG_BUILDPACKAGE)
|
|||||||
add_subdirectory(debian)
|
add_subdirectory(debian)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(HAVE_DISCORD_RPC)
|
||||||
|
add_subdirectory(thirdparty/discord-rpc)
|
||||||
|
target_include_directories(strawberry_lib PUBLIC thirdparty/discord-rpc/include)
|
||||||
|
endif()
|
||||||
|
|
||||||
if(HAVE_TRANSLATIONS)
|
if(HAVE_TRANSLATIONS)
|
||||||
qt_add_lupdate(strawberry_lib TS_FILES "${CMAKE_SOURCE_DIR}/src/translations/strawberry_en_US.ts" OPTIONS -locations none -no-ui-lines -no-obsolete)
|
qt_add_lupdate(strawberry_lib TS_FILES "${CMAKE_SOURCE_DIR}/src/translations/strawberry_en_US.ts" OPTIONS -locations none -no-ui-lines -no-obsolete)
|
||||||
file(GLOB_RECURSE ts_files ${CMAKE_SOURCE_DIR}/src/translations/*.ts)
|
file(GLOB_RECURSE ts_files ${CMAKE_SOURCE_DIR}/src/translations/*.ts)
|
||||||
@@ -1559,6 +1571,10 @@ if(APPLE)
|
|||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(HAVE_DISCORD_RPC)
|
||||||
|
target_link_libraries(strawberry_lib PRIVATE discord-rpc)
|
||||||
|
endif()
|
||||||
|
|
||||||
target_link_libraries(strawberry PUBLIC strawberry_lib)
|
target_link_libraries(strawberry PUBLIC strawberry_lib)
|
||||||
|
|
||||||
if(NOT APPLE)
|
if(NOT APPLE)
|
||||||
|
|||||||
@@ -32,6 +32,7 @@
|
|||||||
#cmakedefine HAVE_TIDAL
|
#cmakedefine HAVE_TIDAL
|
||||||
#cmakedefine HAVE_SPOTIFY
|
#cmakedefine HAVE_SPOTIFY
|
||||||
#cmakedefine HAVE_QOBUZ
|
#cmakedefine HAVE_QOBUZ
|
||||||
|
#cmakedefine HAVE_DISCORD_RPC
|
||||||
|
|
||||||
#cmakedefine HAVE_TAGLIB_DSFFILE
|
#cmakedefine HAVE_TAGLIB_DSFFILE
|
||||||
#cmakedefine HAVE_TAGLIB_DSDIFFFILE
|
#cmakedefine HAVE_TAGLIB_DSDIFFFILE
|
||||||
|
|||||||
@@ -65,4 +65,12 @@ constexpr QRgb kPresetRed = qRgb(202, 22, 16);
|
|||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
|
namespace DiscordRPCSettings {
|
||||||
|
|
||||||
|
constexpr char kSettingsGroup[] = "DiscordRPC";
|
||||||
|
|
||||||
|
constexpr char kEnabled[] = "enabled";
|
||||||
|
|
||||||
|
} // namespace
|
||||||
|
|
||||||
#endif // NOTIFICATIONSSETTINGS_H
|
#endif // NOTIFICATIONSSETTINGS_H
|
||||||
|
|||||||
149
src/discord/richpresence.cpp
Normal file
149
src/discord/richpresence.cpp
Normal file
@@ -0,0 +1,149 @@
|
|||||||
|
/*
|
||||||
|
* Strawberry Music Player
|
||||||
|
*
|
||||||
|
* Strawberry is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* Strawberry is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with Strawberry. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "richpresence.h"
|
||||||
|
|
||||||
|
#include "core/logging.h"
|
||||||
|
#include "core/player.h"
|
||||||
|
#include "core/settings.h"
|
||||||
|
#include "engine/enginebase.h"
|
||||||
|
#include "constants/notificationssettings.h"
|
||||||
|
|
||||||
|
#include <discord_rpc.h>
|
||||||
|
|
||||||
|
namespace {
|
||||||
|
|
||||||
|
constexpr char kDiscordApplicationId[] = "1352351827206733974";
|
||||||
|
constexpr char kStrawberryIconResourceName[] = "embedded_cover";
|
||||||
|
constexpr char kStrawberryIconDescription[] = "Strawberry Music Player";
|
||||||
|
constexpr qint64 kDiscordPresenceUpdateRateLimitMs = 2000;
|
||||||
|
|
||||||
|
} // namespace
|
||||||
|
|
||||||
|
namespace discord {
|
||||||
|
|
||||||
|
RichPresence::RichPresence(const SharedPtr<Player> player,
|
||||||
|
const SharedPtr<PlaylistManager> playlist_manager,
|
||||||
|
QObject *parent)
|
||||||
|
: QObject(parent),
|
||||||
|
player_(player),
|
||||||
|
playlist_manager_(playlist_manager),
|
||||||
|
activity_({ {}, {}, {}, 0, 0, 0 }),
|
||||||
|
send_presence_timestamp_(0),
|
||||||
|
is_enabled_(false) {
|
||||||
|
Discord_Initialize(kDiscordApplicationId, nullptr, true, nullptr);
|
||||||
|
|
||||||
|
QObject::connect(&*player_->engine(), &EngineBase::StateChanged, this, &RichPresence::EngineStateChanged);
|
||||||
|
QObject::connect(&*playlist_manager_, &PlaylistManager::CurrentSongChanged, this, &RichPresence::CurrentSongChanged);
|
||||||
|
QObject::connect(&*player_, &Player::Seeked, this, &RichPresence::Seeked);
|
||||||
|
}
|
||||||
|
|
||||||
|
RichPresence::~RichPresence() {
|
||||||
|
Discord_Shutdown();
|
||||||
|
}
|
||||||
|
|
||||||
|
void RichPresence::EngineStateChanged(EngineBase::State newState) {
|
||||||
|
if (newState == EngineBase::State::Playing) {
|
||||||
|
SetTimestamp(player_->engine()->position_nanosec() / 1e3);
|
||||||
|
SendPresenceUpdate();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
Discord_ClearPresence();
|
||||||
|
}
|
||||||
|
|
||||||
|
void RichPresence::CurrentSongChanged(const Song &song) {
|
||||||
|
SetTimestamp(0);
|
||||||
|
activity_.length_secs = song.length_nanosec() / 1e9;
|
||||||
|
activity_.title = song.title();
|
||||||
|
activity_.artist = song.artist();
|
||||||
|
activity_.album = song.album();
|
||||||
|
|
||||||
|
SendPresenceUpdate();
|
||||||
|
}
|
||||||
|
|
||||||
|
void RichPresence::CheckEnabled() {
|
||||||
|
Settings s;
|
||||||
|
s.beginGroup(DiscordRPCSettings::kSettingsGroup);
|
||||||
|
|
||||||
|
is_enabled_ = s.value(DiscordRPCSettings::kEnabled).toBool();
|
||||||
|
|
||||||
|
s.endGroup();
|
||||||
|
|
||||||
|
if (!is_enabled_)
|
||||||
|
Discord_ClearPresence();
|
||||||
|
}
|
||||||
|
|
||||||
|
void RichPresence::SendPresenceUpdate() {
|
||||||
|
CheckEnabled();
|
||||||
|
if (!is_enabled_)
|
||||||
|
return;
|
||||||
|
|
||||||
|
qint64 nowTimestamp = QDateTime::currentMSecsSinceEpoch();
|
||||||
|
if (nowTimestamp - send_presence_timestamp_ < kDiscordPresenceUpdateRateLimitMs) {
|
||||||
|
qLog(Debug) << "Not sending rich presence due to rate limit of " << kDiscordPresenceUpdateRateLimitMs << "ms";
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
send_presence_timestamp_ = nowTimestamp;
|
||||||
|
|
||||||
|
::DiscordRichPresence presence_data;
|
||||||
|
memset(&presence_data, 0, sizeof(presence_data));
|
||||||
|
QByteArray title;
|
||||||
|
QByteArray artist;
|
||||||
|
QByteArray album;
|
||||||
|
|
||||||
|
presence_data.type = 2 /* Listening */;
|
||||||
|
presence_data.largeImageKey = kStrawberryIconResourceName;
|
||||||
|
presence_data.smallImageKey = kStrawberryIconResourceName;
|
||||||
|
presence_data.smallImageText = kStrawberryIconDescription;
|
||||||
|
presence_data.instance = false;
|
||||||
|
|
||||||
|
if (!activity_.artist.isEmpty()) {
|
||||||
|
artist = activity_.artist.toUtf8();
|
||||||
|
artist.prepend(tr("by ").toUtf8());
|
||||||
|
presence_data.state = artist.constData();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!activity_.album.isEmpty() && !(activity_.album == activity_.title)) {
|
||||||
|
album = activity_.album.toUtf8();
|
||||||
|
album.prepend(tr("on ").toUtf8());
|
||||||
|
presence_data.largeImageText = album.constData();
|
||||||
|
}
|
||||||
|
|
||||||
|
title = activity_.title.toUtf8();
|
||||||
|
presence_data.details = title.constData();
|
||||||
|
|
||||||
|
const qint64 startTimestamp = activity_.start_timestamp - activity_.seek_secs;
|
||||||
|
|
||||||
|
presence_data.startTimestamp = startTimestamp;
|
||||||
|
presence_data.endTimestamp = startTimestamp + activity_.length_secs;
|
||||||
|
|
||||||
|
Discord_UpdatePresence(&presence_data);
|
||||||
|
}
|
||||||
|
|
||||||
|
void RichPresence::SetTimestamp(const qint64 seekMicroseconds) {
|
||||||
|
activity_.start_timestamp = time(nullptr);
|
||||||
|
activity_.seek_secs = seekMicroseconds / 1e6;
|
||||||
|
}
|
||||||
|
|
||||||
|
void RichPresence::Seeked(const qint64 microseconds) {
|
||||||
|
SetTimestamp(microseconds);
|
||||||
|
SendPresenceUpdate();
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace discord
|
||||||
70
src/discord/richpresence.h
Normal file
70
src/discord/richpresence.h
Normal file
@@ -0,0 +1,70 @@
|
|||||||
|
/*
|
||||||
|
* Strawberry Music Player
|
||||||
|
*
|
||||||
|
* Strawberry is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* Strawberry is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with Strawberry. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef RICHPRESENCE_H
|
||||||
|
#define RICHPRESENCE_H
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
|
#include <QObject>
|
||||||
|
|
||||||
|
#include "core/player.h"
|
||||||
|
#include "playlist/playlistmanager.h"
|
||||||
|
#include "includes/shared_ptr.h"
|
||||||
|
|
||||||
|
namespace discord {
|
||||||
|
|
||||||
|
class RichPresence : public QObject {
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
explicit RichPresence(const SharedPtr<Player> player,
|
||||||
|
const SharedPtr<PlaylistManager> playlist_manager,
|
||||||
|
QObject *parent = nullptr);
|
||||||
|
~RichPresence();
|
||||||
|
|
||||||
|
void Stop();
|
||||||
|
|
||||||
|
private Q_SLOTS:
|
||||||
|
void EngineStateChanged(EngineBase::State newState);
|
||||||
|
void CurrentSongChanged(const Song &song);
|
||||||
|
void Seeked(const qint64 microseconds);
|
||||||
|
|
||||||
|
private:
|
||||||
|
void CheckEnabled();
|
||||||
|
void SendPresenceUpdate();
|
||||||
|
void SetTimestamp(const qint64 seekMicroseconds = 0);
|
||||||
|
|
||||||
|
const SharedPtr<Player> player_;
|
||||||
|
const SharedPtr<PlaylistManager> playlist_manager_;
|
||||||
|
|
||||||
|
struct {
|
||||||
|
QString title;
|
||||||
|
QString artist;
|
||||||
|
QString album;
|
||||||
|
qint64 start_timestamp;
|
||||||
|
qint64 length_secs;
|
||||||
|
qint64 seek_secs;
|
||||||
|
} activity_;
|
||||||
|
qint64 send_presence_timestamp_;
|
||||||
|
bool is_enabled_;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace discord
|
||||||
|
|
||||||
|
#endif // RICHPRESENCE_H
|
||||||
@@ -89,6 +89,10 @@
|
|||||||
# include "mpris2/mpris2.h"
|
# include "mpris2/mpris2.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef HAVE_DISCORD_RPC
|
||||||
|
# include "discord/richpresence.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "core/iconloader.h"
|
#include "core/iconloader.h"
|
||||||
#include "core/commandlineoptions.h"
|
#include "core/commandlineoptions.h"
|
||||||
#include "core/networkproxyfactory.h"
|
#include "core/networkproxyfactory.h"
|
||||||
@@ -314,6 +318,9 @@ int main(int argc, char *argv[]) {
|
|||||||
#ifdef HAVE_MPRIS2
|
#ifdef HAVE_MPRIS2
|
||||||
mpris::Mpris2 mpris2(app.player(), app.playlist_manager(), app.current_albumcover_loader());
|
mpris::Mpris2 mpris2(app.player(), app.playlist_manager(), app.current_albumcover_loader());
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef HAVE_DISCORD_RPC
|
||||||
|
discord::RichPresence discord_rich_presence(app.player(), app.playlist_manager());
|
||||||
|
#endif
|
||||||
|
|
||||||
// Window
|
// Window
|
||||||
MainWindow w(&app, tray_icon, &osd, options);
|
MainWindow w(&app, tray_icon, &osd, options);
|
||||||
|
|||||||
@@ -129,6 +129,7 @@ NotificationsSettingsPage::NotificationsSettingsPage(SettingsDialog *dialog, OSD
|
|||||||
ui_->notifications_exp_chooser2->setIcon(IconLoader::Load(u"list-add"_s));
|
ui_->notifications_exp_chooser2->setIcon(IconLoader::Load(u"list-add"_s));
|
||||||
|
|
||||||
QObject::connect(pretty_popup_, &OSDPretty::PositionChanged, this, &NotificationsSettingsPage::PrettyOSDChanged);
|
QObject::connect(pretty_popup_, &OSDPretty::PositionChanged, this, &NotificationsSettingsPage::PrettyOSDChanged);
|
||||||
|
QObject::connect(ui_->richpresence_enabled, &QCheckBox::toggled, this, &NotificationsSettingsPage::DiscordRPCChanged);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -205,6 +206,11 @@ void NotificationsSettingsPage::Load() {
|
|||||||
|
|
||||||
ui_->notifications_fading->setChecked(pretty_popup_->fading());
|
ui_->notifications_fading->setChecked(pretty_popup_->fading());
|
||||||
|
|
||||||
|
// Discord
|
||||||
|
s.beginGroup(DiscordRPCSettings::kSettingsGroup);
|
||||||
|
ui_->richpresence_enabled->setChecked(s.value(DiscordRPCSettings::kEnabled).toBool());
|
||||||
|
s.endGroup();
|
||||||
|
|
||||||
UpdatePopupVisible();
|
UpdatePopupVisible();
|
||||||
|
|
||||||
Init(ui_->layout_notificationssettingspage->parentWidget());
|
Init(ui_->layout_notificationssettingspage->parentWidget());
|
||||||
@@ -247,6 +253,9 @@ void NotificationsSettingsPage::Save() {
|
|||||||
s.setValue(OSDPrettySettings::kFading, ui_->notifications_fading->isChecked());
|
s.setValue(OSDPrettySettings::kFading, ui_->notifications_fading->isChecked());
|
||||||
s.endGroup();
|
s.endGroup();
|
||||||
|
|
||||||
|
s.beginGroup(DiscordRPCSettings::kSettingsGroup);
|
||||||
|
s.setValue(DiscordRPCSettings::kEnabled, ui_->richpresence_enabled->isChecked());
|
||||||
|
s.endGroup();
|
||||||
}
|
}
|
||||||
|
|
||||||
void NotificationsSettingsPage::PrettyOpacityChanged(int value) {
|
void NotificationsSettingsPage::PrettyOpacityChanged(int value) {
|
||||||
@@ -385,3 +394,7 @@ void NotificationsSettingsPage::NotificationTypeChanged() {
|
|||||||
void NotificationsSettingsPage::PrettyOSDChanged() {
|
void NotificationsSettingsPage::PrettyOSDChanged() {
|
||||||
set_changed();
|
set_changed();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void NotificationsSettingsPage::DiscordRPCChanged() {
|
||||||
|
set_changed();
|
||||||
|
}
|
||||||
|
|||||||
@@ -70,6 +70,8 @@ class NotificationsSettingsPage : public SettingsPage {
|
|||||||
|
|
||||||
void PrettyOSDChanged();
|
void PrettyOSDChanged();
|
||||||
|
|
||||||
|
void DiscordRPCChanged();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Ui_NotificationsSettingsPage *ui_;
|
Ui_NotificationsSettingsPage *ui_;
|
||||||
OSDBase *osd_;
|
OSDBase *osd_;
|
||||||
|
|||||||
@@ -367,6 +367,22 @@
|
|||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QGroupBox" name="groupbox_discord">
|
||||||
|
<property name="title">
|
||||||
|
<string>Discord</string>
|
||||||
|
</property>
|
||||||
|
<layout class="QVBoxLayout" name="verticalLayout_3">
|
||||||
|
<item>
|
||||||
|
<widget class="QCheckBox" name="richpresence_enabled">
|
||||||
|
<property name="text">
|
||||||
|
<string>Enable Rich Presence</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<spacer name="spacer_bottom">
|
<spacer name="spacer_bottom">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
|
|||||||
Reference in New Issue
Block a user