diff options
| author | Ling Hu <ling.hu@nokia.com> | 2012-03-26 10:51:14 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-26 09:14:30 +0200 |
| commit | 6e177b4dce1de3ad02b0f10d78e6557303897919 (patch) | |
| tree | f2ec62403834e313f52bf047c91a29b27cf5d284 /src/multimedia/qmediaresourcepolicy_p.cpp | |
| parent | 45bd0d938e7b2ac58d3f06e7ede52fa70ffff002 (diff) | |
Minor improvements on resource-policy interfaces
Change-Id: I3e9c7c4d1fca90e0fb97b0058e9b5a5e34940025
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'src/multimedia/qmediaresourcepolicy_p.cpp')
| -rw-r--r-- | src/multimedia/qmediaresourcepolicy_p.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/multimedia/qmediaresourcepolicy_p.cpp b/src/multimedia/qmediaresourcepolicy_p.cpp index 630870c05..0262c0f85 100644 --- a/src/multimedia/qmediaresourcepolicy_p.cpp +++ b/src/multimedia/qmediaresourcepolicy_p.cpp @@ -86,9 +86,10 @@ QObject* QMediaResourcePolicy::createResourceSet(const QString& interfaceId) QMediaResourceSetFactoryInterface *factory = qobject_cast<QMediaResourceSetFactoryInterface*>(resourcePolicyLoader() ->instance(QLatin1String("default"))); - if (!factory) - return 0; - QObject* obj = factory->create(interfaceId); + QObject* obj = 0; + if (factory) + obj = factory->create(interfaceId); + if (!obj) { if (interfaceId == QLatin1String(QMediaPlayerResourceSetInterface_iid)) { obj = new QDummyMediaPlayerResourceSet(dummyRoot()); @@ -107,6 +108,7 @@ void QMediaResourcePolicy::destroyResourceSet(QObject* resourceSet) QMediaResourceSetFactoryInterface *factory = qobject_cast<QMediaResourceSetFactoryInterface*>(resourcePolicyLoader() ->instance(QLatin1String("default"))); + Q_ASSERT(factory); if (!factory) return; return factory->destroy(resourceSet); |