diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:27:27 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:51:09 +0100 |
| commit | e964e89331f2cfef99a3f63172a127b6c02a9727 (patch) | |
| tree | 4c7d78573d17e523e4278027cee8fa88494366c8 /src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp | |
| parent | f09d36708fdab70ad51af374a65ddded64525f67 (diff) | |
| parent | 6f7192a048432e4792330244b74a2a39ccd8d515 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/plugins/gstreamer/camerabin/camerabincontainer.h
Change-Id: I4942d41d69112335fe0c994002f1b32ef3aad051
Diffstat (limited to 'src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp')
| -rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp b/src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp index 3f14ffcc5..6da86e569 100644 --- a/src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinresourcepolicy.cpp @@ -37,13 +37,13 @@ ** ****************************************************************************/ +#include "QtMultimedia/private/qtmultimediaglobal_p.h" #include "camerabinresourcepolicy.h" - //#define DEBUG_RESOURCE_POLICY #include <QtCore/qdebug.h> #include <QtCore/qset.h> -#ifdef HAVE_RESOURCE_POLICY +#if QT_CONFIG(resourcepolicy) #include <policy/resource.h> #include <policy/resources.h> #include <policy/resource-set.h> @@ -57,7 +57,7 @@ CamerabinResourcePolicy::CamerabinResourcePolicy(QObject *parent) : m_releasingResources(false), m_canCapture(false) { -#ifdef HAVE_RESOURCE_POLICY +#if QT_CONFIG(resourcepolicy) //loaded resource set is also kept requested for image and video capture sets m_resource = new ResourcePolicy::ResourceSet("camera"); m_resource->setAlwaysReply(); @@ -76,7 +76,7 @@ CamerabinResourcePolicy::CamerabinResourcePolicy(QObject *parent) : CamerabinResourcePolicy::~CamerabinResourcePolicy() { -#ifdef HAVE_RESOURCE_POLICY +#if QT_CONFIG(resourcepolicy) //ensure the resources are released if (m_resourceSet != NoResources) setResourceSet(NoResources); @@ -106,7 +106,7 @@ void CamerabinResourcePolicy::setResourceSet(CamerabinResourcePolicy::ResourceSe qDebug() << Q_FUNC_INFO << set; #endif -#ifdef HAVE_RESOURCE_POLICY +#if QT_CONFIG(resourcepolicy) QSet<ResourcePolicy::ResourceType> requestedTypes; switch (set) { @@ -178,7 +178,7 @@ void CamerabinResourcePolicy::setResourceSet(CamerabinResourcePolicy::ResourceSe bool CamerabinResourcePolicy::isResourcesGranted() const { -#ifdef HAVE_RESOURCE_POLICY +#if QT_CONFIG(resourcepolicy) const auto resources = m_resource->resources(); for (ResourcePolicy::Resource *resource : resources) if (!resource->isOptional() && !resource->isGranted()) @@ -201,7 +201,7 @@ void CamerabinResourcePolicy::handleResourcesGranted() void CamerabinResourcePolicy::handleResourcesReleased() { -#ifdef HAVE_RESOURCE_POLICY +#if QT_CONFIG(resourcepolicy) #ifdef DEBUG_RESOURCE_POLICY qDebug() << Q_FUNC_INFO; #endif @@ -212,7 +212,7 @@ void CamerabinResourcePolicy::handleResourcesReleased() void CamerabinResourcePolicy::resourcesAvailable() { -#ifdef HAVE_RESOURCE_POLICY +#if QT_CONFIG(resourcepolicy) if (m_resourceSet != NoResources) { m_resource->acquire(); } @@ -228,7 +228,7 @@ void CamerabinResourcePolicy::updateCanCapture() { const bool wasAbleToRecord = m_canCapture; m_canCapture = (m_resourceSet == VideoCaptureResources) || (m_resourceSet == ImageCaptureResources); -#ifdef HAVE_RESOURCE_POLICY +#if QT_CONFIG(resourcepolicy) const auto resources = m_resource->resources(); for (ResourcePolicy::Resource *resource : resources) { if (resource->type() != ResourcePolicy::LensCoverType) |