poz/quickshell
1
0
Fork 0
forked from quickshell/quickshell
Code Pull requests Activity

core/util: add experimental member macros

Browse source 
An experiment that should reduce boilerplate for properties that just
access a backing value. Code also exists for using it as an interface
for other properties as well, but isn't currently in use.
This commit is contained in:
outfoxxed 2024-07-30 20:23:57 -07:00
parent 8873a06962
commit ba1e535f9c
Signed by untrusted user: outfoxxed
GPG key ID: 4C88A185FB89301E
6 changed files with 236 additions and 185 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/services/mpris/player.hpp
View file

@ -7,7 +7,7 @@
#include <qtypes.h>
#include "../../core/doc.hpp"
#include "../../core/types.hpp"
#include "../../core/util.hpp"
#include "../../dbus/properties.hpp"
#include "dbus_player.h"
#include "dbus_player_app.h"
@ -239,8 +239,8 @@ public:
[[nodiscard]] bool canRaise() const;
[[nodiscard]] bool canSetFullscreen() const;
[[nodiscard]] QString identity() const;
[[nodiscard]] QString desktopEntry() const;
[[nodiscard]] const QString& identity() const;
[[nodiscard]] const QString& desktopEntry() const;
[[nodiscard]] qlonglong positionMs() const;
[[nodiscard]] qreal position() const;
@ -254,13 +254,7 @@ public:
[[nodiscard]] bool volumeSupported() const;
void setVolume(qreal volume);
[[nodiscard]] quint32 uniqueId() const;
[[nodiscard]] QVariantMap metadata() const;
[[nodiscard]] QString trackTitle() const;
[[nodiscard]] QString trackAlbum() const;
[[nodiscard]] QString trackAlbumArtist() const;
[[nodiscard]] QVector<QString> trackArtists() const;
[[nodiscard]] QString trackArtUrl() const;
[[nodiscard]] const QVariantMap& metadata() const;
[[nodiscard]] MprisPlaybackState::Enum playbackState() const;
void setPlaybackState(MprisPlaybackState::Enum playbackState);
@ -338,13 +332,6 @@ private slots:
void onLoopStatusChanged();
private:
DropEmitter setLength(qlonglong length);
DropEmitter setTrackTitle(QString title);
DropEmitter setTrackAlbum(QString album);
DropEmitter setTrackAlbumArtist(QString albumArtist);
DropEmitter setTrackArtists(QVector<QString> artists);
DropEmitter setTrackArtUrl(QString artUrl);
// clang-format off
dbus::DBusPropertyGroup appProperties;
dbus::DBusProperty<QString> pIdentity {this->appProperties, "Identity"};
@ -386,10 +373,26 @@ private:
QString mTrackId;
QString mTrackUrl;
QString mTrackTitle;
QVector<QString> mTrackArtists;
QString mTrackAlbum;
QString mTrackAlbumArtist;
QVector<QString> mTrackArtists;
QString mTrackArtUrl;
DECLARE_MEMBER_NS(MprisPlayer, uniqueId, mUniqueId);
DECLARE_MEMBER(MprisPlayer, length, mLength, lengthChanged);
DECLARE_MEMBER_SET(length, setLength);
// clang-format off
DECLARE_PRIVATE_MEMBER(MprisPlayer, trackTitle, setTrackTitle, mTrackTitle, trackTitleChanged);
DECLARE_PRIVATE_MEMBER(MprisPlayer, trackArtists, setTrackArtists, mTrackArtists, trackArtistsChanged);
DECLARE_PRIVATE_MEMBER(MprisPlayer, trackAlbum, setTrackAlbum, mTrackAlbum, trackAlbumChanged);
DECLARE_PRIVATE_MEMBER(MprisPlayer, trackAlbumArtist, setTrackAlbumArtist, mTrackAlbumArtist, trackAlbumArtistChanged);
DECLARE_PRIVATE_MEMBER(MprisPlayer, trackArtUrl, setTrackArtUrl, mTrackArtUrl, trackArtUrlChanged);
// clang-format on
public:
DECLARE_MEMBER_GET(uniqueId);
};
} // namespace qs::service::mpris