* changes that follow the review comments from Thomas G.

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

3 files changed, 65 insertions, 64 deletions

diff --git a/PluginControlInterface/include/CAmControlSenderBase.h b/PluginControlInterface/include/CAmControlSenderBase.h
index 55758f0..82ee056 100644
--- a/PluginControlInterface/include/CAmControlSenderBase.h
+++ b/PluginControlInterface/include/CAmControlSenderBase.h
@@ -75,22 +75,21 @@ public:
     void confirmRoutingReady(const am_Error_e error) ;
     void confirmCommandRundown(const am_Error_e error) ;
     void confirmRoutingRundown(const am_Error_e error) ;
-    am_Error_e hookSystemUpdateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s> listSoundProperties, const std::vector<am_ConnectionFormat_e> listConnectionFormats, std::vector<am_MainSoundProperty_s> listMainSoundProperties) ;
-    am_Error_e hookSystemUpdateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s> listSoundProperties, const std::vector<am_ConnectionFormat_e> listConnectionFormats, std::vector<am_MainSoundProperty_s> listMainSoundProperties) ;
-    am_Error_e hookSystemUpdateGateway(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e> listSourceConnectionFormats, const std::vector<am_ConnectionFormat_e> listSinkConnectionFormats, const std::vector<bool> convertionMatrix) ;
-    void cbAckSetVolume(const am_Handle_s handle, const std::vector<am_Volumes_s> listVolumes, const am_Error_e error) ;
+    am_Error_e hookSystemUpdateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) ;
+    am_Error_e hookSystemUpdateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties) ;
+    am_Error_e hookSystemUpdateGateway(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e>& listSourceConnectionFormats, const std::vector<am_ConnectionFormat_e>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix) ;
+    void cbAckSetVolumes(const am_Handle_s handle, const std::vector<am_Volumes_s>& listVolumes, const am_Error_e error) ;
     void cbAckSetSinkNotificationConfiguration(const am_Handle_s handle, const am_Error_e error) ;
     void cbAckSetSourceNotificationConfiguration(const am_Handle_s handle, const am_Error_e error) ;
-    void hookSinkNotificationDataChanged(const am_sinkID_t sinkID, const am_NotificationPayload_s payload) ;
-    void hookSourceNotificationDataChanged(const am_sourceID_t sourceID, const am_NotificationPayload_s payload) ;
-    am_Error_e hookUserSetMainSinkNotificationConfiguration(const am_sinkID_t sinkID, const am_NotificationConfiguration_s notificationConfiguration) ;
-    am_Error_e hookUserSetMainSourceNotificationConfiguration(const am_sourceID_t sourceID, const am_NotificationConfiguration_s notificationConfiguration) ;
+    void hookSinkNotificationDataChanged(const am_sinkID_t sinkID, const am_NotificationPayload_s& payload) ;
+    void hookSourceNotificationDataChanged(const am_sourceID_t sourceID, const am_NotificationPayload_s& payload) ;
+    am_Error_e hookUserSetMainSinkNotificationConfiguration(const am_sinkID_t sinkID, const am_NotificationConfiguration_s& notificationConfiguration) ;
+    am_Error_e hookUserSetMainSourceNotificationConfiguration(const am_sourceID_t sourceID, const am_NotificationConfiguration_s& notificationConfiguration) ;
     void hookSystemNodeStateChanged(const NsmNodeState_e NodeStateId) ;
     void hookSystemNodeApplicationModeChanged(const NsmApplicationMode_e ApplicationModeId) ;
-    void hookSystemSessionStateChanged(const std::string sessionName, const int32_t seatID, const NsmSessionState_e sessionStateID) ;
+    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) ;
 
-
 private:
     IAmControlReceive * mControlReceiveInterface;
 
diff --git a/PluginControlInterface/src/CAmControlSenderBase.cpp b/PluginControlInterface/src/CAmControlSenderBase.cpp
index 8975c32..f47bdc6 100644
--- a/PluginControlInterface/src/CAmControlSenderBase.cpp
+++ b/PluginControlInterface/src/CAmControlSenderBase.cpp
@@ -790,14 +790,29 @@ void CAmControlSenderBase::hookSystemNodeApplicationModeChanged(const NsmApplica
     (void) ApplicationModeId;
 }
 
