From 3a1086516a5edf30b3bad6a2e138b03bc0479005 Mon Sep 17 00:00:00 2001 From: Christian Linke Date: Thu, 17 Jan 2013 12:47:00 +0100 Subject: * changes that follow the review comments from Thomas G. Signed-off-by: Christian Linke --- .../src/CAmControlSenderBase.cpp | 64 +++++++++++----------- 1 file changed, 33 insertions(+), 31 deletions(-) (limited to 'PluginControlInterface/src') 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 listSoundProperties, const std::vector listConnectionFormats, std::vector listMainSoundProperties) +am_Error_e CAmControlSenderBase::hookSystemUpdateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& 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 listSoundProperties, const std::vector listConnectionFormats, std::vector listMainSoundProperties) +am_Error_e CAmControlSenderBase::hookSystemUpdateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& 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 listSourceConnectionFormats, const std::vector listSinkConnectionFormats, const std::vector convertionMatrix) +am_Error_e CAmControlSenderBase::hookSystemUpdateGateway(const am_gatewayID_t gatewayID, const std::vector& listSourceConnectionFormats, const std::vector& listSinkConnectionFormats, const std::vector& 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 listVolumes, const am_Error_e error) +void CAmControlSenderBase::cbAckSetVolumes(const am_Handle_s handle, const std::vector& 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() -- cgit v1.2.1