* 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>

17 files changed, 159 insertions, 147 deletions

diff --git a/AudioManagerDaemon/include/CAmCommandReceiver.h b/AudioManagerDaemon/include/CAmCommandReceiver.h
index fc27df7..ebb8eff 100644
--- a/AudioManagerDaemon/include/CAmCommandReceiver.h
+++ b/AudioManagerDaemon/include/CAmCommandReceiver.h
@@ -22,7 +22,7 @@
 #ifndef COMMANDRECEIVER_H_
 #define COMMANDRECEIVER_H_
 
-#include "command/IAmCommandReceive.h"
+#include "IAmCommand.h"
 
 namespace am
 {
diff --git a/AudioManagerDaemon/include/CAmCommandSender.h b/AudioManagerDaemon/include/CAmCommandSender.h
index 78858f9..db9ca50 100644
--- a/AudioManagerDaemon/include/CAmCommandSender.h
+++ b/AudioManagerDaemon/include/CAmCommandSender.h
@@ -26,7 +26,7 @@
 #include "../test/IAmCommandBackdoor.h" //we need this for the unit test
 #endif
 
-#include "command/IAmCommandSend.h"
+#include "IAmCommand.h"
 
 namespace am
 {
diff --git a/AudioManagerDaemon/include/CAmControlReceiver.h b/AudioManagerDaemon/include/CAmControlReceiver.h
index 2a30108..6d18533 100644
--- a/AudioManagerDaemon/include/CAmControlReceiver.h
+++ b/AudioManagerDaemon/include/CAmControlReceiver.h
@@ -22,7 +22,7 @@
 #ifndef CONTRONLRECEIVER_H_
 #define CONTRONLRECEIVER_H_
 
-#include "control/IAmControlReceive.h"
+#include "IAmControl.h"
 
 namespace am
 {
diff --git a/AudioManagerDaemon/include/CAmControlSender.h b/AudioManagerDaemon/include/CAmControlSender.h
index fe43fe3..cedcfe0 100644
--- a/AudioManagerDaemon/include/CAmControlSender.h
+++ b/AudioManagerDaemon/include/CAmControlSender.h
@@ -26,7 +26,7 @@
 #include "../test/IAmControlBackdoor.h"
 #endif
 
-#include "control/IAmControlSend.h"
+#include "IAmControl.h"
 #include "CAmSocketHandler.h"
 #include "unistd.h"
 
@@ -106,6 +106,7 @@ public:
     void hookSystemNodeApplicationModeChanged(const NsmApplicationMode_e ApplicationModeId) ;
     void hookSystemSessionStateChanged(const std::string& sessionName, const NsmSeat_e seatID, const NsmSessionState_e sessionStateID) ;
     NsmErrorStatus_e hookSystemLifecycleRequest(const uint32_t Request, const uint32_t RequestId) ;
+    void hookSystemSingleTimingInformationChanged(const am_connectionID_t connectionID, const am_timeSync_t time);
 
     void receiverCallback(const pollfd pollfd, const sh_pollHandle_t handle, void* userData);
     bool checkerCallback(const sh_pollHandle_t handle, void* userData);
diff --git a/AudioManagerDaemon/include/CAmRoutingReceiver.h b/AudioManagerDaemon/include/CAmRoutingReceiver.h
index c81fd50..f69599f 100644
--- a/AudioManagerDaemon/include/CAmRoutingReceiver.h
+++ b/AudioManagerDaemon/include/CAmRoutingReceiver.h
@@ -22,7 +22,7 @@
 #ifndef ROUTINGRECEIVER_H_
 #define ROUTINGRECEIVER_H_
 
-#include "routing/IAmRoutingReceive.h"
+#include "IAmRouting.h"
 
 namespace am
 {
diff --git a/AudioManagerDaemon/include/CAmRoutingSender.h b/AudioManagerDaemon/include/CAmRoutingSender.h
index d19141d..a3af312 100644
--- a/AudioManagerDaemon/include/CAmRoutingSender.h
+++ b/AudioManagerDaemon/include/CAmRoutingSender.h
@@ -22,7 +22,7 @@
 #ifndef ROUTINGSENDER_H_
 #define ROUTINGSENDER_H_
 
-#include "routing/IAmRoutingSend.h"
+#include "IAmRouting.h"
 #include <map>
 
 #ifdef UNIT_TEST //this is needed to test RoutingSender
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;
 }
 }
diff --git a/AudioManagerDaemon/test/IAmCommandBackdoor.h b/AudioManagerDaemon/test/IAmCommandBackdoor.h
index 33aef19..35a0c0a 100644
--- a/AudioManagerDaemon/test/IAmCommandBackdoor.h
+++ b/AudioManagerDaemon/test/IAmCommandBackdoor.h
@@ -21,7 +21,7 @@
 #ifndef COMMANDINTERFACEBACKDOOR_H_
 #define COMMANDINTERFACEBACKDOOR_H_
 
-#include <command/IAmCommandSend.h>
+#include <IAmCommand.h>
 #include "CAmCommandSender.h"
 
 namespace am
diff --git a/AudioManagerDaemon/test/IAmControlBackdoor.h b/AudioManagerDaemon/test/IAmControlBackdoor.h
index 1c006f0..7e1845e 100644
--- a/AudioManagerDaemon/test/IAmControlBackdoor.h
+++ b/AudioManagerDaemon/test/IAmControlBackdoor.h
@@ -21,7 +21,7 @@
 #ifndef CONTROLINTERFACEBACKDOOR_H_
 #define CONTROLINTERFACEBACKDOOR_H_
 
-#include "control/IAmControlSend.h"
+#include "IAmControl.h"
 #include "CAmControlSender.h"
 
 namespace am
diff --git a/AudioManagerDaemon/test/MockIAmCommandSend.h b/AudioManagerDaemon/test/MockIAmCommandSend.h
index 8d1c17f..0c8558e 100644
--- a/AudioManagerDaemon/test/MockIAmCommandSend.h
+++ b/AudioManagerDaemon/test/MockIAmCommandSend.h
@@ -21,7 +21,7 @@
 #ifndef MOCKCOMMANDINTERFACE_H_
 #define MOCKCOMMANDINTERFACE_H_
 
-#include "command/IAmCommandSend.h"
+#include "IAmCommand.h"
 #include "gtest/gtest.h"
 #include "gmock/gmock.h"
 
diff --git a/AudioManagerDaemon/test/MockIAmControlSend.h b/AudioManagerDaemon/test/MockIAmControlSend.h
index 219a7f1..29a6bb7 100644
--- a/AudioManagerDaemon/test/MockIAmControlSend.h
+++ b/AudioManagerDaemon/test/MockIAmControlSend.h
@@ -21,7 +21,7 @@
 #ifndef MOCKCONTROLINTERFACE_H_
 #define MOCKCONTROLINTERFACE_H_
 
-#include "control/IAmControlSend.h"
+#include "IAmControl.h"
 #include "gtest/gtest.h"
 #include "gmock/gmock.h"
 
@@ -29,136 +29,138 @@ namespace am {
 
 class MockIAmControlSend : public IAmControlSend {
  public:
-    MOCK_CONST_METHOD1(getInterfaceVersion,
-        void(std::string& version));
-    MOCK_METHOD1(startupController,
-        am_Error_e(IAmControlReceive* controlreceiveinterface));
-    MOCK_METHOD0(setControllerReady,
-        void());
-    MOCK_METHOD1(setControllerRundown,
-        void(const int16_t signal));
-    MOCK_METHOD3(hookUserConnectionRequest,
-        am_Error_e(const am_sourceID_t sourceID, const am_sinkID_t sinkID, am_mainConnectionID_t& mainConnectionID));
-    MOCK_METHOD1(hookUserDisconnectionRequest,
-        am_Error_e(const am_mainConnectionID_t connectionID));
-    MOCK_METHOD2(hookUserSetMainSinkSoundProperty,
-        am_Error_e(const am_sinkID_t sinkID, const am_MainSoundProperty_s& soundProperty));
-    MOCK_METHOD2(hookUserSetMainSourceSoundProperty,
-        am_Error_e(const am_sourceID_t sourceID, const am_MainSoundProperty_s& soundProperty));
-    MOCK_METHOD1(hookUserSetSystemProperty,
-        am_Error_e(const am_SystemProperty_s& property));
-    MOCK_METHOD2(hookUserVolumeChange,
-        am_Error_e(const am_sinkID_t SinkID, const am_mainVolume_t newVolume));
-    MOCK_METHOD2(hookUserVolumeStep,
-        am_Error_e(const am_sinkID_t SinkID, const int16_t increment));
-    MOCK_METHOD2(hookUserSetSinkMuteState,
-        am_Error_e(const am_sinkID_t sinkID, const am_MuteState_e muteState));
-    MOCK_METHOD2(hookSystemRegisterDomain,
-        am_Error_e(const am_Domain_s& domainData, am_domainID_t& domainID));
-    MOCK_METHOD1(hookSystemDeregisterDomain,
-        am_Error_e(const am_domainID_t domainID));
-    MOCK_METHOD1(hookSystemDomainRegistrationComplete,
-        void(const am_domainID_t domainID));
-    MOCK_METHOD2(hookSystemRegisterSink,
-        am_Error_e(const am_Sink_s& sinkData, am_sinkID_t& sinkID));
-    MOCK_METHOD1(hookSystemDeregisterSink,
-        am_Error_e(const am_sinkID_t sinkID));
-    MOCK_METHOD2(hookSystemRegisterSource,
-        am_Error_e(const am_Source_s& sourceData, am_sourceID_t& sourceID));
-    MOCK_METHOD1(hookSystemDeregisterSource,
-        am_Error_e(const am_sourceID_t sourceID));
-    MOCK_METHOD2(hookSystemRegisterGateway,
-        am_Error_e(const am_Gateway_s& gatewayData, am_gatewayID_t& gatewayID));
-    MOCK_METHOD1(hookSystemDeregisterGateway,
-        am_Error_e(const am_gatewayID_t gatewayID));
-    MOCK_METHOD2(hookSystemRegisterConverter,
-        am_Error_e(const am_Converter_s& converterData, am_converterID_t& converterID));
-    MOCK_METHOD1(hookSystemDeregisterConverter,
-        am_Error_e(const am_converterID_t converterID));
-    MOCK_METHOD2(hookSystemRegisterCrossfader,
-        am_Error_e(const am_Crossfader_s& crossfaderData, am_crossfaderID_t& crossfaderID));
-    MOCK_METHOD1(hookSystemDeregisterCrossfader,
-        am_Error_e(const am_crossfaderID_t crossfaderID));
-    MOCK_METHOD3(hookSystemSinkVolumeTick,
-        void(const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume));
-    MOCK_METHOD3(hookSystemSourceVolumeTick,
-        void(const am_Handle_s handle, const am_sourceID_t sourceID, const am_volume_t volume));
-    MOCK_METHOD2(hookSystemInterruptStateChange,
-        void(const am_sourceID_t sourceID, const am_InterruptState_e interruptState));
-    MOCK_METHOD2(hookSystemSinkAvailablityStateChange,
-        void(const am_sinkID_t sinkID, const am_Availability_s& availability));
-    MOCK_METHOD2(hookSystemSourceAvailablityStateChange,
-        void(const am_sourceID_t sourceID, const am_Availability_s& availability));
-    MOCK_METHOD2(hookSystemDomainStateChange,
-        void(const am_domainID_t domainID, const am_DomainState_e state));
-    MOCK_METHOD1(hookSystemReceiveEarlyData,
-        void(const std::vector<am_EarlyData_s>& data));
-    MOCK_METHOD1(hookSystemSpeedChange,
-        void(const am_speed_t speed));
-    MOCK_METHOD2(hookSystemTimingInformationChanged,
-        void(const am_mainConnectionID_t mainConnectionID, const am_timeSync_t time));
-    MOCK_METHOD2(cbAckConnect,
-        void(const am_Handle_s handle, const am_Error_e errorID));
-    MOCK_METHOD2(cbAckDisconnect,
-        void(const am_Handle_s handle, const am_Error_e errorID));
-    MOCK_METHOD3(cbAckCrossFade,
-        void(const am_Handle_s handle, const am_HotSink_e hostsink, const am_Error_e error));
-    MOCK_METHOD3(cbAckSetSinkVolumeChange,
-        void(const am_Handle_s handle, const am_volume_t volume, const am_Error_e error));
-    MOCK_METHOD3(cbAckSetSourceVolumeChange,
-        void(const am_Handle_s handle, const am_volume_t voulme, const am_Error_e error));
-    MOCK_METHOD2(cbAckSetSourceState,
-        void(const am_Handle_s handle, const am_Error_e error));
-    MOCK_METHOD2(cbAckSetSourceSoundProperties,
-        void(const am_Handle_s handle, const am_Error_e error));
-    MOCK_METHOD2(cbAckSetSourceSoundProperty,
-        void(const am_Handle_s handle, const am_Error_e error));
-    MOCK_METHOD2(cbAckSetSinkSoundProperties,
-        void(const am_Handle_s handle, const am_Error_e error));
-    MOCK_METHOD2(cbAckSetSinkSoundProperty,
-        void(const am_Handle_s handle, const am_Error_e error));
-    MOCK_METHOD5(getConnectionFormatChoice,
-        am_Error_e(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_Route_s listRoute, const std::vector<am_CustomAvailabilityReason_t> listPossibleConnectionFormats, std::vector<am_CustomAvailabilityReason_t>& listPrioConnectionFormats));
-    MOCK_METHOD1(confirmCommandReady,
-        void(const am_Error_e error));
-    MOCK_METHOD1(confirmRoutingReady,
-        void(const am_Error_e error));
-    MOCK_METHOD1(confirmCommandRundown,
-        void(const am_Error_e error));
-    MOCK_METHOD1(confirmRoutingRundown,
-        void(const am_Error_e error));
-    MOCK_METHOD5(hookSystemUpdateSink,
-        am_Error_e(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomAvailabilityReason_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties));
-    MOCK_METHOD5(hookSystemUpdateSource,
-        am_Error_e(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomAvailabilityReason_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties));
-    MOCK_METHOD4(hookSystemUpdateGateway,
-        am_Error_e(const am_gatewayID_t gatewayID, const std::vector<am_CustomAvailabilityReason_t>& listSourceConnectionFormats, const std::vector<am_CustomAvailabilityReason_t>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix));
-    MOCK_METHOD4(hookSystemUpdateConverter,
-        am_Error_e(const am_converterID_t converterID, const std::vector<am_CustomAvailabilityReason_t>& listSourceConnectionFormats, const std::vector<am_CustomAvailabilityReason_t>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix));
-    MOCK_METHOD3(cbAckSetVolumes,
-        void(const am_Handle_s handle, const std::vector<am_Volumes_s>& listVolumes, const am_Error_e error));
-    MOCK_METHOD2(cbAckSetSinkNotificationConfiguration,
-        void(const am_Handle_s handle, const am_Error_e error));
-    MOCK_METHOD2(cbAckSetSourceNotificationConfiguration,
-        void(const am_Handle_s handle, const am_Error_e error));
-    MOCK_METHOD2(hookSinkNotificationDataChanged,
-        void(const am_sinkID_t sinkID, const am_NotificationPayload_s& payload));
-    MOCK_METHOD2(hookSourceNotificationDataChanged,
-        void(const am_sourceID_t sourceID, const am_NotificationPayload_s& payload));
-    MOCK_METHOD2(hookUserSetMainSinkNotificationConfiguration,
-        am_Error_e(const am_sinkID_t sinkID, const am_NotificationConfiguration_s& notificationConfiguration));
-    MOCK_METHOD2(hookUserSetMainSourceNotificationConfiguration,
-        am_Error_e(const am_sourceID_t sourceID, const am_NotificationConfiguration_s& notificationConfiguration));
-    MOCK_METHOD1(hookSystemNodeStateChanged,
-        void(const NsmNodeState_e NodeStateId));
-    MOCK_METHOD1(hookSystemNodeApplicationModeChanged,
-        void(const NsmApplicationMode_e ApplicationModeId));
-    MOCK_METHOD3(hookSystemSessionStateChanged,
-        void(const std::string& sessionName, const NsmSeat_e seatID, const NsmSessionState_e sessionStateID));
-    MOCK_METHOD2(hookSystemLifecycleRequest,
-        NsmErrorStatus_e(const uint32_t Request, const uint32_t RequestId));
-
+  MOCK_CONST_METHOD1(getInterfaceVersion,
+      void(std::string& version));
+  MOCK_METHOD1(startupController,
+      am_Error_e(IAmControlReceive* controlreceiveinterface));
+  MOCK_METHOD0(setControllerReady,
+      void());
+  MOCK_METHOD1(setControllerRundown,
+      void(const int16_t signal));
+  MOCK_METHOD3(hookUserConnectionRequest,
+      am_Error_e(const am_sourceID_t sourceID, const am_sinkID_t sinkID, am_mainConnectionID_t& mainConnectionID));
+  MOCK_METHOD1(hookUserDisconnectionRequest,
+      am_Error_e(const am_mainConnectionID_t connectionID));
+  MOCK_METHOD2(hookUserSetMainSinkSoundProperty,
+      am_Error_e(const am_sinkID_t sinkID, const am_MainSoundProperty_s& soundProperty));
+  MOCK_METHOD2(hookUserSetMainSourceSoundProperty,
+      am_Error_e(const am_sourceID_t sourceID, const am_MainSoundProperty_s& soundProperty));
+  MOCK_METHOD1(hookUserSetSystemProperty,
+      am_Error_e(const am_SystemProperty_s& property));
+  MOCK_METHOD2(hookUserVolumeChange,
+      am_Error_e(const am_sinkID_t SinkID, const am_mainVolume_t newVolume));
+  MOCK_METHOD2(hookUserVolumeStep,
+      am_Error_e(const am_sinkID_t SinkID, const int16_t increment));
+  MOCK_METHOD2(hookUserSetSinkMuteState,
+      am_Error_e(const am_sinkID_t sinkID, const am_MuteState_e muteState));
+  MOCK_METHOD2(hookSystemRegisterDomain,
+      am_Error_e(const am_Domain_s& domainData, am_domainID_t& domainID));
+  MOCK_METHOD1(hookSystemDeregisterDomain,
+      am_Error_e(const am_domainID_t domainID));
+  MOCK_METHOD1(hookSystemDomainRegistrationComplete,
+      void(const am_domainID_t domainID));
+  MOCK_METHOD2(hookSystemRegisterSink,
+      am_Error_e(const am_Sink_s& sinkData, am_sinkID_t& sinkID));
+  MOCK_METHOD1(hookSystemDeregisterSink,
+      am_Error_e(const am_sinkID_t sinkID));
+  MOCK_METHOD2(hookSystemRegisterSource,
+      am_Error_e(const am_Source_s& sourceData, am_sourceID_t& sourceID));
+  MOCK_METHOD1(hookSystemDeregisterSource,
+      am_Error_e(const am_sourceID_t sourceID));
+  MOCK_METHOD2(hookSystemRegisterConverter,
+      am_Error_e(const am_Converter_s& converterData, am_converterID_t& converterID));
+  MOCK_METHOD2(hookSystemRegisterGateway,
+      am_Error_e(const am_Gateway_s& gatewayData, am_gatewayID_t& gatewayID));
+  MOCK_METHOD1(hookSystemDeregisterConverter,
+      am_Error_e(const am_converterID_t converterID));
+  MOCK_METHOD1(hookSystemDeregisterGateway,
+      am_Error_e(const am_gatewayID_t gatewayID));
+  MOCK_METHOD2(hookSystemRegisterCrossfader,
+      am_Error_e(const am_Crossfader_s& crossfaderData, am_crossfaderID_t& crossfaderID));
+  MOCK_METHOD1(hookSystemDeregisterCrossfader,
+      am_Error_e(const am_crossfaderID_t crossfaderID));
+  MOCK_METHOD3(hookSystemSinkVolumeTick,
+      void(const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume));
+  MOCK_METHOD3(hookSystemSourceVolumeTick,
+      void(const am_Handle_s handle, const am_sourceID_t sourceID, const am_volume_t volume));
+  MOCK_METHOD2(hookSystemInterruptStateChange,
+      void(const am_sourceID_t sourceID, const am_InterruptState_e interruptState));
+  MOCK_METHOD2(hookSystemSinkAvailablityStateChange,
+      void(const am_sinkID_t sinkID, const am_Availability_s& availability));
+  MOCK_METHOD2(hookSystemSourceAvailablityStateChange,
+      void(const am_sourceID_t sourceID, const am_Availability_s& availability));
+  MOCK_METHOD2(hookSystemDomainStateChange,
+      void(const am_domainID_t domainID, const am_DomainState_e state));
+  MOCK_METHOD1(hookSystemReceiveEarlyData,
+      void(const std::vector<am_EarlyData_s>& data));
+  MOCK_METHOD1(hookSystemSpeedChange,
+      void(const am_speed_t speed));
+  MOCK_METHOD2(hookSystemTimingInformationChanged,
+      void(const am_mainConnectionID_t mainConnectionID, const am_timeSync_t time));
+  MOCK_METHOD2(cbAckConnect,
+      void(const am_Handle_s handle, const am_Error_e errorID));
+  MOCK_METHOD2(cbAckDisconnect,
+      void(const am_Handle_s handle, const am_Error_e errorID));
+  MOCK_METHOD3(cbAckCrossFade,
+      void(const am_Handle_s handle, const am_HotSink_e hostsink, const am_Error_e error));
+  MOCK_METHOD3(cbAckSetSinkVolumeChange,
+      void(const am_Handle_s handle, const am_volume_t volume, const am_Error_e error));
+  MOCK_METHOD3(cbAckSetSourceVolumeChange,
+      void(const am_Handle_s handle, const am_volume_t voulme, const am_Error_e error));
+  MOCK_METHOD2(cbAckSetSourceState,
+      void(const am_Handle_s handle, const am_Error_e error));
+  MOCK_METHOD2(cbAckSetSourceSoundProperties,
+      void(const am_Handle_s handle, const am_Error_e error));
+  MOCK_METHOD2(cbAckSetSourceSoundProperty,
+      void(const am_Handle_s handle, const am_Error_e error));
+  MOCK_METHOD2(cbAckSetSinkSoundProperties,
+      void(const am_Handle_s handle, const am_Error_e error));
+  MOCK_METHOD2(cbAckSetSinkSoundProperty,
+      void(const am_Handle_s handle, const am_Error_e error));
+  MOCK_METHOD5(getConnectionFormatChoice,
+      am_Error_e(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_Route_s listRoute, const std::vector<am_CustomConnectionFormat_t> listPossibleConnectionFormats, std::vector<am_CustomConnectionFormat_t>& listPrioConnectionFormats));
+  MOCK_METHOD1(confirmCommandReady,
+      void(const am_Error_e error));
+  MOCK_METHOD1(confirmRoutingReady,
+      void(const am_Error_e error));
+  MOCK_METHOD1(confirmCommandRundown,
+      void(const am_Error_e error));
+  MOCK_METHOD1(confirmRoutingRundown,
+      void(const am_Error_e error));
+  MOCK_METHOD5(hookSystemUpdateSink,
+      am_Error_e(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomConnectionFormat_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties));
+  MOCK_METHOD5(hookSystemUpdateSource,
+      am_Error_e(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));
+  MOCK_METHOD4(hookSystemUpdateConverter,
+      am_Error_e(const am_converterID_t converterID, const std::vector<am_CustomConnectionFormat_t>& listSourceConnectionFormats, const std::vector<am_CustomConnectionFormat_t>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix));
+  MOCK_METHOD4(hookSystemUpdateGateway,
+      am_Error_e(const am_gatewayID_t gatewayID, const std::vector<am_CustomConnectionFormat_t>& listSourceConnectionFormats, const std::vector<am_CustomConnectionFormat_t>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix));
+  MOCK_METHOD3(cbAckSetVolumes,
+      void(const am_Handle_s handle, const std::vector<am_Volumes_s>& listVolumes, const am_Error_e error));
+  MOCK_METHOD2(cbAckSetSinkNotificationConfiguration,
+      void(const am_Handle_s handle, const am_Error_e error));
+  MOCK_METHOD2(cbAckSetSourceNotificationConfiguration,
+      void(const am_Handle_s handle, const am_Error_e error));
+  MOCK_METHOD2(hookSinkNotificationDataChanged,
+      void(const am_sinkID_t sinkID, const am_NotificationPayload_s& payload));
+  MOCK_METHOD2(hookSourceNotificationDataChanged,
+      void(const am_sourceID_t sourceID, const am_NotificationPayload_s& payload));
+  MOCK_METHOD2(hookUserSetMainSinkNotificationConfiguration,
+      am_Error_e(const am_sinkID_t sinkID, const am_NotificationConfiguration_s& notificationConfiguration));
+  MOCK_METHOD2(hookUserSetMainSourceNotificationConfiguration,
+      am_Error_e(const am_sourceID_t sourceID, const am_NotificationConfiguration_s& notificationConfiguration));
+  MOCK_METHOD1(hookSystemNodeStateChanged,
+      void(const NsmNodeState_e NodeStateId));
+  MOCK_METHOD1(hookSystemNodeApplicationModeChanged,
+      void(const NsmApplicationMode_e ApplicationModeId));
+  MOCK_METHOD3(hookSystemSessionStateChanged,
+      void(const std::string& sessionName, const NsmSeat_e seatID, const NsmSessionState_e sessionStateID));
+  MOCK_METHOD2(hookSystemLifecycleRequest,
+      NsmErrorStatus_e(const uint32_t Request, const uint32_t RequestId));
+  MOCK_METHOD2(hookSystemSingleTimingInformationChanged,
+      void(const am_connectionID_t connectionID, const am_timeSync_t time));
 };
 
+
 }  // namespace am
 #endif /* MOCKCONTROLINTERFACE_H_ */
diff --git a/AudioManagerDaemon/test/MockIAmRoutingSend.h b/AudioManagerDaemon/test/MockIAmRoutingSend.h
index f995828..a2ade6d 100644
--- a/AudioManagerDaemon/test/MockIAmRoutingSend.h
+++ b/AudioManagerDaemon/test/MockIAmRoutingSend.h
@@ -21,7 +21,7 @@
 #ifndef MOCKROUTINGINTERFACE_H_
 #define MOCKROUTINGINTERFACE_H_
 
-#include "routing/IAmRoutingSend.h"
+#include "IAmRouting.h"
 #include "gtest/gtest.h"
 #include "gmock/gmock.h"