Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions linux/media/mediacontroller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -288,8 +288,7 @@ QStringList MediaController::getPlayingMediaPlayers()
continue;
}

QVariant playbackStatus = playerInterface.property("PlaybackStatus");
if (playbackStatus.isValid() && playbackStatus.toString() == "Playing")
if (PlayerStatusWatcher::playbackStatusOf(service) == "Playing")
{
playingServices << service;
LOG_DEBUG("Found playing service: " << service);
Expand Down Expand Up @@ -373,9 +372,9 @@ void MediaController::pause()
continue;
}

QVariant playbackStatus = playerInterface.property("PlaybackStatus");
LOG_DEBUG("PlaybackStatus for " << service << ": " << playbackStatus.toString());
if (!playbackStatus.isValid() || playbackStatus.toString() != "Playing")
const QString playbackStatus = PlayerStatusWatcher::playbackStatusOf(service);
LOG_DEBUG("PlaybackStatus for " << service << ": " << playbackStatus);
if (playbackStatus != "Playing")
{
continue;
}
Expand Down
30 changes: 22 additions & 8 deletions linux/media/playerstatuswatcher.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,21 +47,35 @@ void PlayerStatusWatcher::onServiceOwnerChanged(const QString &name, const QStri
}
}

QString PlayerStatusWatcher::playbackStatusOf(const QString &playerService)
{
if (playerService.isEmpty()) {
return QString();
}

QDBusInterface props(playerService, "/org/mpris/MediaPlayer2",
"org.freedesktop.DBus.Properties", QDBusConnection::sessionBus());
if (!props.isValid()) {
return QString();
}

QDBusReply<QVariant> reply = props.call("Get", "org.mpris.MediaPlayer2.Player", "PlaybackStatus");
if (!reply.isValid()) {
return QString();
}

return reply.value().toString();
}

QString PlayerStatusWatcher::getCurrentPlaybackStatus(const QString &playerService)
{
QDBusConnection bus = QDBusConnection::sessionBus();
QStringList services = bus.interface()->registeredServiceNames().value();

for (const QString &service : services) {
if (service.startsWith("org.mpris.MediaPlayer2.")) {
QDBusInterface iface(service, "/org/mpris/MediaPlayer2",
"org.mpris.MediaPlayer2.Player", bus);

if (iface.isValid()) {
QVariant status = iface.property("PlaybackStatus");
if (status.isValid() && status.toString() == "Playing") {
return status.toString();
}
if (playbackStatusOf(service) == "Playing") {
return QStringLiteral("Playing");
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions linux/media/playerstatuswatcher.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ class PlayerStatusWatcher : public QObject {
public:
explicit PlayerStatusWatcher(const QString &playerService, QObject *parent = nullptr);
static QString getCurrentPlaybackStatus(const QString &playerService);
// Chromium serves an empty Introspect document, so the metaobject QDBusInterface builds
// from it has no PlaybackStatus and property() reads invalid on a player that is Playing.
static QString playbackStatusOf(const QString &playerService);

signals:
void playbackStatusChanged(const QString &status);
Expand Down