summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Merry <dev@randomguy3.me.uk>2012-04-20 18:18:55 +0100
committerAlex Merry <dev@randomguy3.me.uk>2012-04-20 18:18:55 +0100
commit70815ead3b4e50fc0db9d967bc3057def289f6f0 (patch)
tree2509f8c2264b6a839af002461c0901a2ca70ea6f
parentf02317f7bcdf425cceacf9f77ce56382a0963ccd (diff)
Warn about the NoTrack track id in metadata
Empty metadata should be used instead, for compatibility with older clients.
-rw-r--r--mpris2/interfacetest.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/mpris2/interfacetest.cpp b/mpris2/interfacetest.cpp
index 69a2283..592ac61 100644
--- a/mpris2/interfacetest.cpp
+++ b/mpris2/interfacetest.cpp
@@ -343,8 +343,10 @@ void InterfaceTest::checkMetadata(const QVariantMap& metadata,
} else {
QDBusObjectPath trackid = metadata.value("mpris:trackid").value<QDBusObjectPath>();
if (trackid.path().isEmpty()) {
- (*errors) << "mpris:trackid entry is an empty path";
- } else if (trackid.path().startsWith("/org/mpris/") && trackid.path() != "/org/mpris/MediaPlayer2/TrackList/NoTrack") {
+ (*errors) << "mpris:trackid entry is an empty path (seriously, how did you convince D-Bus to let you do that?)";
+ } else if (trackid.path() == "/org/mpris/MediaPlayer2/TrackList/NoTrack") {
+ (*warnings) << "mpris:trackid entry indicates \"no track\"; for compatibility with older clients, this should be represented by providing no metadata";
+ } else if (trackid.path().startsWith("/org/mpris/")) {
(*warnings) << "The /org/mpris/ namespace is reserved, and should not be used for track ids";
}
}