slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[resourcepolicy] Add option to disable internal resource handling. JB#45899

Browse Source
This commit is contained in:
Juho Hämäläinen
2019-05-20 09:49:39 +03:00
parent 0e267b073f
commit 4ec3bf7e9e
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/resourcepolicy/resourcepolicyint.cpp
View File

@@ -56,7 +56,18 @@ ResourcePolicyInt::ResourcePolicyInt(QObject *parent)
{ {
const char *resourceClass = "player"; const char *resourceClass = "player";
QByteArray envVar = qgetenv("NEMO_RESOURCE_CLASS_OVERRIDE"); QByteArray envVar = qgetenv("NEMO_RESOURCE_DISABLE");
if (!envVar.isEmpty()) {
#ifdef RESOURCE_DEBUG
qDebug() << "##### Disable internal resource handling.";
#endif
m_status = GrantedResource;
m_available = true;
return;
}
envVar = qgetenv("NEMO_RESOURCE_CLASS_OVERRIDE");
if (!envVar.isEmpty()) { if (!envVar.isEmpty()) {
QString data(envVar); QString data(envVar);
// Only allow few resource classes // Only allow few resource classes
@@ -132,7 +143,7 @@ void ResourcePolicyInt::removeClient(ResourcePolicyImpl *client)
if (i.value().videoEnabled) { if (i.value().videoEnabled) {
--m_video; --m_video;
if (m_video == 0) { if (m_video == 0 && m_resourceSet) {
m_resourceSet->deleteResource(ResourcePolicy::VideoPlaybackType); m_resourceSet->deleteResource(ResourcePolicy::VideoPlaybackType);
m_resourceSet->update(); m_resourceSet->update();
} }
@@ -161,6 +172,9 @@ bool ResourcePolicyInt::isVideoEnabled(const ResourcePolicyImpl *client) const
void ResourcePolicyInt::setVideoEnabled(const ResourcePolicyImpl *client, bool videoEnabled) void ResourcePolicyInt::setVideoEnabled(const ResourcePolicyImpl *client, bool videoEnabled)
{ {
if (!m_resourceSet)
return;
bool update = false; bool update = false;
QMap<const ResourcePolicyImpl*, clientEntry>::iterator i = m_clients.find(client); QMap<const ResourcePolicyImpl*, clientEntry>::iterator i = m_clients.find(client);
@@ -284,8 +298,10 @@ void ResourcePolicyInt::release(const ResourcePolicyImpl *client)
#ifdef RESOURCE_DEBUG #ifdef RESOURCE_DEBUG
qDebug() << "##### " << i.value().id << ": RELEASE call resourceSet->release()"; qDebug() << "##### " << i.value().id << ": RELEASE call resourceSet->release()";
#endif #endif
m_resourceSet->release(); if (m_resourceSet) {
m_status = Initial; m_resourceSet->release();
m_status = Initial;
}
} }
} }
} }