Skip to content

Commit f54e49e

Browse files
MazhoonR1tschY
authored andcommitted
Remove obsolete C++ backend parts for "current song" text.
1 parent 7b5fecf commit f54e49e

File tree

4 files changed

+0
-9
lines changed

4 files changed

+0
-9
lines changed

app/src/models/mprisplayersmodel.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ QVariant MprisPlayersModel::data(const QModelIndex &index, int role) const
5656
return m_players[index.row()];
5757
case IsPlayingRole:
5858
return player->isPlaying();
59-
case CurrentSongRole:
60-
return player->currentSong();
6159
case TitleRole:
6260
return player->title();
6361
case ArtistRole:
@@ -95,7 +93,6 @@ QHash<int, QByteArray> MprisPlayersModel::roleNames() const
9593
roles[Player] = "player";
9694
roles[PlayerNameRole] = "playerName";
9795
roles[IsPlayingRole] = "isPlaying";
98-
roles[CurrentSongRole] = "song";
9996
roles[TitleRole] = "title";
10097
roles[ArtistRole] = "artist";
10198
roles[AlbumRole] = "album";

app/src/models/mprisplayersmodel.h

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ class MprisPlayersModel : public QAbstractListModel
3838
Player = Qt::UserRole,
3939
PlayerNameRole,
4040
IsPlayingRole,
41-
CurrentSongRole,
4241
TitleRole,
4342
ArtistRole,
4443
AlbumRole,

plugins/sf_mprisremote/mprisremoteplugin.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,6 @@ void MprisPlayer::setPosition(int value)
8787

8888
void MprisPlayer::receivePacket(const NetworkPacket &np, AlbumArtCache *cache)
8989
{
90-
m_currentSong =
91-
np.get<QString>(QStringLiteral("nowPlaying"), m_currentSong);
9290
m_title =
9391
np.get<QString>(QStringLiteral("title"), m_title);
9492
m_artist =

plugins/sf_mprisremote/mprisremoteplugin.h

-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ class MprisPlayer : public QObject
3535
Q_CLASSINFO("D-Bus Interface", "de.richardliebscher.sailfishconnect.mprisremote.player")
3636
Q_PROPERTY(QString name READ name CONSTANT)
3737
Q_PROPERTY(bool isPlaying READ isPlaying NOTIFY propertiesChanged)
38-
Q_PROPERTY(QString currentSong READ currentSong NOTIFY propertiesChanged)
3938
Q_PROPERTY(QString title READ title NOTIFY propertiesChanged)
4039
Q_PROPERTY(QString artist READ artist NOTIFY propertiesChanged)
4140
Q_PROPERTY(QString album READ album NOTIFY propertiesChanged)
@@ -56,7 +55,6 @@ class MprisPlayer : public QObject
5655

5756
QString name() const { return m_player; }
5857
bool isPlaying() const { return m_isPlaying; }
59-
QString currentSong() const { return m_currentSong; }
6058
QString title() const { return m_title; }
6159
QString artist() const { return m_artist; }
6260
QString album() const { return m_album; }
@@ -105,7 +103,6 @@ public slots:
105103
qint64 m_length = -1;
106104
qint64 m_lastPosition = -1;
107105
qint64 m_lastPositionTime = -1;
108-
QString m_currentSong;
109106
QString m_title;
110107
QString m_artist;
111108
QString m_album;

0 commit comments

Comments
 (0)