-void CAmControlSenderBase::hookSystemSessionStateChanged(const std::string sessionName, const int32_t seatID, const NsmSessionState_e sessionStateID)
+
+void CAmControlSenderBase::cbAckSetSinkNotificationConfiguration(const am_Handle_s handle, const am_Error_e error)
 {
-    (void) sessionName;
-    (void) seatID;
-    (void) sessionStateID;
+    (void) handle;
+    (void) error;
+}
+
+void CAmControlSenderBase::cbAckSetSourceNotificationConfiguration(const am_Handle_s handle, const am_Error_e error)
+{
+    (void) handle;
+    (void) error;
+}
+
+
+NsmErrorStatus_e CAmControlSenderBase::hookSystemLifecycleRequest(const uint32_t Request, const uint32_t RequestId)
+{
+    (void) Request;
+    (void) RequestId;
+    logInfo("CAmControlSenderBase::hookSystemLifecycleRequest request=",Request," requestID=",RequestId);
+    return (NsmErrorStatus_Error);
 }
 
-am_Error_e CAmControlSenderBase::hookSystemUpdateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s> listSoundProperties, const std::vector<am_ConnectionFormat_e> listConnectionFormats, std::vector<am_MainSoundProperty_s> listMainSoundProperties)
+am_Error_e CAmControlSenderBase::hookSystemUpdateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
 {
     (void) sinkID;
     (void) sinkClassID;
@@ -805,9 +820,9 @@ am_Error_e CAmControlSenderBase::hookSystemUpdateSink(const am_sinkID_t sinkID,
     (void) listConnectionFormats;
     (void) listSoundProperties;
     return (E_NOT_USED);
- }
+}
 
-am_Error_e CAmControlSenderBase::hookSystemUpdateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s> listSoundProperties, const std::vector<am_ConnectionFormat_e> listConnectionFormats, std::vector<am_MainSoundProperty_s> listMainSoundProperties)
+am_Error_e CAmControlSenderBase::hookSystemUpdateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)
 {
     (void) sourceID;
     (void) sourceClassID;
@@ -815,9 +830,9 @@ am_Error_e CAmControlSenderBase::hookSystemUpdateSource(const am_sourceID_t sour
     (void) listMainSoundProperties;
     (void) listConnectionFormats;
     return (E_NOT_USED);
- }
+}
 
