diff options
| author | Christian Linke <christian.linke@bmw.de> | 2015-07-07 07:01:48 +0100 |
|---|---|---|
| committer | Christian Linke <christian.linke@bmw.de> | 2015-07-07 07:01:48 +0100 |
| commit | a94a9a2c13ebd795832e5772ed042c985666b919 (patch) | |
| tree | 5f58a6763d5a55ce56dc5abf98b431069b38e022 /AudioManagerDaemon/src | |
| parent | d7419f5ebc895a492593a7f31c715ee450d9059e (diff) | |
| download | audiomanager-a94a9a2c13ebd795832e5772ed042c985666b919.tar.gz | |
* cleaned up compile flags
* fix for getDomainOfCrossfader
Signed-off-by: Christian Linke <christian.linke@bmw.de>
Diffstat (limited to 'AudioManagerDaemon/src')
| -rw-r--r-- | AudioManagerDaemon/src/CAmDatabaseHandlerMap.cpp | 16 | ||||
| -rw-r--r-- | AudioManagerDaemon/src/CAmRoutingReceiver.cpp | 13 |
2 files changed, 25 insertions, 4 deletions
diff --git a/AudioManagerDaemon/src/CAmDatabaseHandlerMap.cpp b/AudioManagerDaemon/src/CAmDatabaseHandlerMap.cpp index 46163db..1af6361 100644 --- a/AudioManagerDaemon/src/CAmDatabaseHandlerMap.cpp +++ b/AudioManagerDaemon/src/CAmDatabaseHandlerMap.cpp @@ -2120,6 +2120,7 @@ bool CAmDatabaseHandlerMap::existConverter(const am_converterID_t converterID) c am_Error_e CAmDatabaseHandlerMap::getDomainOfSource(const am_sourceID_t sourceID, am_domainID_t & domainID) const { assert(sourceID!=0); + domainID=0; am_Source_Database_s const * source = objectForKeyIfExistsInMap(sourceID, mMappedData.mSourceMap); if( NULL!=source ) @@ -2133,6 +2134,7 @@ am_Error_e CAmDatabaseHandlerMap::getDomainOfSource(const am_sourceID_t sourceID am_Error_e am::CAmDatabaseHandlerMap::getDomainOfSink(const am_sinkID_t sinkID, am_domainID_t & domainID) const { assert(sinkID!=0); + domainID=0; am_Sink_Database_s const * source = objectForKeyIfExistsInMap(sinkID, mMappedData.mSinkMap); if( NULL!=source ) @@ -2143,6 +2145,20 @@ am_Error_e am::CAmDatabaseHandlerMap::getDomainOfSink(const am_sinkID_t sinkID, return E_NON_EXISTENT; } +am_Error_e am::CAmDatabaseHandlerMap::getDomainOfCrossfader(const am_converterID_t crossfader, am_domainID_t & domainID) const +{ + assert(crossfader!=0); + domainID=0; + + am_Crossfader_Database_s const * cross = objectForKeyIfExistsInMap(crossfader, mMappedData.mCrossfaderMap); + if( NULL!=cross ) + { + getDomainOfSource(cross->sinkID_A,domainID); + return E_OK; + } + return E_NON_EXISTENT; +} + /** * checks for certain SinkClass * @param sinkClassID diff --git a/AudioManagerDaemon/src/CAmRoutingReceiver.cpp b/AudioManagerDaemon/src/CAmRoutingReceiver.cpp index 0216b9e..4628136 100644 --- a/AudioManagerDaemon/src/CAmRoutingReceiver.cpp +++ b/AudioManagerDaemon/src/CAmRoutingReceiver.cpp @@ -482,14 +482,19 @@ void CAmRoutingReceiver::hookSourceNotificationDataChange(const am_sourceID_t so mpControlSender->hookSourceNotificationDataChanged(sourceID,payload); } -am_Error_e CAmRoutingReceiver::getDomainOfSink(const am_sinkID_t sinkID, am_domainID_t& domainID) +am_Error_e CAmRoutingReceiver::getDomainOfSink(const am_sinkID_t sinkID, am_domainID_t& domainID) const { - return mpDatabaseHandler->getDomainOfSink(sinkID,domainID); + return (mpDatabaseHandler->getDomainOfSink(sinkID,domainID)); } -am_Error_e CAmRoutingReceiver::getDomainOfSource(const am_sourceID_t sourceID, am_domainID_t& domainID) +am_Error_e CAmRoutingReceiver::getDomainOfSource(const am_sourceID_t sourceID, am_domainID_t& domainID) const { - return mpDatabaseHandler->getDomainOfSource(sourceID,domainID); + return (mpDatabaseHandler->getDomainOfSource(sourceID,domainID)); +} + +am_Error_e CAmRoutingReceiver::getDomainOfCrossfader(const am_crossfaderID_t crossfader, am_domainID_t& domainID) const +{ + return (mpDatabaseHandler->getDomainOfCrossfader(crossfader,domainID)); } void CAmRoutingReceiver::waitOnRundown(bool rundown) |