From 066c3f7f16ef69e80376942e8d6b8c4944b8ed08 Mon Sep 17 00:00:00 2001 From: Martin Koch Date: Fri, 19 Jun 2020 16:01:19 +0200 Subject: Add support for announcement and handling of pre-established audio connections through routing side As the complete initialization of the cockpit system takes some time, a few use-cases exist where information needs to be audible (or visible) right before the system is fully started. Here we mainly have: - system alerts + door open + seat belt missing + engine faults - parking assistant warnings + rear view camera screen + beeps if distance goes below limit Both routing- and control-side are extended to allow notifying about such connections Signed-off-by: Martin Koch --- AudioManagerCore/include/CAmControlSender.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'AudioManagerCore/include/CAmControlSender.h') diff --git a/AudioManagerCore/include/CAmControlSender.h b/AudioManagerCore/include/CAmControlSender.h index 77e8e2c..494f7f3 100644 --- a/AudioManagerCore/include/CAmControlSender.h +++ b/AudioManagerCore/include/CAmControlSender.h @@ -71,6 +71,8 @@ public: am_Error_e hookSystemDeregisterConverter(const am_converterID_t converterID); 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); 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); -- cgit v1.2.1 From efe1f88f36383ab1f1ad657e14e4fd4885eaf55f Mon Sep 17 00:00:00 2001 From: Martin Koch Date: Fri, 26 Jun 2020 12:21:50 +0200 Subject: 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 --- AudioManagerCore/include/CAmControlSender.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'AudioManagerCore/include/CAmControlSender.h') 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); -- cgit v1.2.1 From 8671a3a73bcbb91d9fe483521679d047f2412c3b Mon Sep 17 00:00:00 2001 From: Martin Koch Date: Tue, 30 Jun 2020 15:49:53 +0200 Subject: AM: add missing forwarding function for cbAckTransferConnection() Signed-off-by: Martin Koch --- AudioManagerCore/include/CAmControlSender.h | 1 + 1 file changed, 1 insertion(+) (limited to 'AudioManagerCore/include/CAmControlSender.h') diff --git a/AudioManagerCore/include/CAmControlSender.h b/AudioManagerCore/include/CAmControlSender.h index f90116d..71220d5 100644 --- a/AudioManagerCore/include/CAmControlSender.h +++ b/AudioManagerCore/include/CAmControlSender.h @@ -84,6 +84,7 @@ public: void hookSystemTimingInformationChanged(const am_mainConnectionID_t mainConnectionID, const am_timeSync_t time); void cbAckConnect(const am_Handle_s handle, const am_Error_e errorID); void cbAckDisconnect(const am_Handle_s handle, const am_Error_e errorID); + void cbAckTransferConnection(const am_Handle_s handle, const am_Error_e errorID); void cbAckCrossFade(const am_Handle_s handle, const am_HotSink_e hostsink, const am_Error_e error); void cbAckSetSinkVolumeChange(const am_Handle_s handle, const am_volume_t volume, const am_Error_e error); void cbAckSetSourceVolumeChange(const am_Handle_s handle, const am_volume_t voulme, const am_Error_e error); -- cgit v1.2.1