-am_Error_e CAmControlSenderBase::hookSystemUpdateGateway(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e> listSourceConnectionFormats, const std::vector<am_ConnectionFormat_e> listSinkConnectionFormats, const std::vector<bool> convertionMatrix)
+am_Error_e CAmControlSenderBase::hookSystemUpdateGateway(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e>& listSourceConnectionFormats, const std::vector<am_ConnectionFormat_e>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix)
 {
     (void) gatewayID;
     (void) listSourceConnectionFormats;
@@ -826,57 +841,44 @@ am_Error_e CAmControlSenderBase::hookSystemUpdateGateway(const am_gatewayID_t ga
     return (E_NOT_USED);
 }
 
-void CAmControlSenderBase::cbAckSetVolume(const am_Handle_s handle, const std::vector<am_Volumes_s> listVolumes, const am_Error_e error)
+void CAmControlSenderBase::cbAckSetVolumes(const am_Handle_s handle, const std::vector<am_Volumes_s>& listVolumes, const am_Error_e error)
 {
     (void) handle;
     (void) listVolumes;
     (void) error;
 }
 
-void CAmControlSenderBase::cbAckSetSinkNotificationConfiguration(const am_Handle_s handle, const am_Error_e error)
-{
-    (void) handle;
-    (void) error;
-}
-
-void CAmControlSenderBase::cbAckSetSourceNotificationConfiguration(const am_Handle_s handle, const am_Error_e error)
-{
-    (void) handle;
-    (void) error;
-}
-
-void CAmControlSenderBase::hookSinkNotificationDataChanged(const am_sinkID_t sinkID, const am_NotificationPayload_s payload)
+void CAmControlSenderBase::hookSinkNotificationDataChanged(const am_sinkID_t sinkID, const am_NotificationPayload_s& payload)
 {
     (void) sinkID;
     (void) payload;
 }
 
-void CAmControlSenderBase::hookSourceNotificationDataChanged(const am_sourceID_t sourceID, const am_NotificationPayload_s payload)
+void CAmControlSenderBase::hookSourceNotificationDataChanged(const am_sourceID_t sourceID, const am_NotificationPayload_s& payload)
 {
     (void) sourceID;
     (void) payload;
 }
 
-am_Error_e CAmControlSenderBase::hookUserSetMainSinkNotificationConfiguration(const am_sinkID_t sinkID, const am_NotificationConfiguration_s notificationConfiguration)
+am_Error_e CAmControlSenderBase::hookUserSetMainSinkNotificationConfiguration(const am_sinkID_t sinkID, const am_NotificationConfiguration_s& notificationConfiguration)
 {
     (void) sinkID;
     (void) notificationConfiguration;
     return (E_NOT_USED);
 }
 
-am_Error_e CAmControlSenderBase::hookUserSetMainSourceNotificationConfiguration(const am_sourceID_t sourceID, const am_NotificationConfiguration_s notificationConfiguration)
+am_Error_e CAmControlSenderBase::hookUserSetMainSourceNotificationConfiguration(const am_sourceID_t sourceID, const am_NotificationConfiguration_s& notificationConfiguration)
 {
     (void) sourceID;
     (void) notificationConfiguration;
     return (E_NOT_USED);
 }
 
-NsmErrorStatus_e CAmControlSenderBase::hookSystemLifecycleRequest(const uint32_t Request, const uint32_t RequestId)
+void CAmControlSenderBase::hookSystemSessionStateChanged(const std::string& sessionName, const NsmSeat_e seatID, const NsmSessionState_e sessionStateID)
 {
-    (void) Request;
-    (void) RequestId;
-    logInfo("CAmControlSenderBase::hookSystemLifecycleRequest request=",Request," requestID=",RequestId);
-    return (NsmErrorStatus_Error);
+    (void) sessionName;
+    (void) seatID;
+    (void) sessionStateID;
 }
 
 void CAmControlSenderBase::callTAHandler()
diff --git a/PluginControlInterface/test/MockIAmControlReceive.h b/PluginControlInterface/test/MockIAmControlReceive.h
index b90574f..81e69da 100644
--- a/PluginControlInterface/test/MockIAmControlReceive.h
+++ b/PluginControlInterface/test/MockIAmControlReceive.h
@@ -170,44 +170,44 @@ class MockIAmControlReceive : public IAmControlReceive {
     MOCK_METHOD1(getSocketHandler,
         am_Error_e(CAmSocketHandler*& socketHandler));
     MOCK_METHOD5(changeSourceDB,
-        am_Error_e(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s> listSoundProperties, const std::vector<am_ConnectionFormat_e> listConnectionFormats, const std::vector<am_MainSoundProperty_s> listMainSoundProperties));
+        am_Error_e(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties));
     MOCK_METHOD5(changeSinkDB,
-        am_Error_e(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s> listSoundProperties, const std::vector<am_ConnectionFormat_e> listConnectionFormats, const std::vector<am_MainSoundProperty_s> listMainSoundProperties));
+        am_Error_e(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties));
     MOCK_METHOD4(changeGatewayDB,
-        am_Error_e(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e> listSourceConnectionFormats, const std::vector<am_ConnectionFormat_e> listSinkConnectionFormats, const std::vector<bool> convertionMatrix));
+        am_Error_e(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e>& listSourceConnectionFormats, const std::vector<am_ConnectionFormat_e>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix));
     MOCK_METHOD2(setVolumes,
-        am_Error_e(am_Handle_s& handle, const std::vector<am_Volumes_s> listVolumes));
+        am_Error_e(am_Handle_s& handle, const std::vector<am_Volumes_s>& listVolumes));
     MOCK_METHOD3(setSinkNotificationConfiguration,
-        am_Error_e(am_Handle_s& handle, const am_sinkID_t sinkID, const am_NotificationConfiguration_s notificationConfiguration));
+        am_Error_e(am_Handle_s& handle, const am_sinkID_t sinkID, const am_NotificationConfiguration_s& notificationConfiguration));
     MOCK_METHOD3(setSourceNotificationConfiguration,
-        am_Error_e(am_Handle_s& handle, const am_sourceID_t sourceID, const am_NotificationConfiguration_s norificationConfiguration));
-    MOCK_METHOD2(sendSinkMainNotificationPayload,
-        void(const am_sinkID_t sinkID, const am_NotificationPayload_s notificationPayload));
-    MOCK_METHOD2(sendSourceMainNotificationPayload,
-        void(const am_sourceID_t sourceID, const am_NotificationPayload_s notificationPayload));
+        am_Error_e(am_Handle_s& handle, const am_sourceID_t sourceID, const am_NotificationConfiguration_s& notificationConfiguration));
+    MOCK_METHOD2(sendMainSinkNotificationPayload,
+        void(const am_sinkID_t sinkID, const am_NotificationPayload_s& notificationPayload));
+    MOCK_METHOD2(sendMainSourceNotificationPayload,
+        void(const am_sourceID_t sourceID, const am_NotificationPayload_s& notificationPayload));
     MOCK_METHOD2(changeMainSinkNotificationConfigurationDB,
-        am_Error_e(const am_sinkID_t sinkID, const am_NotificationConfiguration_s mainNotificationConfiguration));
+        am_Error_e(const am_sinkID_t sinkID, const am_NotificationConfiguration_s& mainNotificationConfiguration));
     MOCK_METHOD2(changeMainSourceNotificationConfigurationDB,
-        am_Error_e(const am_sourceID_t sourceID, const am_NotificationConfiguration_s mainNotificationConfiguration));
-    MOCK_METHOD1(nsmGetRestartReasonProperty,
+        am_Error_e(const am_sourceID_t sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration));
+    MOCK_METHOD1(getRestartReasonPropertyNSM,
         am_Error_e(NsmRestartReason_e& restartReason));
