diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:20:59 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:20:59 +0100 |
| commit | 422099e8ddeddc0631db3a369e3c52f0ffe2f455 (patch) | |
| tree | a38d0a77e8082c52072e9054b4399090405fcf31 /src/plugins/resourcepolicy/resourcepolicyimpl.cpp | |
| parent | 16aadf964dcdb71733414afdc7a548ca1ac58f97 (diff) | |
| parent | 88ef2bf83de18542428151553cbfa87de2469c90 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: Id367a610a3aefd288bfe287a3bf64606e582deb9
Diffstat (limited to 'src/plugins/resourcepolicy/resourcepolicyimpl.cpp')
| -rw-r--r-- | src/plugins/resourcepolicy/resourcepolicyimpl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/resourcepolicy/resourcepolicyimpl.cpp b/src/plugins/resourcepolicy/resourcepolicyimpl.cpp index 26f713560..aed9ccb09 100644 --- a/src/plugins/resourcepolicy/resourcepolicyimpl.cpp +++ b/src/plugins/resourcepolicy/resourcepolicyimpl.cpp @@ -48,6 +48,8 @@ ResourcePolicyImpl::ResourcePolicyImpl(QObject *parent) : QMediaPlayerResourceSetInterface(parent) + , m_status(Initial) + , m_videoEnabled(false) { m_resourceSet = new ResourcePolicy::ResourceSet("player", this); m_resourceSet->setAlwaysReply(); @@ -57,7 +59,6 @@ ResourcePolicyImpl::ResourcePolicyImpl(QObject *parent) audioResource->setStreamTag("media.name", "*"); m_resourceSet->addResourceObject(audioResource); - m_resourceSet->addResource(ResourcePolicy::VideoPlaybackType); m_resourceSet->update(); connect(m_resourceSet, SIGNAL(resourcesGranted(const QList<ResourcePolicy::ResourceType>)), |