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 <martin.koch@ese.de>

5 files changed, 158 insertions, 17 deletions

diff --git a/AudioManagerCore/src/CAmControlReceiver.cpp b/AudioManagerCore/src/CAmControlReceiver.cpp
index 7a6072c..bbd1116 100644
--- a/AudioManagerCore/src/CAmControlReceiver.cpp
+++ b/AudioManagerCore/src/CAmControlReceiver.cpp
@@ -451,6 +451,40 @@ void CAmControlReceiver::confirmControllerRundown(const am_Error_e error)
     mSocketHandler->exit_mainloop();
 }
 
+am_Error_e CAmControlReceiver::transferConnection(const am_Handle_s handle
+        , am_mainConnectionID_t mainConnectionID, am_domainID_t domainID)
+{
+    am_MainConnection_s mainConnectionData;
+    if (mDatabaseHandler->getMainConnectionInfoDB(mainConnectionID, mainConnectionData) != E_OK)
+    {
+        return E_DATABASE_ERROR;
+    }
+
+    std::vector<std::pair<std::string, std::string>> route;
+    route.reserve(mainConnectionData.listConnectionID.size());
+    for (auto iter : mainConnectionData.listConnectionID)
+    {
+        am_Connection_s connectionData;
+        if (mDatabaseHandler->getConnectionInfoDB(iter, connectionData) != E_OK)
+        {
+            return E_DATABASE_ERROR;
+        }
+
+        // determine source and sink name, even if they are only peeked, but not fully registered
+        am_Source_s sourceData;
+        am_Sink_s sinkData;
+        if (    (mDatabaseHandler->getSourceInfoDB(connectionData.sourceID, sourceData) == E_NON_EXISTENT)
+             || (mDatabaseHandler->getSinkInfoDB(connectionData.sinkID, sinkData) == E_NON_EXISTENT))
+        {
+            return E_DATABASE_ERROR;
+        }
+
+        route.push_back({sourceData.name, sinkData.name});
+    }
+
+    return mRoutingSender->asyncTransferConnection(handle, domainID, route, mainConnectionData.connectionState);
+}
+
 am_Error_e CAmControlReceiver::getSocketHandler(CAmSocketHandler * &socketHandler)
 {
     socketHandler = mSocketHandler;
diff --git a/AudioManagerCore/src/CAmControlSender.cpp b/AudioManagerCore/src/CAmControlSender.cpp
index 0fa84ef..0d28dfb 100644
--- a/AudioManagerCore/src/CAmControlSender.cpp
+++ b/AudioManagerCore/src/CAmControlSender.cpp
@@ -319,6 +319,13 @@ am_Error_e CAmControlSender::hookSystemDeregisterCrossfader(const am_crossfaderI
     return (mController->hookSystemDeregisterCrossfader(crossfaderID));
 }
 
+am_Error_e CAmControlSender::hookSystemRegisterEarlyConnection(am_domainID_t domainID
+        , const am_MainConnection_s &mainConnectionData)
+{
+    assert(mController);
+    return mController->hookSystemRegisterEarlyMainConnection(domainID, mainConnectionData);
+}
+
 void CAmControlSender::hookSystemSinkVolumeTick(const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume)
 {
     assert(mController);
diff --git a/AudioManagerCore/src/CAmDatabaseHandlerMap.cpp b/AudioManagerCore/src/CAmDatabaseHandlerMap.cpp
index 6e6e3f9..95d7b1a 100644
--- a/AudioManagerCore/src/CAmDatabaseHandlerMap.cpp
+++ b/AudioManagerCore/src/CAmDatabaseHandlerMap.cpp
@@ -611,6 +611,20 @@ am_Error_e CAmDatabaseHandlerMap::enterMainConnectionDB(const am_MainConnection_
         return (E_NOT_POSSIBLE);
     }
 
+    // check if we already have this connection
+    for (auto &mapped : mMappedData.mMainConnectionMap)
+    {
+        if ((mapped.second.sourceID != mainConnectionData.sourceID) || (mapped.second.sinkID != mainConnectionData.sinkID))
+        {
+            continue;
+        }
+
+        connectionID = mapped.second.mainConnectionID;
+        logWarning(__METHOD_NAME__, "main connection from source", mainConnectionData.sourceID
+                , "to sink", mainConnectionData.sinkID, "already exists with ID", connectionID);
+        return E_ALREADY_EXISTS;
+    }
+
     int16_t delay  = 0;
     int16_t nextID = 0;
     if (mMappedData.increaseMainConnectionID(nextID))
@@ -1169,6 +1183,20 @@ am_Error_e CAmDatabaseHandlerMap::enterConnectionDB(const am_Connection_s &conne
         return (E_NOT_POSSIBLE);
     }
 
+    // check if we already have this connection
+    for (auto &mapped : mMappedData.mConnectionMap)
+    {
+        if ((mapped.second.sourceID != connection.sourceID) || (mapped.second.sinkID != connection.sinkID))
+        {
+            continue;
+        }
+
+        connectionID = mapped.second.connectionID;
+        logWarning(__METHOD_NAME__, "connection from source", connection.sourceID
+                , "to sink", connection.sinkID, "already exists with ID", connectionID);
+        return E_ALREADY_EXISTS;
+    }
+
     // connection format is not checked, because it's project specific
     int16_t nextID = 0;
     if (mMappedData.increaseConnectionID(nextID))
@@ -1917,54 +1945,66 @@ am_Error_e CAmDatabaseHandlerMap::getSourceClassInfoDB(const am_sourceID_t sourc
 
 am_Error_e CAmDatabaseHandlerMap::getSinkInfoDB(const am_sinkID_t sinkID, am_Sink_s &sinkData) const
 {
-
-    if (!existSink(sinkID))
+    auto iter = mMappedData.mSinkMap.find(sinkID);
+    if (iter == mMappedData.mSinkMap.end())
     {
         logWarning(__METHOD_NAME__, "sinkID", sinkID, "does not exist");
         return (E_NON_EXISTENT);
     }
 
-    am_Sink_Database_s mappedSink = mMappedData.mSinkMap.at(sinkID);
-    if ( true == mappedSink.reserved )
+    sinkData = iter->second; // copy to output parameter even if only ID and name are valid
+    if ( iter->second.reserved )
     {
-        return (E_NON_EXISTENT);
+        logWarning(__METHOD_NAME__, "sinkID", sinkID, "reserved for", sinkData.name, "but details are E_UNKNOWN");
+        return E_UNKNOWN;
     }
 
-    sinkData = mappedSink;
-
     return (E_OK);
 }
 
 am_Error_e CAmDatabaseHandlerMap::getSourceInfoDB(const am_sourceID_t sourceID, am_Source_s &sourceData) const
 {
-
-    if (!existSource(sourceID))
+    auto iter = mMappedData.mSourceMap.find(sourceID);
+    if (iter == mMappedData.mSourceMap.end())
     {
         logWarning(__METHOD_NAME__, "sourceID", sourceID, "does not exist");
         return (E_NON_EXISTENT);
     }
 
-    am_Source_Database_s mappedSource = mMappedData.mSourceMap.at(sourceID);
-    if ( true == mappedSource.reserved )
+    sourceData = iter->second; // copy to output parameter even if only ID and name are valid
+    if ( true == iter->second.reserved )
     {
+        logWarning(__METHOD_NAME__, "sourceID", sourceID, "reserved for", sourceData.name, "but details are E_UNKNOWN");
+        return E_UNKNOWN;
+    }
+
+    return (E_OK);
+}
+
+am_Error_e am::CAmDatabaseHandlerMap::getConnectionInfoDB(const am_connectionID_t connectionID, am_Connection_s &connectionData) const
+{
+    auto iter = mMappedData.mConnectionMap.find(connectionID);
+    if (iter == mMappedData.mConnectionMap.end())
+    {
+        logError(__METHOD_NAME__, "connectionID", connectionID, "does not exist");
         return (E_NON_EXISTENT);
     }
 
-    sourceData = mappedSource;
+    connectionData = iter->second;
 
-    return (E_OK);
+    return E_OK;
 }
 
 am_Error_e am::CAmDatabaseHandlerMap::getMainConnectionInfoDB(const am_mainConnectionID_t mainConnectionID, am_MainConnection_s &mainConnectionData) const
 {
-    if (!existMainConnection(mainConnectionID))
+    auto iter = mMappedData.mMainConnectionMap.find(mainConnectionID);
+    if (iter == mMappedData.mMainConnectionMap.end())
     {
-        logError(__METHOD_NAME__, "mainConnectionID must exist");
+        logError(__METHOD_NAME__, "mainConnectionID", mainConnectionID, "does not exist");
         return (E_NON_EXISTENT);
     }
 
-    am_MainConnection_s temp = mMappedData.mMainConnectionMap.at(mainConnectionID);
-    mainConnectionData = temp;
+    mainConnectionData = iter->second;
 
     return (E_OK);
 }
diff --git a/AudioManagerCore/src/CAmRoutingReceiver.cpp b/AudioManagerCore/src/CAmRoutingReceiver.cpp
index be13474..8f4d1ba 100644
--- a/AudioManagerCore/src/CAmRoutingReceiver.cpp
+++ b/AudioManagerCore/src/CAmRoutingReceiver.cpp
@@ -124,6 +124,19 @@ void CAmRoutingReceiver::ackDisconnect(const am_Handle_s handle, const am_connec
     mpControlSender->cbAckDisconnect(handle, error);
 }
 
+/**
+ * Support hand-over acknowledgment of connections surviving shutdown of the AM
+ *
+ * @param handle: composite identifier used in the request
+ * @param errorID:success indicator (E_OK if application takes over,
+ *                E_NOT_POSSIBLE if the routing adapter is not prepared to take over
+ *                full responsibility for all involved sources and sinks)
+ */
+void CAmRoutingReceiver::ackTransferConnection(const am_Handle_s handle, const am_Error_e errorID)
+{
+
+}
+
 void CAmRoutingReceiver::ackSetSinkVolumeChange(const am_Handle_s handle, const am_volume_t volume, const am_Error_e error)
 {
     logInfo(__METHOD_NAME__, "handle=", handle, "volume=", volume, "error=", error);
@@ -233,6 +246,40 @@ am_Error_e CAmRoutingReceiver::deregisterDomain(const am_domainID_t domainID)
     return (mpControlSender->hookSystemDeregisterDomain(domainID));
 }
 
+am_Error_e CAmRoutingReceiver::registerEarlyConnection(am_domainID_t domainID
+        , const std::vector< am_Connection_s > &route, am_ConnectionState_e state)
+{
+    if (route.size() < 1)
+    {
+        logWarning(__METHOD_NAME__, "route empty");
+        return E_NOT_POSSIBLE;
+    }
+
+    am_MainConnection_s mainConnectionData;
+    mainConnectionData.sourceID = route.front().sourceID;
+    mainConnectionData.sinkID   = route.back().sinkID;
+    mainConnectionData.connectionState = state;
+    mainConnectionData.listConnectionID.reserve(route.size());
+    for (auto & conn : route)
+    {
+        am_connectionID_t connectionID;
+        am_Error_e success = mpDatabaseHandler->enterConnectionDB(conn, connectionID);
+        switch (success)
+        {
+            case E_OK:
+            case E_ALREADY_EXISTS:
+            case E_NO_CHANGE:
+                mainConnectionData.listConnectionID.push_back(connectionID);
+                break;
+
+            default:
+                return success;
+        }
+    }
+
+    return mpControlSender->hookSystemRegisterEarlyConnection(domainID, mainConnectionData);
+}
+
 am_Error_e CAmRoutingReceiver::registerGateway(const am_Gateway_s &gatewayData, am_gatewayID_t &gatewayID)
 {
     return (mpControlSender->hookSystemRegisterGateway(gatewayData, gatewayID));
diff --git a/AudioManagerCore/src/CAmRoutingSender.cpp b/AudioManagerCore/src/CAmRoutingSender.cpp
index 36f5c1a..399de9a 100644
--- a/AudioManagerCore/src/CAmRoutingSender.cpp
+++ b/AudioManagerCore/src/CAmRoutingSender.cpp
@@ -921,6 +921,19 @@ void CAmRoutingSender::setRoutingRundown()
     }
 }
 
+am_Error_e CAmRoutingSender::asyncTransferConnection(const am_Handle_s handle, am_domainID_t domainID
+    , const std::vector<std::pair<std::string, std::string>>  &route, am_ConnectionState_e state)
+{
+    auto iter = mMapDomainInterface.find(domainID);
+    if (iter != mMapDomainInterface.end() && iter->second)
+    {
+        return iter->second->asyncTransferConnection(handle, route, state);
+    }
+
+    // given domain not found in map
+    return E_NON_EXISTENT;
+}
+
 am_Error_e CAmRoutingSender::asyncSetVolumes(am_Handle_s &handle, const std::vector<am_Volumes_s> &listVolumes)
 {
     IAmRoutingSend *pRoutingInterface(NULL);