From da1d038f907a1ef3df2c1fa3c645918e4e1e641e Mon Sep 17 00:00:00 2001 From: Christian Linke Date: Mon, 2 Sep 2013 11:28:54 +0200 Subject: * fix for Bug 92 - sinkID wrongly reported to DatabaseObserver Signed-off-by: Christian Linke --- AudioManagerDaemon/src/CAmDatabaseHandlerMap.cpp | 8 +++++++- AudioManagerDaemon/src/CAmRoutingSender.cpp | 8 ++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/AudioManagerDaemon/src/CAmDatabaseHandlerMap.cpp b/AudioManagerDaemon/src/CAmDatabaseHandlerMap.cpp index c7a888d..ba19641 100644 --- a/AudioManagerDaemon/src/CAmDatabaseHandlerMap.cpp +++ b/AudioManagerDaemon/src/CAmDatabaseHandlerMap.cpp @@ -438,6 +438,11 @@ am_Error_e CAmDatabaseHandlerMap::enterDomainDB(const am_Domain_s & domainData, mMappedData.mDomainMap[nextID] = domainData; mMappedData.mDomainMap[nextID].domainID = nextID; mMappedData.mDomainMap[nextID].reserved = 0; + + logInfo("DatabaseHandler::enterDomainDB entered reserved domain with name=", domainData.name, "busname=", domainData.busname, "nodename=", domainData.nodename, "reserved ID:", domainID); + + if (mpDatabaseObserver) + mpDatabaseObserver->newDomain(mMappedData.mDomainMap[nextID]); return (E_OK); } else @@ -597,9 +602,10 @@ am_Error_e CAmDatabaseHandlerMap::enterSinkDB(const am_Sink_s & sinkData, am_sin sinkID = temp_SinkID; am_Sink_s sink = mMappedData.mSinkMap[temp_SinkID]; - logInfo("DatabaseHandler::enterSinkDB entered new sink with name", sink.name, "domainID:", sink.domainID, "classID:", sink.sinkClassID, "volume:", sink.volume, "assigned ID:", sinkID); + logInfo("DatabaseHandler::enterSinkDB entered new sink with name", sink.name, "domainID:", sink.domainID, "classID:", sink.sinkClassID, "volume:", sink.volume, "assigned ID:", sink.sinkID); if (mpDatabaseObserver != NULL) + sink.sinkID=sinkID; mpDatabaseObserver->newSink(sink); return (E_OK); } diff --git a/AudioManagerDaemon/src/CAmRoutingSender.cpp b/AudioManagerDaemon/src/CAmRoutingSender.cpp index d6ea25e..590f6df 100644 --- a/AudioManagerDaemon/src/CAmRoutingSender.cpp +++ b/AudioManagerDaemon/src/CAmRoutingSender.cpp @@ -375,7 +375,7 @@ am_Error_e CAmRoutingSender::addDomainLookup(const am_Domain_s& domainData) return (E_OK); } } - + logError(__PRETTY_FUNCTION__," Could not find busname for bus",domainData.busname); return (E_UNKNOWN); } @@ -393,7 +393,7 @@ am_Error_e CAmRoutingSender::addSourceLookup(const am_Source_s& sourceData) mMapSourceInterface.insert(std::make_pair(sourceData.sourceID, iter->second)); return (E_OK); } - + logError(__PRETTY_FUNCTION__," Could not find domainInterface for domainID",sourceData.domainID); return (E_UNKNOWN); } @@ -411,7 +411,7 @@ am_Error_e CAmRoutingSender::addSinkLookup(const am_Sink_s& sinkData) mMapSinkInterface.insert(std::make_pair(sinkData.sinkID, iter->second)); return (E_OK); } - + logError(__PRETTY_FUNCTION__,"Could not find domainInterface for domainID",sinkData.domainID); return (E_UNKNOWN); } @@ -429,7 +429,7 @@ am_Error_e CAmRoutingSender::addCrossfaderLookup(const am_Crossfader_s& crossfad mMapSourceInterface.insert(std::make_pair(crossfaderData.crossfaderID, iter->second)); return (E_OK); } - + logError(__PRETTY_FUNCTION__," Could not find sourceInterface for source",crossfaderData.sourceID); return (E_UNKNOWN); } -- cgit v1.2.1