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

service/mpris: add isPlaying

Browse source
This commit is contained in:
outfoxxed 2024-11-20 19:52:11 -08:00
parent db9e633197
commit e2ef7b7982
Signed by: outfoxxed
GPG key ID: 4C88A185FB89301E
2 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/services/mpris/player.cpp
View file

@ -65,8 +65,7 @@ MprisPlayer::MprisPlayer(const QString& address, QObject* parent): QObject(paren
this->bCanGoPrevious.setBinding([this]() { return this->bCanControl && this->bpCanGoPrevious; }); this->bCanGoPrevious.setBinding([this]() { return this->bCanControl && this->bpCanGoPrevious; });
this->bCanTogglePlaying.setBinding([this]() { this->bCanTogglePlaying.setBinding([this]() {
return this->bPlaybackState == MprisPlaybackState::Playing ? this->bCanPause.value() return this->bIsPlaying ? this->bCanPause.value() : this->bCanPlay.value();
: this->bCanPlay.value();
}); });
this->bTrackTitle.setBinding([this]() { this->bTrackTitle.setBinding([this]() {
@ -116,6 +115,10 @@ MprisPlayer::MprisPlayer(const QString& address, QObject* parent): QObject(paren
} }
}); });
this->bIsPlaying.setBinding([this]() {
return this->bPlaybackState == MprisPlaybackState::Playing;
});
this->bLoopState.setBinding([this]() { this->bLoopState.setBinding([this]() {
const auto& status = this->bpLoopStatus.value(); const auto& status = this->bpLoopStatus.value();
@ -368,13 +371,18 @@ void MprisPlayer::pause() { this->setPlaybackState(MprisPlaybackState::Paused);
void MprisPlayer::stop() { this->setPlaybackState(MprisPlaybackState::Stopped); } void MprisPlayer::stop() { this->setPlaybackState(MprisPlaybackState::Stopped); }
void MprisPlayer::togglePlaying() { void MprisPlayer::togglePlaying() {
if (this->bPlaybackState == MprisPlaybackState::Playing) { if (this->bIsPlaying) {
this->pause(); this->pause();
} else { } else {
this->play(); this->play();
} }
} }
void MprisPlayer::setPlaying(bool playing) {
if (playing == this->bIsPlaying) return;
this->togglePlaying();
}
bool MprisPlayer::loopSupported() const { return this->pLoopStatus.exists(); } bool MprisPlayer::loopSupported() const { return this->pLoopStatus.exists(); }
void MprisPlayer::setLoopState(MprisLoopState::Enum loopState) { void MprisPlayer::setLoopState(MprisLoopState::Enum loopState) {

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

@ -154,6 +154,11 @@ class MprisPlayer: public QObject {
/// - If @@canControl is false, you cannot assign the `Stopped` state. /// - If @@canControl is false, you cannot assign the `Stopped` state.
/// (or any of the others, though their repsective properties will also be false) /// (or any of the others, though their repsective properties will also be false)
Q_PROPERTY(qs::service::mpris::MprisPlaybackState::Enum playbackState READ playbackState WRITE setPlaybackState NOTIFY playbackStateChanged BINDABLE bindablePlaybackState); Q_PROPERTY(qs::service::mpris::MprisPlaybackState::Enum playbackState READ playbackState WRITE setPlaybackState NOTIFY playbackStateChanged BINDABLE bindablePlaybackState);
/// True if @@playbackState == `MprisPlaybackState.Playing`.
///
/// Setting this property is equivalent to calling @@play() or @@pause().
/// You cannot set this property if @@canTogglePlaying is false.
Q_PROPERTY(bool isPlaying READ isPlaying WRITE setPlaying NOTIFY isPlayingChanged BINDABLE bindableIsPlaying);
/// The loop state of the media player, or `None` if @@loopSupported is false. /// The loop state of the media player, or `None` if @@loopSupported is false.
/// ///
/// May only be written to if @@canControl and @@loopSupported are true. /// May only be written to if @@canControl and @@loopSupported are true.
@ -274,6 +279,9 @@ public:
void setPlaybackState(MprisPlaybackState::Enum playbackState); void setPlaybackState(MprisPlaybackState::Enum playbackState);
QS_BINDABLE_GETTER(bool, bIsPlaying, isPlaying, bindableIsPlaying);
void setPlaying(bool playing);
QS_BINDABLE_GETTER(MprisLoopState::Enum, bLoopState, loopState, bindableLoopState); QS_BINDABLE_GETTER(MprisLoopState::Enum, bLoopState, loopState, bindableLoopState);
[[nodiscard]] bool loopSupported() const; [[nodiscard]] bool loopSupported() const;
void setLoopState(MprisLoopState::Enum loopState); void setLoopState(MprisLoopState::Enum loopState);
@ -351,6 +359,7 @@ signals:
void trackAlbumArtistChanged(); void trackAlbumArtistChanged();
void trackArtUrlChanged(); void trackArtUrlChanged();
void playbackStateChanged(); void playbackStateChanged();
void isPlayingChanged();
void loopStateChanged(); void loopStateChanged();
void loopSupportedChanged(); void loopSupportedChanged();
void rateChanged(); void rateChanged();
@ -412,6 +421,7 @@ private:
Q_OBJECT_BINDABLE_PROPERTY(MprisPlayer, bool, bCanGoPrevious, &MprisPlayer::canGoPreviousChanged); Q_OBJECT_BINDABLE_PROPERTY(MprisPlayer, bool, bCanGoPrevious, &MprisPlayer::canGoPreviousChanged);
Q_OBJECT_BINDABLE_PROPERTY_WITH_ARGS(MprisPlayer, qreal, bVolume, 1, &MprisPlayer::volumeChanged); Q_OBJECT_BINDABLE_PROPERTY_WITH_ARGS(MprisPlayer, qreal, bVolume, 1, &MprisPlayer::volumeChanged);
Q_OBJECT_BINDABLE_PROPERTY(MprisPlayer, MprisPlaybackState::Enum, bPlaybackState, &MprisPlayer::playbackStateChanged); Q_OBJECT_BINDABLE_PROPERTY(MprisPlayer, MprisPlaybackState::Enum, bPlaybackState, &MprisPlayer::playbackStateChanged);
Q_OBJECT_BINDABLE_PROPERTY(MprisPlayer, bool, bIsPlaying, &MprisPlayer::isPlayingChanged);
QS_BINDING_SUBSCRIBE_METHOD(MprisPlayer, bPlaybackState, requestPositionUpdate, onValueChanged); QS_BINDING_SUBSCRIBE_METHOD(MprisPlayer, bPlaybackState, requestPositionUpdate, onValueChanged);
Q_OBJECT_BINDABLE_PROPERTY(MprisPlayer, MprisLoopState::Enum, bLoopState, &MprisPlayer::loopStateChanged); Q_OBJECT_BINDABLE_PROPERTY(MprisPlayer, MprisLoopState::Enum, bLoopState, &MprisPlayer::loopStateChanged);
Q_OBJECT_BINDABLE_PROPERTY_WITH_ARGS(MprisPlayer, qreal, bRate, 1, &MprisPlayer::rateChanged); Q_OBJECT_BINDABLE_PROPERTY_WITH_ARGS(MprisPlayer, qreal, bRate, 1, &MprisPlayer::rateChanged);