-    MOCK_METHOD1(nsmGetShutdownReasonProperty,
+    MOCK_METHOD1(getShutdownReasonPropertyNSM,
         am_Error_e(NsmShutdownReason_e& ShutdownReason));
-    MOCK_METHOD1(nsmGetRunningReasonProperty,
+    MOCK_METHOD1(getRunningReasonPropertyNSM,
         am_Error_e(NsmRunningReason_e& nsmRunningReason));
-    MOCK_METHOD1(nsmGetNodeState,
+    MOCK_METHOD1(getNodeStateNSM,
         NsmErrorStatus_e(NsmNodeState_e& nsmNodeState));
-    MOCK_METHOD3(nsmGetSessionState,
-        NsmErrorStatus_e(const std::string& sessionName, const NsmSeat_e& seatID, NsmSessionState_e& sessionState));
-    MOCK_METHOD1(nsmGetApplicationMode,
+    MOCK_METHOD3(getSessionStateNSM,
+        NsmErrorStatus_e(const std::string& sessionName, const NsmSeat_e seatID, NsmSessionState_e& sessionState));
+    MOCK_METHOD1(getApplicationModeNSM,
         NsmErrorStatus_e(NsmApplicationMode_e& applicationMode));
-    MOCK_METHOD2(nsmRegisterShutdownClient,
+    MOCK_METHOD2(registerShutdownClientNSM,
         NsmErrorStatus_e(const uint32_t shutdownMode, const uint32_t timeoutMs));
-    MOCK_METHOD1(nsmUnRegisterShutdownClient,
+    MOCK_METHOD1(unRegisterShutdownClientNSM,
         NsmErrorStatus_e(const uint32_t shutdownMode));
-    MOCK_METHOD1(nsmGetInterfaceVersion,
+    MOCK_METHOD1(getInterfaceVersionNSM,
         am_Error_e(uint32_t& version));
-    MOCK_METHOD2(nsmSendLifecycleRequestComplete,
+    MOCK_METHOD2(sendLifecycleRequestCompleteNSM,
         NsmErrorStatus_e(const uint32_t RequestId, const NsmErrorStatus_e status));
 
 };