From: Thomas McGuire <thomas.mcguire.qnx@kdab.com>
Date: Fri, 27 Jul 2012 09:37:31 +0000 (+0200)
Subject: Blackberry: Fix metadata reader for more recent OS versions
X-Git-Tag: upstream/5.2.95+rc1~234
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=93823c2251c1a83c233351f8901243715a8ac9e9;p=platform%2Fupstream%2Fqtmultimedia.git

Blackberry: Fix metadata reader for more recent OS versions

Change-Id: I33dae07736eb071f9db3e08c5342921a655ddd57
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
---

diff --git a/src/plugins/blackberry/bbmetadata.cpp b/src/plugins/blackberry/bbmetadata.cpp
index 1e9a174..0355d63 100644
--- a/src/plugins/blackberry/bbmetadata.cpp
+++ b/src/plugins/blackberry/bbmetadata.cpp
@@ -64,8 +64,13 @@ static const int mediaTypeVideoFlag = 2;
 bool BbMetaData::parse(const QString &contextName)
 {
     clear();
-    const QString fileName =
+    QString fileName =
             QString("/pps/services/multimedia/renderer/context/%1/metadata").arg(contextName);
+
+    // In newer OS versions, the filename is "metadata0", not metadata, so try both.
+    if (!QFile::exists(fileName))
+        fileName += '0';
+
     QFile metaDataFile(fileName);
     if (!metaDataFile.open(QFile::ReadOnly)) {
         qWarning() << "Unable to open media metadata file" << fileName << ":"