* updated license headers

* updated documentation

1 files changed, 94 insertions, 96 deletions

diff --git a/AudioManagerDaemon/src/CAmControlReceiver.cpp b/AudioManagerDaemon/src/CAmControlReceiver.cpp
index 6d68089..3d64226 100644
--- a/AudioManagerDaemon/src/CAmControlReceiver.cpp
+++ b/AudioManagerDaemon/src/CAmControlReceiver.cpp
@@ -1,36 +1,34 @@
 /**
- * Copyright (C) 2011, BMW AG
+ * Copyright (C) 2012, GENIVI Alliance, Inc.
+ * Copyright (C) 2012, BMW AG
  *
- * GeniviAudioMananger AudioManagerDaemon
+ * This file is part of GENIVI Project AudioManager.
  *
- * \file CAmControlReceiver.cpp
+ * Contributions are licensed to the GENIVI Alliance under one or more
+ * Contribution License Agreements.
+ *
+ * \copyright
+ * This Source Code Form is subject to the terms of the
+ * Mozilla Public License, v. 2.0. If a  copy of the MPL was not distributed with
+ * this file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * \date 20-Oct-2011 3:42:04 PM
- * \author Christian Mueller (christian.ei.mueller@bmw.de)
  *
- * \section License
- * GNU Lesser General Public License, version 2.1, with special exception (GENIVI clause)
- * Copyright (C) 2011, BMW AG Christian Mueller  Christian.ei.mueller@bmw.de
+ * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012
  *
- * This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation.
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License, version 2.1, for more details.
- * You should have received a copy of the GNU Lesser General Public License, version 2.1, along with this program; if not, see <http://www.gnu.org/licenses/lgpl-2.1.html>.
- * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may also be applicable to programs even in cases in which the program is not a library in the technical sense.
- * Linking AudioManager statically or dynamically with other modules is making a combined work based on AudioManager. You may license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to license your linked modules under the GNU Lesser General Public License, version 2.1, you may use the program under the following exception.
- * As a special exception, the copyright holders of AudioManager give you permission to combine AudioManager with software programs or libraries that are released under any license unless such a combination is not permitted by the license of such a software program or library. You may copy and distribute such a system following the terms of the GNU Lesser General Public License, version 2.1, including this special exception, for AudioManager and the licenses of the other code concerned.
- * Note that people who make modified versions of AudioManager are not obligated to grant this special exception for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, version 2.1, gives permission to release a modified version without this exception; this exception also makes it possible to release a modified version which carries forward this exception.
+ * \file CAmControlReceiver.cpp
+ * For further information see http://www.genivi.org/.
  *
  */
 
-#include <config.h>
-#include <shared/CAmSocketHandler.h>
 #include "CAmControlReceiver.h"
+#include <cassert>
+#include "config.h"
 #include "CAmDatabaseHandler.h"
 #include "CAmRoutingSender.h"
 #include "CAmCommandSender.h"
 #include "CAmRouter.h"
 #include "shared/CAmDltWrapper.h"
