diff --git a/src/core/mpris2.cpp b/src/core/mpris2.cpp index 416398c5a..2e246eb17 100644 --- a/src/core/mpris2.cpp +++ b/src/core/mpris2.cpp @@ -226,11 +226,11 @@ void Mpris2::EmitNotification(const QString &name) { //------------------Root Interface--------------------------// -bool Mpris2::CanQuit() { return true; } +bool Mpris2::CanQuit() const { return true; } -bool Mpris2::CanRaise() { return true; } +bool Mpris2::CanRaise() const { return true; } -bool Mpris2::HasTrackList() { return true; } +bool Mpris2::HasTrackList() const { return true; } QString Mpris2::Identity() const { return app_name_; } @@ -250,7 +250,7 @@ QString Mpris2::DesktopEntryAbsolutePath() const { QString Mpris2::DesktopEntry() const { return desktop_file_; } -QStringList Mpris2::SupportedUriSchemes() { +QStringList Mpris2::SupportedUriSchemes() const { static QStringList res = QStringList() << "file" << "http" @@ -261,7 +261,7 @@ QStringList Mpris2::SupportedUriSchemes() { } -QStringList Mpris2::SupportedMimeTypes() { +QStringList Mpris2::SupportedMimeTypes() const { static QStringList res = QStringList() << "x-content/audio-player" << "application/ogg" @@ -304,7 +304,7 @@ QString Mpris2::PlaybackStatus() const { return PlaybackStatus(app_->player()->GetState()); } -QString Mpris2::PlaybackStatus(Engine::State state) { +QString Mpris2::PlaybackStatus(Engine::State state) const { switch (state) { case Engine::Playing: return "Playing"; @@ -347,7 +347,7 @@ void Mpris2::SetLoopStatus(const QString &value) { } -double Mpris2::Rate() { return 1.0; } +double Mpris2::Rate() const { return 1.0; } void Mpris2::SetRate(double rate) { @@ -418,9 +418,9 @@ qint64 Mpris2::Position() const { return app_->player()->engine()->position_nanosec() / kNsecPerUsec; } -double Mpris2::MaximumRate() { return 1.0; } +double Mpris2::MaximumRate() const { return 1.0; } -double Mpris2::MinimumRate() { return 1.0; } +double Mpris2::MinimumRate() const { return 1.0; } bool Mpris2::CanGoNext() const { return app_->playlist_manager()->active() && app_->playlist_manager()->active()->next_row() != -1; @@ -445,7 +445,7 @@ bool Mpris2::CanSeek(Engine::State state) const { return app_->player()->GetCurrentItem() && state != Engine::Empty && !app_->player()->GetCurrentItem()->Metadata().is_stream(); } -bool Mpris2::CanControl() { return true; } +bool Mpris2::CanControl() const { return true; } void Mpris2::Next() { if (CanGoNext()) { @@ -503,14 +503,14 @@ void Mpris2::OpenUri(const QString &uri) { app_->playlist_manager()->active()->InsertUrls(QList() << QUrl(uri), -1, true); } -Track_Ids Mpris2::Tracks() { +Track_Ids Mpris2::Tracks() const { // TODO return Track_Ids(); } -bool Mpris2::CanEditTracks() { return false; } +bool Mpris2::CanEditTracks() const { return false; } -TrackMetadata Mpris2::GetTracksMetadata(const Track_Ids &tracks) { +TrackMetadata Mpris2::GetTracksMetadata(const Track_Ids &tracks) const { Q_UNUSED(tracks); @@ -543,7 +543,7 @@ quint32 Mpris2::PlaylistCount() const { return app_->playlist_manager()->GetAllPlaylists().size(); } -QStringList Mpris2::Orderings() { return QStringList() << "User"; } +QStringList Mpris2::Orderings() const { return QStringList() << "User"; } namespace { diff --git a/src/core/mpris2.h b/src/core/mpris2.h index 7391576d8..fbc7e98f3 100644 --- a/src/core/mpris2.h +++ b/src/core/mpris2.h @@ -118,13 +118,13 @@ class Mpris2 : public QObject { Q_PROPERTY(MaybePlaylist ActivePlaylist READ ActivePlaylist) // Root Properties - static bool CanQuit(); - static bool CanRaise(); - static bool HasTrackList(); + bool CanQuit() const; + bool CanRaise() const; + bool HasTrackList() const; QString Identity() const; QString DesktopEntry() const; - static QStringList SupportedUriSchemes(); - static QStringList SupportedMimeTypes(); + QStringList SupportedUriSchemes() const; + QStringList SupportedMimeTypes() const; // Root Properties added in MPRIS 2.2 bool CanSetFullscreen() const { return false; } @@ -133,13 +133,13 @@ class Mpris2 : public QObject { // Methods void Raise(); - static void Quit(); + void Quit(); // Player Properties QString PlaybackStatus() const; QString LoopStatus() const; void SetLoopStatus(const QString &value); - static double Rate(); + double Rate() const; void SetRate(double rate); bool Shuffle() const; void SetShuffle(bool enable); @@ -147,14 +147,14 @@ class Mpris2 : public QObject { double Volume() const; void SetVolume(double value); qint64 Position() const; - static double MaximumRate(); - static double MinimumRate(); + double MaximumRate() const; + double MinimumRate() const; bool CanGoNext() const; bool CanGoPrevious() const; bool CanPlay() const; bool CanPause() const; bool CanSeek() const; - static bool CanControl(); + bool CanControl() const; // Methods void Next(); @@ -168,18 +168,18 @@ class Mpris2 : public QObject { void OpenUri(const QString &uri); // TrackList Properties - static Track_Ids Tracks(); - static bool CanEditTracks(); + Track_Ids Tracks() const; + bool CanEditTracks() const; // Methods - static TrackMetadata GetTracksMetadata(const Track_Ids &tracks); - static void AddTrack(const QString &uri, const QDBusObjectPath &afterTrack, bool setAsCurrent); - static void RemoveTrack(const QDBusObjectPath &trackId); - static void GoTo(const QDBusObjectPath &trackId); + TrackMetadata GetTracksMetadata(const Track_Ids &tracks) const; + void AddTrack(const QString &uri, const QDBusObjectPath &afterTrack, bool setAsCurrent); + void RemoveTrack(const QDBusObjectPath &trackId); + void GoTo(const QDBusObjectPath &trackId); // Playlist Properties quint32 PlaylistCount() const; - static QStringList Orderings(); + QStringList Orderings() const; MaybePlaylist ActivePlaylist() const; // Methods @@ -215,10 +215,10 @@ class Mpris2 : public QObject { private: void EmitNotification(const QString &name); - static void EmitNotification(const QString &name, const QVariant &val); - static void EmitNotification(const QString &name, const QVariant &val, const QString &mprisEntity); + void EmitNotification(const QString &name, const QVariant &val); + void EmitNotification(const QString &name, const QVariant &val, const QString &mprisEntity); - static QString PlaybackStatus(Engine::State state); + QString PlaybackStatus(Engine::State state) const; QString current_track_id() const;