Differential D3667 Diff 9025 dataengines/mpris2/playercontainer.cpp

Changeset View

Standalone View

View Options

dataengines/mpris2/playercontainer.cpp

Context not available.
113 Q_ASSERT(!busAddress.isEmpty()); 113​ Q_ASSERT(!busAddress.isEmpty());
114 Q_ASSERT(busAddress.startsWith(QLatin1String("org.mpris.MediaPlayer2."))); 114​ Q_ASSERT(busAddress.startsWith(QLatin1String("org.mpris.MediaPlayer2.")));
115 115​
116​ // MPRIS specifies, that in case a player supports several instances, each additional
117​ // instance after the first one is supposed to append ".instance<pid>" at the end of
118​ // its dbus address. So instances of media players, which implement this correctly
119​ // can have one D-Bus connection per instance and can be identified by their pids.
davidedmundsonUnsubmitted
Not Done

There is a way to do it which will work for all players much more reliably:

auto message = QDBusMessage::createMethodCall("org.freedesktop.DBus", "/", "org.freedesktop.DBus", "GetConnectionUnixProcessID");
message.setArguments({m_dbusAddress});

QDBusReply<uint> reply = QDBusConnection::sessionBus().call(message);

//safe to be blocking as we're calling a method on DBus server not a client, so no different from QDBusConnection::connect()

 if (!reply.isError) {
   secondaryInstancePid = reply.value();
}
davidedmundson: There is a way to do it which will work for all players much more reliably: auto message =…
davidedmundsonUnsubmitted
Not Done

Ninja edit.

If you do go with that approach don't use the code above.

Use
secondaryInstancePid = QDBusConnectionInterface::servicePid(m_dbusAddress).value();

davidedmundson: Ninja edit. If you do go with that approach don't use the code above. Use…
120​ QDBusReply<uint> pidReply = QDBusConnection::sessionBus().interface()->servicePid(busAddress);
121​ if (pidReply.isValid()) {
122​ setData("InstancePid", pidReply.value());
123​ }
broulikUnsubmitted
Not Done

QLatin1Char?

broulik: QLatin1Char?
124​
broulikUnsubmitted
Not Done

Can you use rightRef and the like, if possible?

broulik: Can you use rightRef and the like, if possible?
116 m_propsIface = new OrgFreedesktopDBusPropertiesInterface( 125​ m_propsIface = new OrgFreedesktopDBusPropertiesInterface(
117 busAddress, MPRIS2_PATH, 126​ busAddress, MPRIS2_PATH,
118 QDBusConnection::sessionBus(), this); 127​ QDBusConnection::sessionBus(), this);
Context not available.
broulikUnsubmitted
Not Done
bool ok;

is sufficient in that context imho

broulik: bool ok; is sufficient in that context imho