-#include <cassert>
+#include "shared/CAmSocketHandler.h"
 
 namespace am {
 
@@ -54,7 +52,7 @@ CAmControlReceiver::~CAmControlReceiver()
 
 am_Error_e CAmControlReceiver::getRoute(const bool onlyfree, const am_sourceID_t sourceID, const am_sinkID_t sinkID, std::vector<am_Route_s> & returnList)
 {
-    return mRouter->getRoute(onlyfree, sourceID, sinkID, returnList);
+    return (mRouter->getRoute(onlyfree, sourceID, sinkID, returnList));
 }
 
 am_Error_e CAmControlReceiver::connect(am_Handle_s & handle, am_connectionID_t & connectionID, const am_ConnectionFormat_e format, const am_sourceID_t sourceID, const am_sinkID_t sinkID)
@@ -69,10 +67,10 @@ am_Error_e CAmControlReceiver::connect(am_Handle_s & handle, am_connectionID_t &
 
     //todo: enter function to find out what happends if the same connection is in the course of being build up.
     if (mDatabaseHandler->existConnection(tempConnection))
-        return E_ALREADY_EXISTS; //todo:enter the correct connectionID here?
+        return (E_ALREADY_EXISTS); //todo:enter the correct connectionID here?
 
     mDatabaseHandler->enterConnectionDB(tempConnection, connectionID);
-    return mRoutingSender->asyncConnect(handle, connectionID, sourceID, sinkID, format);
+    return (mRoutingSender->asyncConnect(handle, connectionID, sourceID, sinkID, format));
 }
 
 am_Error_e CAmControlReceiver::disconnect(am_Handle_s & handle, const am_connectionID_t connectionID)
@@ -80,8 +78,8 @@ am_Error_e CAmControlReceiver::disconnect(am_Handle_s & handle, const am_connect
     logInfo("CAmControlReceiver::disconnect got called, connectionID=", connectionID);
 
     if (!mDatabaseHandler->existConnectionID(connectionID))
-        return E_NON_EXISTENT; //todo: check with EA model and correct
-    return mRoutingSender->asyncDisconnect(handle, connectionID);
+        return (E_NON_EXISTENT); //todo: check with EA model and correct
+    return (mRoutingSender->asyncDisconnect(handle, connectionID));
 }
 
 am_Error_e CAmControlReceiver::crossfade(am_Handle_s & handle, const am_HotSink_e hotSource, const am_crossfaderID_t crossfaderID, const am_RampType_e rampType, const am_time_t rampTime)
@@ -89,8 +87,8 @@ am_Error_e CAmControlReceiver::crossfade(am_Handle_s & handle, const am_HotSink_
     logInfo("CAmControlReceiver::crossfade got called, hotSource=", hotSource, "crossfaderID=", crossfaderID, "rampType=", rampType, "rampTime=", rampTime);
 
     if (!mDatabaseHandler->existcrossFader(crossfaderID))
-        return E_NON_EXISTENT;
-    return mRoutingSender->asyncCrossFade(handle, crossfaderID, hotSource, rampType, rampTime);
+        return (E_NON_EXISTENT);
+    return (mRoutingSender->asyncCrossFade(handle, crossfaderID, hotSource, rampType, rampTime));
 }
 
 am_Error_e CAmControlReceiver::setSourceState(am_Handle_s & handle, const am_sourceID_t sourceID, const am_SourceState_e state)
@@ -99,10 +97,10 @@ am_Error_e CAmControlReceiver::setSourceState(am_Handle_s & handle, const am_sou
 
     am_SourceState_e sourceState;
     if (mDatabaseHandler->getSoureState(sourceID, sourceState) != E_OK)
-        return E_UNKNOWN;
+        return (E_UNKNOWN);
     if (sourceState == state)
-        return E_NO_CHANGE;
-    return mRoutingSender->asyncSetSourceState(handle, sourceID, state);
+        return (E_NO_CHANGE);
+    return (mRoutingSender->asyncSetSourceState(handle, sourceID, state));
 }
 
 am_Error_e CAmControlReceiver::setSinkVolume(am_Handle_s & handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time)
@@ -111,10 +109,10 @@ am_Error_e CAmControlReceiver::setSinkVolume(am_Handle_s & handle, const am_sink
 
     am_volume_t tempVolume;
     if (mDatabaseHandler->getSinkVolume(sinkID, tempVolume) != E_OK)
-        return E_UNKNOWN;
+        return (E_UNKNOWN);
     if (tempVolume == volume)
-        return E_NO_CHANGE;
-    return mRoutingSender->asyncSetSinkVolume(handle, sinkID, volume, ramp, time);
+        return (E_NO_CHANGE);
+    return (mRoutingSender->asyncSetSinkVolume(handle, sinkID, volume, ramp, time));
 }
 
 am_Error_e CAmControlReceiver::setSourceVolume(am_Handle_s & handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_RampType_e rampType, const am_time_t time)
@@ -123,10 +121,10 @@ am_Error_e CAmControlReceiver::setSourceVolume(am_Handle_s & handle, const am_so
 
     am_volume_t tempVolume;
     if (mDatabaseHandler->getSourceVolume(sourceID, tempVolume) != E_OK)
-        return E_UNKNOWN;
+        return (E_UNKNOWN);
     if (tempVolume == volume)
-        return E_NO_CHANGE;
-    return mRoutingSender->asyncSetSourceVolume(handle, sourceID, volume, rampType, time);
+        return (E_NO_CHANGE);
+    return (mRoutingSender->asyncSetSourceVolume(handle, sourceID, volume, rampType, time));
 }
 
 am_Error_e CAmControlReceiver::setSinkSoundProperty(am_Handle_s & handle, const am_sinkID_t sinkID, const am_SoundProperty_s & soundProperty)
@@ -135,10 +133,10 @@ am_Error_e CAmControlReceiver::setSinkSoundProperty(am_Handle_s & handle, const
 
     uint16_t value;
     if (mDatabaseHandler->getSinkSoundPropertyValue(sinkID, soundProperty.type, value) != E_OK)
-        return E_UNKNOWN;
+        return (E_UNKNOWN);
     if (value == soundProperty.value)
-        return E_NO_CHANGE;
-    return mRoutingSender->asyncSetSinkSoundProperty(handle, sinkID, soundProperty);
+        return (E_NO_CHANGE);
+    return (mRoutingSender->asyncSetSinkSoundProperty(handle, sinkID, soundProperty));
 }
 
 am_Error_e CAmControlReceiver::setSinkSoundProperties(am_Handle_s & handle, const am_sinkID_t sinkID, const std::vector<am_SoundProperty_s> & listSoundProperties)
@@ -166,10 +164,10 @@ am_Error_e CAmControlReceiver::setSourceSoundProperty(am_Handle_s & handle, cons
 
     uint16_t value;
     if (mDatabaseHandler->getSourceSoundPropertyValue(sourceID, soundProperty.type, value) != E_OK)
-        return E_UNKNOWN;
+        return (E_UNKNOWN);
     if (value == soundProperty.value)
-        return E_NO_CHANGE;
-    return mRoutingSender->asyncSetSourceSoundProperty(handle, sourceID, soundProperty);
+        return (E_NO_CHANGE);
+    return (mRoutingSender->asyncSetSourceSoundProperty(handle, sourceID, soundProperty));
 }
 
 am_Error_e CAmControlReceiver::setSourceSoundProperties(am_Handle_s & handle, const am_sourceID_t sourceID, const std::vector<am_SoundProperty_s> & listSoundProperties)
@@ -197,272 +195,272 @@ am_Error_e CAmControlReceiver::setDomainState(const am_domainID_t domainID, cons
 
     am_DomainState_e tempState = DS_UNKNOWN;
     if (mDatabaseHandler->getDomainState(domainID, tempState) != E_OK)
-        return E_UNKNOWN;
+        return (E_UNKNOWN);
     if (tempState == domainState)
-        return E_NO_CHANGE;
-    return mRoutingSender->setDomainState(domainID, domainState);
+        return (E_NO_CHANGE);
+    return (mRoutingSender->setDomainState(domainID, domainState));
 }
 
 am_Error_e CAmControlReceiver::abortAction(const am_Handle_s handle)
 {
     logInfo("CAmControlReceiver::abortAction got called, handle.type=", handle.handle, "handle.handleType=", handle.handleType);
 
-    return mRoutingSender->asyncAbort(handle);
+    return (mRoutingSender->asyncAbort(handle));
 }
 
 am_Error_e CAmControlReceiver::enterDomainDB(const am_Domain_s & domainData, am_domainID_t & domainID)
 {
-    return mDatabaseHandler->enterDomainDB(domainData, domainID);
+    return (mDatabaseHandler->enterDomainDB(domainData, domainID));
 }
 
 am_Error_e CAmControlReceiver::enterMainConnectionDB(const am_MainConnection_s & mainConnectionData, am_mainConnectionID_t & connectionID)
 {
-    return mDatabaseHandler->enterMainConnectionDB(mainConnectionData, connectionID);
+    return (mDatabaseHandler->enterMainConnectionDB(mainConnectionData, connectionID));
 }
 
 am_Error_e CAmControlReceiver::enterSinkDB(const am_Sink_s & sinkData, am_sinkID_t & sinkID)
 {
-    return mDatabaseHandler->enterSinkDB(sinkData, sinkID);
+    return (mDatabaseHandler->enterSinkDB(sinkData, sinkID));
 }
 
 am_Error_e CAmControlReceiver::enterCrossfaderDB(const am_Crossfader_s & crossfaderData, am_crossfaderID_t & crossfaderID)
 {
-    return mDatabaseHandler->enterCrossfaderDB(crossfaderData, crossfaderID);
+    return (mDatabaseHandler->enterCrossfaderDB(crossfaderData, crossfaderID));
 }
 
 am_Error_e CAmControlReceiver::enterGatewayDB(const am_Gateway_s & gatewayData, am_gatewayID_t & gatewayID)
 {
-    return mDatabaseHandler->enterGatewayDB(gatewayData, gatewayID);
+    return (mDatabaseHandler->enterGatewayDB(gatewayData, gatewayID));
 }
 
 am_Error_e CAmControlReceiver::enterSourceDB(const am_Source_s & sourceData, am_sourceID_t & sourceID)
 {
-    return mDatabaseHandler->enterSourceDB(sourceData, sourceID);
+    return (mDatabaseHandler->enterSourceDB(sourceData, sourceID));
 }
 
 am_Error_e CAmControlReceiver::enterSinkClassDB(const am_SinkClass_s & sinkClass, am_sinkClass_t & sinkClassID)
 {
-    return mDatabaseHandler->enterSinkClassDB(sinkClass, sinkClassID);
+    return (mDatabaseHandler->enterSinkClassDB(sinkClass, sinkClassID));
 }
 
 am_Error_e CAmControlReceiver::enterSourceClassDB(am_sourceClass_t & sourceClassID, const am_SourceClass_s & sourceClass)
 {
-    return mDatabaseHandler->enterSourceClassDB(sourceClassID, sourceClass);
+    return (mDatabaseHandler->enterSourceClassDB(sourceClassID, sourceClass));
 }
 
 am_Error_e CAmControlReceiver::enterSystemPropertiesListDB(const std::vector<am_SystemProperty_s> & listSystemProperties)
 {
-    return mDatabaseHandler->enterSystemProperties(listSystemProperties);
+    return (mDatabaseHandler->enterSystemProperties(listSystemProperties));
 }
 
 am_Error_e CAmControlReceiver::changeMainConnectionRouteDB(const am_mainConnectionID_t mainconnectionID, const std::vector<am_connectionID_t>& listConnectionID)
 {
-    return mDatabaseHandler->changeMainConnectionRouteDB(mainconnectionID, listConnectionID);
+    return (mDatabaseHandler->changeMainConnectionRouteDB(mainconnectionID, listConnectionID));
 }
 
 am_Error_e CAmControlReceiver::changeMainConnectionStateDB(const am_mainConnectionID_t mainconnectionID, const am_ConnectionState_e connectionState)
 {
-    return mDatabaseHandler->changeMainConnectionStateDB(mainconnectionID, connectionState);
+    return (mDatabaseHandler->changeMainConnectionStateDB(mainconnectionID, connectionState));
 }
 
 am_Error_e CAmControlReceiver::changeSinkMainVolumeDB(const am_mainVolume_t mainVolume, const am_sinkID_t sinkID)
 {
-    return mDatabaseHandler->changeSinkMainVolumeDB(mainVolume, sinkID);
+    return (mDatabaseHandler->changeSinkMainVolumeDB(mainVolume, sinkID));
 }
 
 am_Error_e CAmControlReceiver::changeSinkAvailabilityDB(const am_Availability_s & availability, const am_sinkID_t sinkID)
 {
-    return mDatabaseHandler->changeSinkAvailabilityDB(availability, sinkID);
+    return (mDatabaseHandler->changeSinkAvailabilityDB(availability, sinkID));
 }
 
 am_Error_e CAmControlReceiver::changDomainStateDB(const am_DomainState_e domainState, const am_domainID_t domainID)
 {
-    return mDatabaseHandler->changDomainStateDB(domainState, domainID);
+    return (mDatabaseHandler->changDomainStateDB(domainState, domainID));
 }
 
 am_Error_e CAmControlReceiver::changeSinkMuteStateDB(const am_MuteState_e muteState, const am_sinkID_t sinkID)
 {
-    return mDatabaseHandler->changeSinkMuteStateDB(muteState, sinkID);
+    return (mDatabaseHandler->changeSinkMuteStateDB(muteState, sinkID));
 }
 
 am_Error_e CAmControlReceiver::changeMainSinkSoundPropertyDB(const am_MainSoundProperty_s & soundProperty, const am_sinkID_t sinkID)
 {
-    return mDatabaseHandler->changeMainSinkSoundPropertyDB(soundProperty, sinkID);
+    return (mDatabaseHandler->changeMainSinkSoundPropertyDB(soundProperty, sinkID));
 }
 
 am_Error_e CAmControlReceiver::changeMainSourceSoundPropertyDB(const am_MainSoundProperty_s & soundProperty, const am_sourceID_t sourceID)
 {
-    return mDatabaseHandler->changeMainSinkSoundPropertyDB(soundProperty, sourceID);
+    return (mDatabaseHandler->changeMainSinkSoundPropertyDB(soundProperty, sourceID));
 }
 
 am_Error_e CAmControlReceiver::changeSourceAvailabilityDB(const am_Availability_s & availability, const am_sourceID_t sourceID)
 {
-    return mDatabaseHandler->changeSourceAvailabilityDB(availability, sourceID);
+    return (mDatabaseHandler->changeSourceAvailabilityDB(availability, sourceID));
 }
 
 am_Error_e CAmControlReceiver::changeSystemPropertyDB(const am_SystemProperty_s & property)
 {
-    return mDatabaseHandler->changeSystemPropertyDB(property);
+    return (mDatabaseHandler->changeSystemPropertyDB(property));
 }
 
 am_Error_e CAmControlReceiver::removeMainConnectionDB(const am_mainConnectionID_t mainConnectionID)
 {
-    return mDatabaseHandler->removeMainConnectionDB(mainConnectionID);
+    return (mDatabaseHandler->removeMainConnectionDB(mainConnectionID));
 }
 
 am_Error_e CAmControlReceiver::removeSinkDB(const am_sinkID_t sinkID)
 {
-    return mDatabaseHandler->removeSinkDB(sinkID);
+    return (mDatabaseHandler->removeSinkDB(sinkID));
 }
 
 am_Error_e CAmControlReceiver::removeSourceDB(const am_sourceID_t sourceID)
 {
-    return mDatabaseHandler->removeSourceDB(sourceID);
+    return (mDatabaseHandler->removeSourceDB(sourceID));
 }
 
 am_Error_e CAmControlReceiver::removeGatewayDB(const am_gatewayID_t gatewayID)
 {
-    return mDatabaseHandler->removeGatewayDB(gatewayID);
+    return (mDatabaseHandler->removeGatewayDB(gatewayID));
 }
 
 am_Error_e CAmControlReceiver::removeCrossfaderDB(const am_crossfaderID_t crossfaderID)
 {
-    return mDatabaseHandler->removeCrossfaderDB(crossfaderID);
+    return (mDatabaseHandler->removeCrossfaderDB(crossfaderID));
 }
 
 am_Error_e CAmControlReceiver::removeDomainDB(const am_domainID_t domainID)
 {
-    return mDatabaseHandler->removeDomainDB(domainID);
+    return (mDatabaseHandler->removeDomainDB(domainID));
 }
 
 am_Error_e CAmControlReceiver::getSourceClassInfoDB(const am_sourceID_t sourceID, am_SourceClass_s & classInfo) const
 {
-    return mDatabaseHandler->getSourceClassInfoDB(sourceID, classInfo);
+    return (mDatabaseHandler->getSourceClassInfoDB(sourceID, classInfo));
 }
 
 am_Error_e CAmControlReceiver::getSinkClassInfoDB(const am_sinkID_t sinkID, am_SinkClass_s & sinkClass) const
 {
-    return mDatabaseHandler->getSinkClassInfoDB(sinkID, sinkClass);
+    return (mDatabaseHandler->getSinkClassInfoDB(sinkID, sinkClass));
 }
 
 am_Error_e CAmControlReceiver::getSinkInfoDB(const am_sinkID_t sinkID, am_Sink_s & sinkData) const
 {
-    return mDatabaseHandler->getSinkInfoDB(sinkID, sinkData);
+    return (mDatabaseHandler->getSinkInfoDB(sinkID, sinkData));
 }
 
 am_Error_e CAmControlReceiver::getSourceInfoDB(const am_sourceID_t sourceID, am_Source_s & sourceData) const
 {
-    return mDatabaseHandler->getSourceInfoDB(sourceID, sourceData);
+    return (mDatabaseHandler->getSourceInfoDB(sourceID, sourceData));
 }
 
 am_Error_e CAmControlReceiver::getMainConnectionInfoDB(const am_mainConnectionID_t mainConnectionID, am_MainConnection_s & mainConnectionData) const
 {
-    return mDatabaseHandler->getMainConnectionInfoDB(mainConnectionID, mainConnectionData);
+    return (mDatabaseHandler->getMainConnectionInfoDB(mainConnectionID, mainConnectionData));
 }
 
 am_Error_e CAmControlReceiver::getGatewayInfoDB(const am_gatewayID_t gatewayID, am_Gateway_s & gatewayData) const
 {
-    return mDatabaseHandler->getGatewayInfoDB(gatewayID, gatewayData);
+    return (mDatabaseHandler->getGatewayInfoDB(gatewayID, gatewayData));
 }
 
 am_Error_e CAmControlReceiver::getCrossfaderInfoDB(const am_crossfaderID_t crossfaderID, am_Crossfader_s & crossfaderData) const
 {
-    return mDatabaseHandler->getCrossfaderInfoDB(crossfaderID, crossfaderData);
+    return (mDatabaseHandler->getCrossfaderInfoDB(crossfaderID, crossfaderData));
 }
 
 am_Error_e CAmControlReceiver::getListSinksOfDomain(const am_domainID_t domainID, std::vector<am_sinkID_t> & listSinkID) const
 {
-    return mDatabaseHandler->getListSinksOfDomain(domainID, listSinkID);
+    return (mDatabaseHandler->getListSinksOfDomain(domainID, listSinkID));
 }
 
 am_Error_e CAmControlReceiver::getListSourcesOfDomain(const am_domainID_t domainID, std::vector<am_sourceID_t> & listSourceID) const
 {
-    return mDatabaseHandler->getListSourcesOfDomain(domainID, listSourceID);
+    return (mDatabaseHandler->getListSourcesOfDomain(domainID, listSourceID));
 }
 
 am_Error_e CAmControlReceiver::getListCrossfadersOfDomain(const am_domainID_t domainID, std::vector<am_crossfaderID_t> & listGatewaysID) const
 {
-    return mDatabaseHandler->getListCrossfadersOfDomain(domainID, listGatewaysID);
+    return (mDatabaseHandler->getListCrossfadersOfDomain(domainID, listGatewaysID));
 }
 
 am_Error_e CAmControlReceiver::getListGatewaysOfDomain(const am_domainID_t domainID, std::vector<am_gatewayID_t> & listGatewaysID) const
 {
-    return mDatabaseHandler->getListGatewaysOfDomain(domainID, listGatewaysID);
+    return (mDatabaseHandler->getListGatewaysOfDomain(domainID, listGatewaysID));
 }
 
 am_Error_e CAmControlReceiver::getListMainConnections(std::vector<am_MainConnection_s> & listMainConnections) const
 {
-    return mDatabaseHandler->getListMainConnections(listMainConnections);
+    return (mDatabaseHandler->getListMainConnections(listMainConnections));
 }
 
 am_Error_e CAmControlReceiver::getListDomains(std::vector<am_Domain_s> & listDomains) const
 {
-    return mDatabaseHandler->getListDomains(listDomains);
+    return (mDatabaseHandler->getListDomains(listDomains));
 }
 
 am_Error_e CAmControlReceiver::getListConnections(std::vector<am_Connection_s> & listConnections) const
 {
-    return mDatabaseHandler->getListConnections(listConnections);
+    return (mDatabaseHandler->getListConnections(listConnections));
 }
 
 am_Error_e CAmControlReceiver::getListSinks(std::vector<am_Sink_s> & listSinks) const
 {
-    return mDatabaseHandler->getListSinks(listSinks);
+    return (mDatabaseHandler->getListSinks(listSinks));
 }
 
 am_Error_e CAmControlReceiver::getListSources(std::vector<am_Source_s> & listSources) const
 {
-    return mDatabaseHandler->getListSources(listSources);
+    return (mDatabaseHandler->getListSources(listSources));
 }
 
 am_Error_e CAmControlReceiver::getListSourceClasses(std::vector<am_SourceClass_s> & listSourceClasses) const
 {
-    return mDatabaseHandler->getListSourceClasses(listSourceClasses);
+    return (mDatabaseHandler->getListSourceClasses(listSourceClasses));
 }
 
 am_Error_e CAmControlReceiver::getListHandles(std::vector<am_Handle_s> & listHandles) const
 {
-    return mRoutingSender->getListHandles(listHandles);
+    return (mRoutingSender->getListHandles(listHandles));
 }
 
 am_Error_e CAmControlReceiver::getListCrossfaders(std::vector<am_Crossfader_s> & listCrossfaders) const
 {
-    return mDatabaseHandler->getListCrossfaders(listCrossfaders);
+    return (mDatabaseHandler->getListCrossfaders(listCrossfaders));
 }
 
 am_Error_e CAmControlReceiver::getListGateways(std::vector<am_Gateway_s> & listGateways) const
 {
-    return mDatabaseHandler->getListGateways(listGateways);
+    return (mDatabaseHandler->getListGateways(listGateways));
 }
 
 am_Error_e CAmControlReceiver::getListSinkClasses(std::vector<am_SinkClass_s> & listSinkClasses) const
 {
-    return mDatabaseHandler->getListSinkClasses(listSinkClasses);
+    return (mDatabaseHandler->getListSinkClasses(listSinkClasses));
 }
 
 am_Error_e CAmControlReceiver::getListSystemProperties(std::vector<am_SystemProperty_s> & listSystemProperties) const
 {
-    return mDatabaseHandler->getListSystemProperties(listSystemProperties);
+    return (mDatabaseHandler->getListSystemProperties(listSystemProperties));
 }
 
 am_Error_e CAmControlReceiver::changeSinkClassInfoDB(const am_SinkClass_s & classInfo)
 {
-    return mDatabaseHandler->changeSinkClassInfoDB(classInfo);
+    return (mDatabaseHandler->changeSinkClassInfoDB(classInfo));
 }
 
 am_Error_e CAmControlReceiver::changeSourceClassInfoDB(const am_SourceClass_s & classInfo)
 {
-    return mDatabaseHandler->changeSourceClassInfoDB(classInfo);
+    return(mDatabaseHandler->changeSourceClassInfoDB(classInfo));
 }
 
 am_Error_e CAmControlReceiver::removeSinkClassDB(const am_sinkClass_t sinkClassID)
 {
-    return mDatabaseHandler->removeSinkClassDB(sinkClassID);
+    return (mDatabaseHandler->removeSinkClassDB(sinkClassID));
 }
 
 am_Error_e CAmControlReceiver::removeSourceClassDB(const am_sourceClass_t sourceClassID)
 {
-    return mDatabaseHandler->removeSourceClassDB(sourceClassID);
+    return (mDatabaseHandler->removeSourceClassDB(sourceClassID));
 }
 
 void CAmControlReceiver::setCommandReady()
@@ -490,7 +488,7 @@ void CAmControlReceiver::confirmControllerRundown()
 am_Error_e CAmControlReceiver::getSocketHandler(CAmSocketHandler *& socketHandler)
 {
     socketHandler = mSocketHandler;
-    return E_OK;
+    return (E_OK);
 }
 
 void CAmControlReceiver::setCommandRundown()