* now only 3 header files are generated. Send and Receive interface s in one. TimingInformation for a single connections is now reported to the controller plugin

Signed-off-by: Christian Linke <christian.linke@bmw.de>

6 files changed, 16 insertions, 7 deletions

diff --git a/AudioManagerDaemon/src/CAmCommandReceiver.cpp b/AudioManagerDaemon/src/CAmCommandReceiver.cpp
index 43ccd20..0453e3d 100644
--- a/AudioManagerDaemon/src/CAmCommandReceiver.cpp
+++ b/AudioManagerDaemon/src/CAmCommandReceiver.cpp
@@ -185,7 +185,7 @@ am_Error_e CAmCommandReceiver::getSocketHandler(CAmSocketHandler *& socketHandle
 
 void CAmCommandReceiver::getInterfaceVersion(std::string & version) const
 {
-    version = CommandReceiveVersion;
+    version = CommandVersion;
 }
 
 void CAmCommandReceiver::confirmCommandReady(const uint16_t handle, const am_Error_e error)
diff --git a/AudioManagerDaemon/src/CAmCommandSender.cpp b/AudioManagerDaemon/src/CAmCommandSender.cpp
index 3882162..d864981 100644
--- a/AudioManagerDaemon/src/CAmCommandSender.cpp
+++ b/AudioManagerDaemon/src/CAmCommandSender.cpp
@@ -305,7 +305,7 @@ void CAmCommandSender::setCommandRundown()
 
 void CAmCommandSender::getInterfaceVersion(std::string & version) const
 {
-    version = CommandSendVersion;
+    version = CommandVersion;
 }
 
 am_Error_e am::CAmCommandSender::getListPlugins(std::vector<std::string> & interfaces) const
diff --git a/AudioManagerDaemon/src/CAmControlReceiver.cpp b/AudioManagerDaemon/src/CAmControlReceiver.cpp
index 19b05bd..de529fc 100644
--- a/AudioManagerDaemon/src/CAmControlReceiver.cpp
+++ b/AudioManagerDaemon/src/CAmControlReceiver.cpp
@@ -494,7 +494,7 @@ void CAmControlReceiver::setRoutingRundown()
 
 void CAmControlReceiver::getInterfaceVersion(std::string & version) const
 {
-    version = ControlReceiveVersion;
+    version = ControlVersion;
 }
 
 am_Error_e CAmControlReceiver::changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
diff --git a/AudioManagerDaemon/src/CAmControlSender.cpp b/AudioManagerDaemon/src/CAmControlSender.cpp
index bc51be0..66e710b 100644
--- a/AudioManagerDaemon/src/CAmControlSender.cpp
+++ b/AudioManagerDaemon/src/CAmControlSender.cpp
@@ -369,7 +369,7 @@ am_Error_e am::CAmControlSender::getConnectionFormatChoice(const am_sourceID_t s
 
 void CAmControlSender::getInterfaceVersion(std::string & version) const
 {
-    version = ControlSendVersion;
+    version = ControlVersion;
 }
 
 void CAmControlSender::confirmCommandReady(const am_Error_e error)
@@ -501,6 +501,12 @@ NsmErrorStatus_e CAmControlSender::hookSystemLifecycleRequest(const uint32_t Req
     return (mController->hookSystemLifecycleRequest(Request,RequestId));
 }
 
+void CAmControlSender::hookSystemSingleTimingInformationChanged(const am_connectionID_t connectionID, const am_timeSync_t time)
+{
+    assert(mController);
+    mController->hookSystemSingleTimingInformationChanged(connectionID,time);
+}
+
 /**for testing only contructor - do not use !
  *
  */
@@ -525,3 +531,5 @@ bool CAmControlSender::dispatcherCallback(const sh_pollHandle_t handle, void* us
 }
 
 }
+
+
diff --git a/AudioManagerDaemon/src/CAmRoutingReceiver.cpp b/AudioManagerDaemon/src/CAmRoutingReceiver.cpp
index c36cde7..91a1bc4 100644
--- a/AudioManagerDaemon/src/CAmRoutingReceiver.cpp
+++ b/AudioManagerDaemon/src/CAmRoutingReceiver.cpp
@@ -321,6 +321,7 @@ void CAmRoutingReceiver::hookDomainStateChange(const am_domainID_t domainID, con
 void CAmRoutingReceiver::hookTimingInformationChanged(const am_connectionID_t connectionID, const am_timeSync_t delay)
 {
     mpDatabaseHandler->changeConnectionTimingInformation(connectionID, delay);
+    mpControlSender->hookSystemSingleTimingInformationChanged(connectionID,delay);
 }
 
 void CAmRoutingReceiver::sendChangedData(const std::vector<am_EarlyData_s> & earlyData)
@@ -358,7 +359,7 @@ am_Error_e CAmRoutingReceiver::getSocketHandler(CAmSocketHandler *& socketHandle
 
 void CAmRoutingReceiver::getInterfaceVersion(std::string & version) const
 {
-    version = RoutingReceiveVersion;
+    version = RoutingVersion;
 }
 
 void CAmRoutingReceiver::confirmRoutingReady(const uint16_t handle,	const am_Error_e error)
@@ -489,7 +490,7 @@ am_Error_e CAmRoutingReceiver::getDomainOfSource(const am_sourceID_t sourceID, a
 	return  mpDatabaseHandler->getDomainOfSource(sourceID,domainID);
 }
 
-void am::CAmRoutingReceiver::waitOnRundown(bool rundown)
+void CAmRoutingReceiver::waitOnRundown(bool rundown)
 {
     mWaitRundown = rundown;
     mLastRundownError=E_OK;
diff --git a/AudioManagerDaemon/src/CAmRoutingSender.cpp b/AudioManagerDaemon/src/CAmRoutingSender.cpp
index 77f12d0..a064e53 100644
--- a/AudioManagerDaemon/src/CAmRoutingSender.cpp
+++ b/AudioManagerDaemon/src/CAmRoutingSender.cpp
@@ -729,6 +729,6 @@ am_Error_e CAmRoutingSender::getListPlugins(std::vector<std::string>& interfaces
 
 void CAmRoutingSender::getInterfaceVersion(std::string & version) const
 {
-    version = RoutingSendVersion;
+    version = RoutingVersion;
 }
 }