From 93823c2251c1a83c233351f8901243715a8ac9e9 Mon Sep 17 00:00:00 2001 From: Thomas McGuire Date: Fri, 27 Jul 2012 11:37:31 +0200 Subject: [PATCH] Blackberry: Fix metadata reader for more recent OS versions Change-Id: I33dae07736eb071f9db3e08c5342921a655ddd57 Reviewed-by: Kevin Krammer Reviewed-by: Sean Harmer --- src/plugins/blackberry/bbmetadata.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 << ":" -- 2.7.4