diff options
author | Martin Koch <martin.koch@ese.de> | 2020-06-26 12:21:50 +0200 |
---|---|---|
committer | Martin Koch <martin.koch@ese.de> | 2020-07-01 14:37:32 +0200 |
commit | efe1f88f36383ab1f1ad657e14e4fd4885eaf55f (patch) | |
tree | 4a312c4a5f83a617b2dd4c39838b459249080dc7 /AudioManagerCore/include | |
parent | 3270ab2427164fa41c3bcb4e2662ea625f926d84 (diff) | |
download | audiomanager-efe1f88f36383ab1f1ad657e14e4fd4885eaf55f.tar.gz |
AM: change handling or registerEarlyConnection
- use type am_Route_s for announcement from routing side
- register also main connection internally
- forward route details to controller
Signed-off-by: Martin Koch <martin.koch@ese.de>
Diffstat (limited to 'AudioManagerCore/include')
-rw-r--r-- | AudioManagerCore/include/CAmControlReceiver.h | 1 | ||||
-rw-r--r-- | AudioManagerCore/include/CAmControlSender.h | 2 | ||||
-rw-r--r-- | AudioManagerCore/include/CAmRoutingReceiver.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/AudioManagerCore/include/CAmControlReceiver.h b/AudioManagerCore/include/CAmControlReceiver.h index a7cb394..73aac03 100644 --- a/AudioManagerCore/include/CAmControlReceiver.h +++ b/AudioManagerCore/include/CAmControlReceiver.h @@ -103,6 +103,7 @@ public: am_Error_e getGatewayInfoDB(const am_gatewayID_t gatewayID, am_Gateway_s &gatewayData) const; am_Error_e getConverterInfoDB(const am_converterID_t converterID, am_Converter_s &converterData) const; am_Error_e getCrossfaderInfoDB(const am_crossfaderID_t crossfaderID, am_Crossfader_s &crossfaderData) const; + am_Error_e getConnectionInfoDB(const am_connectionID_t connectionID, am_Connection_s &connectionData) const; am_Error_e getMainConnectionInfoDB(const am_mainConnectionID_t mainConnectionID, am_MainConnection_s &mainConnectionData) const; am_Error_e getListSinksOfDomain(const am_domainID_t domainID, std::vector<am_sinkID_t> &listSinkID) const; am_Error_e getListSourcesOfDomain(const am_domainID_t domainID, std::vector<am_sourceID_t> &listSourceID) const; diff --git a/AudioManagerCore/include/CAmControlSender.h b/AudioManagerCore/include/CAmControlSender.h index 494f7f3..f90116d 100644 --- a/AudioManagerCore/include/CAmControlSender.h +++ b/AudioManagerCore/include/CAmControlSender.h @@ -72,7 +72,7 @@ public: am_Error_e hookSystemRegisterCrossfader(const am_Crossfader_s &crossfaderData, am_crossfaderID_t &crossfaderID); am_Error_e hookSystemDeregisterCrossfader(const am_crossfaderID_t crossfaderID); am_Error_e hookSystemRegisterEarlyConnection(am_domainID_t domainID - , const am_MainConnection_s &mainConnectionData); + , const am_MainConnection_s &mainConnectionData, const am_Route_s &route); void hookSystemSinkVolumeTick(const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume); void hookSystemSourceVolumeTick(const am_Handle_s handle, const am_sourceID_t sourceID, const am_volume_t volume); void hookSystemInterruptStateChange(const am_sourceID_t sourceID, const am_InterruptState_e interruptState); diff --git a/AudioManagerCore/include/CAmRoutingReceiver.h b/AudioManagerCore/include/CAmRoutingReceiver.h index 3f85ba7..fe12ccd 100644 --- a/AudioManagerCore/include/CAmRoutingReceiver.h +++ b/AudioManagerCore/include/CAmRoutingReceiver.h @@ -60,7 +60,7 @@ public: am_Error_e peekDomain(const std::string &name, am_domainID_t &domainID); am_Error_e registerDomain(const am_Domain_s &domainData, am_domainID_t &domainID); am_Error_e deregisterDomain(const am_domainID_t domainID); - am_Error_e registerEarlyConnection(am_domainID_t domainID, const std::vector< am_Connection_s > &route + am_Error_e registerEarlyConnection(am_domainID_t domainID, const am_Route_s &route , am_ConnectionState_e state); am_Error_e registerGateway(const am_Gateway_s &gatewayData, am_gatewayID_t &gatewayID); am_Error_e registerConverter(const am_Converter_s &converterData, am_converterID_t &converterID); |