Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Song: Only include mpris when built with DBUS

Browse Source
This commit is contained in:
Jonas Kvinge 2024-03-13 18:15:51 +01:00
parent 27ee6e7643
commit 2ccb0af75e
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/song.cpp
View File

@ -55,8 +55,10 @@
#include "utilities/timeconstants.h" #include "utilities/timeconstants.h"
#include "song.h" #include "song.h"
#include "sqlquery.h" #include "sqlquery.h"
#include "mpris_common.h"
#include "sqlrow.h" #include "sqlrow.h"
#ifdef HAVE_DBUS
# include "mpris_common.h"
#endif
#include "tagreadermessages.pb.h" #include "tagreadermessages.pb.h"
const QStringList Song::kColumns = QStringList() << "title" const QStringList Song::kColumns = QStringList() << "title"
@ -1745,6 +1747,7 @@ void Song::BindToFtsQuery(SqlQuery *query) const {
} }
#ifdef HAVE_DBUS
void Song::ToXesam(QVariantMap *map) const { void Song::ToXesam(QVariantMap *map) const {
using mpris::AddMetadata; using mpris::AddMetadata;
@ -1771,6 +1774,7 @@ void Song::ToXesam(QVariantMap *map) const {
} }
} }
#endif
bool Song::MergeFromEngineMetadata(const EngineMetadata &engine_metadata) { bool Song::MergeFromEngineMetadata(const EngineMetadata &engine_metadata) {

2
src/core/song.h
View File

@ -433,7 +433,9 @@ class Song {
// Save // Save
void BindToQuery(SqlQuery *query) const; void BindToQuery(SqlQuery *query) const;
void BindToFtsQuery(SqlQuery *query) const; void BindToFtsQuery(SqlQuery *query) const;
#ifdef HAVE_DBUS
void ToXesam(QVariantMap *map) const; void ToXesam(QVariantMap *map) const;
#endif
void ToProtobuf(spb::tagreader::SongMetadata *pb) const; void ToProtobuf(spb::tagreader::SongMetadata *pb) const;
bool MergeFromEngineMetadata(const EngineMetadata &engine_metadata); bool MergeFromEngineMetadata(const EngineMetadata &engine_metadata);