summaryrefslogtreecommitdiff
path: root/AudioManagerDaemon/src
diff options
context:
space:
mode:
authorChristian Linke <christian.linke@bmw.de>2015-07-01 09:27:22 +0100
committerChristian Linke <christian.linke@bmw.de>2015-07-01 09:27:22 +0100
commitd078a99c5aa90d1d061eb54b98b6cded128e2d48 (patch)
treedf3b0afe5c6d15da3f3b1dac08dee87e4774b784 /AudioManagerDaemon/src
parent5d4c1882bbb615720f395c4ff7d0a7223cbf3efb (diff)
downloadaudiomanager-d078a99c5aa90d1d061eb54b98b6cded128e2d48.tar.gz
* enable entering domains with predefined id
Signed-off-by: Christian Linke <christian.linke@bmw.de>
Diffstat (limited to 'AudioManagerDaemon/src')
-rw-r--r--AudioManagerDaemon/src/CAmDatabaseHandlerMap.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/AudioManagerDaemon/src/CAmDatabaseHandlerMap.cpp b/AudioManagerDaemon/src/CAmDatabaseHandlerMap.cpp
index 3f031ff..766ad95 100644
--- a/AudioManagerDaemon/src/CAmDatabaseHandlerMap.cpp
+++ b/AudioManagerDaemon/src/CAmDatabaseHandlerMap.cpp
@@ -470,6 +470,15 @@ am_Error_e CAmDatabaseHandlerMap::enterDomainDB(const am_Domain_s & domainData,
mpDatabaseObserver->newDomain(mMappedData.mDomainMap[nextID]);
return (E_OK);
}
+ else if (domainData.domainID!=0 && !existDomain(domainData.domainID))
+ {
+ domainID = domainData.domainID;
+ mMappedData.mDomainMap[domainData.domainID] = domainData;
+ logInfo("DatabaseHandler::enterDomainDB entered predefined domain with name=", domainData.name, "busname=", domainData.busname, "nodename=", domainData.nodename, "predefined ID:", domainID);
+ if (mpDatabaseObserver)
+ mpDatabaseObserver->newDomain(mMappedData.mDomainMap[domainData.domainID]);
+ return (E_OK);
+ }
else
{
if(mMappedData.increaseID(nextID, mMappedData.mCurrentDomainID, domainData.domainID))