From 3f7ebe2f161b0d18f55d547b530f5a999488e03f Mon Sep 17 00:00:00 2001
From: Janos Kovacs <janos.f.kovacs@nokia.com>
Date: Mon, 28 Jun 2010 14:08:00 +0300
Subject: merging with the swp.plcy-357-harmattan branch

---
 libresourceqt/src/resource-set.cpp | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

(limited to 'libresourceqt/src/resource-set.cpp')

diff --git a/libresourceqt/src/resource-set.cpp b/libresourceqt/src/resource-set.cpp
index 7dfd5d7..8ddb54b 100644
--- a/libresourceqt/src/resource-set.cpp
+++ b/libresourceqt/src/resource-set.cpp
@@ -84,7 +84,7 @@ void ResourceSet::addResourceObject(Resource *resource)
         }
         else if (audioResource->audioGroupIsSet()) {
             qDebug("ResourceSet::%s().... %d registering audio proprerties later", __FUNCTION__, __LINE__);
-            pendingAudioProperties = true;            
+            pendingAudioProperties = true;
         }
     }
 }
@@ -129,6 +129,9 @@ bool ResourceSet::addResource(ResourceType type)
         case LensCoverType:
             resource = new LensCoverResource;
             break;
+        case HeadsetButtonsType:
+            resource = new HeadsetButtonsResource;
+            break;
         default:
             return false;
     }
@@ -290,14 +293,9 @@ void ResourceSet::registerAudioProperties()
         qDebug("%s(): initializing...", __FUNCTION__);
         pendingAudioProperties = true;
         initialize();
+        return;
     }
-    if (!resourceEngine->isConnectedToManager() && !resourceEngine->isConnectingToManager()) {
-        qDebug("%s(): Connecting to Manager...", __FUNCTION__);
-
-        pendingAudioProperties = true;
-        resourceEngine->connectToManager();
-    }
-    else {
+    else if (resourceEngine->isConnectedToManager()) {
         qDebug("Registering new audio settings:");
         qDebug() << "\taudio group: " << audioResource->audioGroup();
         qDebug() << "\tPID: " << audioResource->processID();
@@ -306,12 +304,21 @@ void ResourceSet::registerAudioProperties()
         if((audioResource->processID() > 0) && audioResource->streamTagName() != "media.name") {
             qWarning() << "streamTagName should be 'media.name' it is '" << audioResource->streamTagName() << "'";
         }
-        resourceEngine->registerAudioProperties(audioResource->audioGroup(),
-                                                audioResource->processID(),
-                                                audioResource->streamTagName(),
-                                                audioResource->streamTagValue());
+        bool r = resourceEngine->registerAudioProperties(audioResource->audioGroup(),
+                                                         audioResource->processID(),
+                                                         audioResource->streamTagName(),
+                                                         audioResource->streamTagValue());
+        qDebug("resourceEngine->registerAudioProperties returned %s", r?"true":"false");
+
         pendingAudioProperties = false;
     }
+    else { //if (!resourceEngine->isConnectedToManager() && !resourceEngine->isConnectingToManager()) {
+        qDebug("%s(): Connecting to Manager...", __FUNCTION__);
+
+        pendingAudioProperties = true;
+        resourceEngine->connectToManager();
+        return;
+    }
 }
 
 void ResourceSet::handleGranted(quint32 bitmaskOfGrantedResources)
-- 
cgit v1.2.3