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 --- AudioManagerDaemon/include/CAmCommandReceiver.h | 8 +- AudioManagerDaemon/include/CAmCommandSender.h | 8 +- AudioManagerDaemon/include/CAmControlReceiver.h | 40 ++--- AudioManagerDaemon/include/CAmControlSender.h | 18 +-- AudioManagerDaemon/include/CAmDatabaseHandler.h | 10 +- AudioManagerDaemon/include/CAmRoutingReceiver.h | 14 +- AudioManagerDaemon/src/CAmCommandReceiver.cpp | 16 +- AudioManagerDaemon/src/CAmCommandSender.cpp | 12 +- AudioManagerDaemon/src/CAmControlReceiver.cpp | 57 ++++--- AudioManagerDaemon/src/CAmControlSender.cpp | 20 +-- AudioManagerDaemon/src/CAmDatabaseHandler.cpp | 176 ++++++++++----------- AudioManagerDaemon/src/CAmRoutingReceiver.cpp | 64 ++++---- .../CAmDatabaseHandlerTest.cpp | 138 ++++++++-------- AudioManagerDaemon/test/CAmCommonFunctions.cpp | 14 +- AudioManagerDaemon/test/MockIAmCommandSend.h | 109 ++++++------- AudioManagerDaemon/test/MockIAmControlSend.h | 20 +-- .../include/CAmCommandSenderDbus.h | 8 +- .../include/CAmDbusMessageHandler.h | 2 +- .../include/CommandInterface.xml | 8 +- .../src/CAmCommandSenderDbus.cpp | 8 +- .../src/CAmDbusMessageHandler.cpp | 24 +-- .../src/IAmCommandReceiverShadow.cpp | 20 +-- .../test/MockIAmCommandReceive.h | 13 +- .../include/CAmControlSenderBase.h | 19 ++- .../src/CAmControlSenderBase.cpp | 64 ++++---- .../test/MockIAmControlReceive.h | 46 +++--- .../test/MockIAmRoutingReceive.h | 12 +- .../src/CAmDbusMessageHandler.cpp | 6 +- exampleCode/player/audiomanagertypes.h | 4 +- exampleCode/player/dbushandler.cpp | 4 +- include/audiomanagertypes.h | 128 +++++++-------- include/command/IAmCommandReceive.h | 22 +-- include/command/IAmCommandSend.h | 18 +-- include/control/IAmControlReceive.h | 52 +++--- include/control/IAmControlSend.h | 32 ++-- include/routing/IAmRoutingReceive.h | 22 +-- include/routing/IAmRoutingSend.h | 10 +- 37 files changed, 626 insertions(+), 620 deletions(-) mode change 100644 => 100755 include/audiomanagertypes.h diff --git a/AudioManagerDaemon/include/CAmCommandReceiver.h b/AudioManagerDaemon/include/CAmCommandReceiver.h index 8d5b4a6..8f9aa06 100644 --- a/AudioManagerDaemon/include/CAmCommandReceiver.h +++ b/AudioManagerDaemon/include/CAmCommandReceiver.h @@ -63,10 +63,10 @@ public: void confirmCommandReady(const uint16_t handle, const am_Error_e error); void confirmCommandRundown(const uint16_t handle, const am_Error_e error); void getInterfaceVersion(std::string& version) const; - am_Error_e getListSinkMainNotificationConfigurations(const am_sinkID_t sinkID, std::vector& listMainNotificationConfigurations) const; - am_Error_e getListSourceMainNotificationConfigurations(const am_sourceID_t sourceID, std::vector& listMainNotificationConfigurations) const; - am_Error_e setSinkMainNotificationConfiguration(const am_sinkID_t sinkID, const am_NotificationConfiguration_s mainNotificationConfiguration); - am_Error_e setSourceMainNotificationConfiguration(const am_sourceID_t sourceID, const am_NotificationConfiguration_s mainNotificationConfiguration); + am_Error_e getListMainSinkNotificationConfigurations(const am_sinkID_t sinkID, std::vector& listMainNotificationConfigurations) const ; + am_Error_e getListMainSourceNotificationConfigurations(const am_sourceID_t sourceID, std::vector& listMainNotificationConfigurations) const ; + am_Error_e setMainSinkNotificationConfiguration(const am_sinkID_t sinkID, const am_NotificationConfiguration_s& mainNotificationConfiguration) ; + am_Error_e setMainSourceNotificationConfiguration(const am_sourceID_t sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration) ; uint16_t getStartupHandle(); //!< returns a startup handle uint16_t getRundownHandle(); //!< returns a rundown handle diff --git a/AudioManagerDaemon/include/CAmCommandSender.h b/AudioManagerDaemon/include/CAmCommandSender.h index cf41b77..d7cc84c 100644 --- a/AudioManagerDaemon/include/CAmCommandSender.h +++ b/AudioManagerDaemon/include/CAmCommandSender.h @@ -67,10 +67,10 @@ public: am_Error_e getListPlugins(std::vector& interfaces) const; void cbSinkUpdated(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector& listMainSoundProperties); void cbSourceUpdated(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector& listMainSoundProperties); - void cbSinkNotification(const am_sinkID_t sinkID, const am_NotificationPayload_s notification); - void cbSourceNotification(const am_sourceID_t sourceID, const am_NotificationPayload_s notification); - void cbSinkMainNotificationConfigurationChanged(const am_sinkID_t sinkID, const am_NotificationConfiguration_s mainNotificationConfiguration); - void cbSourceMainNotificationConfigurationChanged(const am_sourceID_t sourceID, const am_NotificationConfiguration_s mainNotificationConfiguration); + void cbSinkNotification(const am_sinkID_t sinkID, const am_NotificationPayload_s& notification); + void cbSourceNotification(const am_sourceID_t sourceID, const am_NotificationPayload_s& notification); + void cbSinkMainNotificationConfigurationChanged(const am_sinkID_t sinkID, const am_NotificationConfiguration_s& mainNotificationConfiguration); + void cbSourceMainNotificationConfigurationChanged(const am_sourceID_t sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration); #ifdef UNIT_TEST friend class IAmCommandBackdoor; //this is to get access to the loaded plugins and be able to exchange the interfaces diff --git a/AudioManagerDaemon/include/CAmControlReceiver.h b/AudioManagerDaemon/include/CAmControlReceiver.h index a7b2554..11e295d 100644 --- a/AudioManagerDaemon/include/CAmControlReceiver.h +++ b/AudioManagerDaemon/include/CAmControlReceiver.h @@ -115,26 +115,26 @@ public: void confirmControllerRundown(const am_Error_e error); am_Error_e getSocketHandler(CAmSocketHandler*& socketHandler); void getInterfaceVersion(std::string& version) const; - am_Error_e changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector listSoundProperties, const std::vector listConnectionFormats, const std::vector listMainSoundProperties); - am_Error_e changeSinkDB(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector listSoundProperties, const std::vector listConnectionFormats, const std::vector listMainSoundProperties); - am_Error_e changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector listSourceConnectionFormats, const std::vector listSinkConnectionFormats, const std::vector convertionMatrix); - am_Error_e setVolumes(am_Handle_s& handle, const std::vector listVolumes); - am_Error_e setSinkNotificationConfiguration(am_Handle_s& handle, const am_sinkID_t sinkID, const am_NotificationConfiguration_s notificationConfiguration); - am_Error_e setSourceNotificationConfiguration(am_Handle_s& handle, const am_sourceID_t sourceID, const am_NotificationConfiguration_s norificationConfiguration); - void sendSinkMainNotificationPayload(const am_sinkID_t sinkID, const am_NotificationPayload_s notificationPayload); - void sendSourceMainNotificationPayload(const am_sourceID_t sourceID, const am_NotificationPayload_s notificationPayload); - am_Error_e changeMainSinkNotificationConfigurationDB(const am_sinkID_t sinkID, const am_NotificationConfiguration_s mainNotificationConfiguration); - am_Error_e changeMainSourceNotificationConfigurationDB(const am_sourceID_t sourceID, const am_NotificationConfiguration_s mainNotificationConfiguration); - am_Error_e nsmGetRestartReasonProperty(NsmRestartReason_e& restartReason) ; - am_Error_e nsmGetShutdownReasonProperty(NsmShutdownReason_e& ShutdownReason) ; - am_Error_e nsmGetRunningReasonProperty(NsmRunningReason_e& nsmRunningReason) ; - NsmErrorStatus_e nsmGetNodeState(NsmNodeState_e& nsmNodeState) ; - NsmErrorStatus_e nsmGetSessionState(const std::string& sessionName, const NsmSeat_e& seatID, NsmSessionState_e& sessionState) ; - NsmErrorStatus_e nsmGetApplicationMode(NsmApplicationMode_e& applicationMode) ; - NsmErrorStatus_e nsmRegisterShutdownClient(const uint32_t shutdownMode, const uint32_t timeoutMs) ; - NsmErrorStatus_e nsmUnRegisterShutdownClient(const uint32_t shutdownMode) ; - am_Error_e nsmGetInterfaceVersion(uint32_t& version) ; - NsmErrorStatus_e nsmSendLifecycleRequestComplete(const uint32_t RequestId, const NsmErrorStatus_e status) ; + am_Error_e changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties) ; + am_Error_e changeSinkDB(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties) ; + am_Error_e changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector& listSourceConnectionFormats, const std::vector& listSinkConnectionFormats, const std::vector& convertionMatrix) ; + am_Error_e setVolumes(am_Handle_s& handle, const std::vector& listVolumes) ; + am_Error_e setSinkNotificationConfiguration(am_Handle_s& handle, const am_sinkID_t sinkID, const am_NotificationConfiguration_s& notificationConfiguration) ; + am_Error_e setSourceNotificationConfiguration(am_Handle_s& handle, const am_sourceID_t sourceID, const am_NotificationConfiguration_s& notificationConfiguration) ; + void sendMainSinkNotificationPayload(const am_sinkID_t sinkID, const am_NotificationPayload_s& notificationPayload) ; + void sendMainSourceNotificationPayload(const am_sourceID_t sourceID, const am_NotificationPayload_s& notificationPayload) ; + am_Error_e changeMainSinkNotificationConfigurationDB(const am_sinkID_t sinkID, const am_NotificationConfiguration_s& mainNotificationConfiguration) ; + am_Error_e changeMainSourceNotificationConfigurationDB(const am_sourceID_t sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration) ; + am_Error_e getRestartReasonPropertyNSM(NsmRestartReason_e& restartReason) ; + am_Error_e getShutdownReasonPropertyNSM(NsmShutdownReason_e& ShutdownReason) ; + am_Error_e getRunningReasonPropertyNSM(NsmRunningReason_e& nsmRunningReason) ; + NsmErrorStatus_e getNodeStateNSM(NsmNodeState_e& nsmNodeState) ; + NsmErrorStatus_e getSessionStateNSM(const std::string& sessionName, const NsmSeat_e seatID, NsmSessionState_e& sessionState) ; + NsmErrorStatus_e getApplicationModeNSM(NsmApplicationMode_e& applicationMode) ; + NsmErrorStatus_e registerShutdownClientNSM(const uint32_t shutdownMode, const uint32_t timeoutMs) ; + NsmErrorStatus_e unRegisterShutdownClientNSM(const uint32_t shutdownMode) ; + am_Error_e getInterfaceVersionNSM(uint32_t& version) ; + NsmErrorStatus_e sendLifecycleRequestCompleteNSM(const uint32_t RequestId, const NsmErrorStatus_e status) ; private: CAmDatabaseHandler* mDatabaseHandler; //!< pointer tto the databasehandler diff --git a/AudioManagerDaemon/include/CAmControlSender.h b/AudioManagerDaemon/include/CAmControlSender.h index c62c7e8..ac03626 100644 --- a/AudioManagerDaemon/include/CAmControlSender.h +++ b/AudioManagerDaemon/include/CAmControlSender.h @@ -88,19 +88,19 @@ public: void confirmCommandRundown(const am_Error_e error) ; void confirmRoutingRundown(const am_Error_e error) ; void getInterfaceVersion(std::string& version) const ; - am_Error_e 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 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 hookSystemUpdateGateway(const am_gatewayID_t gatewayID, const std::vector listSourceConnectionFormats, const std::vector listSinkConnectionFromats, const std::vector convertionMatrix) ; - void cbAckSetVolume(const am_Handle_s handle, const std::vector listVolumes, const am_Error_e error) ; + am_Error_e hookSystemUpdateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties) ; + am_Error_e hookSystemUpdateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties) ; + am_Error_e hookSystemUpdateGateway(const am_gatewayID_t gatewayID, const std::vector& listSourceConnectionFormats, const std::vector& listSinkConnectionFromats, const std::vector& convertionMatrix) ; + void cbAckSetVolume(const am_Handle_s handle, const std::vector& 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) ; void receiverCallback(const pollfd pollfd, const sh_pollHandle_t handle, void* userData); diff --git a/AudioManagerDaemon/include/CAmDatabaseHandler.h b/AudioManagerDaemon/include/CAmDatabaseHandler.h index 50a5bc7..4341c01 100644 --- a/AudioManagerDaemon/include/CAmDatabaseHandler.h +++ b/AudioManagerDaemon/include/CAmDatabaseHandler.h @@ -136,13 +136,13 @@ public: am_Error_e peekSource(const std::string& name, am_sourceID_t& sourceID); am_Error_e peekSinkClassID(const std::string& name, am_sinkClass_t& sinkClassID); am_Error_e peekSourceClassID(const std::string& name, am_sourceClass_t& sourceClassID); - am_Error_e changeSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector listSoundProperties, const std::vector listConnectionFormats, const std::vector listMainSoundProperties); - am_Error_e changeSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector listSoundProperties, const std::vector listConnectionFormats, const std::vector listMainSoundProperties); - am_Error_e getListSinkMainNotificationConfigurations(const am_sinkID_t sinkID, std::vector& listMainNotificationConfigurations); - am_Error_e getListSourceMainNotificationConfigurations(const am_sourceID_t sourceID, std::vector& listMainNotificationConfigurations); + am_Error_e changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties); + am_Error_e changeSinkDB(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties); + am_Error_e getListMainSinkNotificationConfigurations(const am_sinkID_t sinkID, std::vector& listMainNotificationConfigurations); + am_Error_e getListMainSourceNotificationConfigurations(const am_sourceID_t sourceID, std::vector& listMainNotificationConfigurations); am_Error_e changeMainSinkNotificationConfigurationDB(const am_sinkID_t sinkID, const am_NotificationConfiguration_s mainNotificationConfiguration); am_Error_e changeMainSourceNotificationConfigurationDB(const am_sourceID_t sourceID, const am_NotificationConfiguration_s mainNotificationConfiguration); - am_Error_e changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector listSourceConnectionFormats, const std::vector listSinkConnectionFormats, const std::vector convertionMatrix); + am_Error_e changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector& listSourceConnectionFormats, const std::vector& listSinkConnectionFormats, const std::vector& convertionMatrix); am_Error_e changeSinkNotificationConfigurationDB(const am_sinkID_t sinkID,const am_NotificationConfiguration_s notificationConfiguration); am_Error_e changeSourceNotificationConfigurationDB(const am_sourceID_t sourceID,const am_NotificationConfiguration_s notificationConfiguration); diff --git a/AudioManagerDaemon/include/CAmRoutingReceiver.h b/AudioManagerDaemon/include/CAmRoutingReceiver.h index 3cb1225..dbb90a4 100644 --- a/AudioManagerDaemon/include/CAmRoutingReceiver.h +++ b/AudioManagerDaemon/include/CAmRoutingReceiver.h @@ -81,14 +81,14 @@ public: void getInterfaceVersion(std::string& version) const; void confirmRoutingReady(const uint16_t handle, const am_Error_e error); void confirmRoutingRundown(const uint16_t handle, const am_Error_e error); - am_Error_e updateGateway(const am_gatewayID_t gatewayID, std::vector listSourceFormats, const std::vector listSinkFormats, std::vector convertionMatrix); - am_Error_e updateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector listSoundProperties, const std::vector listConnectionFormats, std::vector listMainSoundProperties); - am_Error_e updateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, std::vector listSoundProperties, std::vector listConnectionFormats, const std::vector listMainSoundProperties); - void ackSetVolumes(const am_Handle_s handle, const std::vector listvolumes, const am_Error_e error); - void ackSinkNotificationConfiguration(const am_Handle_s handle, const am_Error_e error); + am_Error_e updateGateway(const am_gatewayID_t gatewayID, const std::vector& listSourceFormats, const std::vector& listSinkFormats, const std::vector& convertionMatrix) ; + am_Error_e updateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties) ; + am_Error_e updateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties) ; + void ackSetVolumes(const am_Handle_s handle, const std::vector& listvolumes, const am_Error_e error) ; + void ackSinkNotificationConfiguration(const am_Handle_s handle, const am_Error_e error) ; void ackSourceNotificationConfiguration(const am_Handle_s handle, const am_Error_e error) ; - void hookSinkNotificationDataChange(const am_sinkID_t sinkID, const am_NotificationPayload_s payload) ; - void hookSourceNotificationDataChange(const am_sourceID_t sourceID, const am_NotificationPayload_s payload) ; + void hookSinkNotificationDataChange(const am_sinkID_t sinkID, const am_NotificationPayload_s& payload) ; + void hookSourceNotificationDataChange(const am_sourceID_t sourceID, const am_NotificationPayload_s& payload) ; uint16_t getStartupHandle(); //!< returns a startup handle uint16_t getRundownHandle(); //!< returns a rundown handle diff --git a/AudioManagerDaemon/src/CAmCommandReceiver.cpp b/AudioManagerDaemon/src/CAmCommandReceiver.cpp index fcb2e14..486693f 100644 --- a/AudioManagerDaemon/src/CAmCommandReceiver.cpp +++ b/AudioManagerDaemon/src/CAmCommandReceiver.cpp @@ -226,25 +226,25 @@ void CAmCommandReceiver::waitOnStartup(bool startup) mLastErrorStartup=E_OK; } -am_Error_e CAmCommandReceiver::getListSinkMainNotificationConfigurations(const am_sinkID_t sinkID, std::vector& listMainNotificationConfigurations) const +am_Error_e CAmCommandReceiver::getListMainSinkNotificationConfigurations(const am_sinkID_t sinkID, std::vector& listMainNotificationConfigurations) const { - return (mDatabaseHandler->getListSinkMainNotificationConfigurations(sinkID,listMainNotificationConfigurations)); + return (mDatabaseHandler->getListMainSinkNotificationConfigurations(sinkID,listMainNotificationConfigurations)); } -am_Error_e CAmCommandReceiver::getListSourceMainNotificationConfigurations(const am_sourceID_t sourceID, std::vector& listMainNotificationConfigurations) const +am_Error_e CAmCommandReceiver::getListMainSourceNotificationConfigurations(const am_sourceID_t sourceID, std::vector& listMainNotificationConfigurations) const { - return (mDatabaseHandler->getListSourceMainNotificationConfigurations(sourceID,listMainNotificationConfigurations)); + return (mDatabaseHandler->getListMainSourceNotificationConfigurations(sourceID,listMainNotificationConfigurations)); } -am_Error_e CAmCommandReceiver::setSinkMainNotificationConfiguration(const am_sinkID_t sinkID, const am_NotificationConfiguration_s mainNotificationConfiguration) +am_Error_e CAmCommandReceiver::setMainSinkNotificationConfiguration(const am_sinkID_t sinkID, const am_NotificationConfiguration_s& mainNotificationConfiguration) { - logInfo("CommandReceiver::setSinkMainNotificationConfiguration got called, sinkID=", sinkID, " notificationType=",mainNotificationConfiguration.notificationType, " parameter=", mainNotificationConfiguration.notificationParameter, "status=",mainNotificationConfiguration.notificationStatus); + logInfo("CommandReceiver::setMainSinkNotificationConfiguration got called, sinkID=", sinkID, " type=",mainNotificationConfiguration.type, " parameter=", mainNotificationConfiguration.parameter, "status=",mainNotificationConfiguration.status); return (mControlSender->hookUserSetMainSinkNotificationConfiguration(sinkID,mainNotificationConfiguration)); } -am_Error_e CAmCommandReceiver::setSourceMainNotificationConfiguration(const am_sourceID_t sourceID, const am_NotificationConfiguration_s mainNotificationConfiguration) +am_Error_e CAmCommandReceiver::setMainSourceNotificationConfiguration(const am_sourceID_t sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration) { - logInfo("CommandReceiver::setSourceMainNotificationConfiguration got called, sourceID=", sourceID, " notificationType=",mainNotificationConfiguration.notificationType, " parameter=", mainNotificationConfiguration.notificationParameter, "status=",mainNotificationConfiguration.notificationStatus); + logInfo("CommandReceiver::setMainSourceNotificationConfiguration got called, sourceID=", sourceID, " type=",mainNotificationConfiguration.type, " parameter=", mainNotificationConfiguration.parameter, "status=",mainNotificationConfiguration.status); return (mControlSender->hookUserSetMainSourceNotificationConfiguration(sourceID,mainNotificationConfiguration)); } diff --git a/AudioManagerDaemon/src/CAmCommandSender.cpp b/AudioManagerDaemon/src/CAmCommandSender.cpp index 7ec2740..a03e5a8 100644 --- a/AudioManagerDaemon/src/CAmCommandSender.cpp +++ b/AudioManagerDaemon/src/CAmCommandSender.cpp @@ -307,24 +307,24 @@ void CAmCommandSender::cbSourceUpdated(const am_sourceID_t sourceID, const am_so CALL_ALL_INTERFACES(cbSourceUpdated(sourceID,sourceClassID,listMainSoundProperties)); } -void CAmCommandSender::cbSinkNotification(const am_sinkID_t sinkID, const am_NotificationPayload_s notification) +void CAmCommandSender::cbSinkNotification(const am_sinkID_t sinkID, const am_NotificationPayload_s& notification) { CALL_ALL_INTERFACES(cbSinkNotification(sinkID,notification)); } -void CAmCommandSender::cbSourceNotification(const am_sourceID_t sourceID, const am_NotificationPayload_s notification) +void CAmCommandSender::cbSourceNotification(const am_sourceID_t sourceID, const am_NotificationPayload_s& notification) { CALL_ALL_INTERFACES(cbSourceNotification(sourceID,notification)); } -void CAmCommandSender::cbSinkMainNotificationConfigurationChanged(const am_sinkID_t sinkID, const am_NotificationConfiguration_s mainNotificationConfiguration) +void CAmCommandSender::cbSinkMainNotificationConfigurationChanged(const am_sinkID_t sinkID, const am_NotificationConfiguration_s& mainNotificationConfiguration) { - CALL_ALL_INTERFACES(cbSinkMainNotificationConfigurationChanged(sinkID,mainNotificationConfiguration)); + CALL_ALL_INTERFACES(cbMainSinkNotificationConfigurationChanged(sinkID,mainNotificationConfiguration)); } -void CAmCommandSender::cbSourceMainNotificationConfigurationChanged(const am_sourceID_t sourceID, const am_NotificationConfiguration_s mainNotificationConfiguration) +void CAmCommandSender::cbSourceMainNotificationConfigurationChanged(const am_sourceID_t sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration) { - CALL_ALL_INTERFACES(cbSourceMainNotificationConfigurationChanged(sourceID,mainNotificationConfiguration)); + CALL_ALL_INTERFACES(cbMainSourceNotificationConfigurationChanged(sourceID,mainNotificationConfiguration)); } void CAmCommandSender::unloadLibraries(void) diff --git a/AudioManagerDaemon/src/CAmControlReceiver.cpp b/AudioManagerDaemon/src/CAmControlReceiver.cpp index 86c6399..2867305 100644 --- a/AudioManagerDaemon/src/CAmControlReceiver.cpp +++ b/AudioManagerDaemon/src/CAmControlReceiver.cpp @@ -544,67 +544,67 @@ void CAmControlReceiver::getInterfaceVersion(std::string & version) const version = ControlReceiveVersion; } -am_Error_e CAmControlReceiver::changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector listSoundProperties, const std::vector listConnectionFormats, const std::vector listMainSoundProperties) +am_Error_e CAmControlReceiver::changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties) { - logInfo("CAmControlReceiver::changeSource was called, sourceID", sourceID); - return (mDatabaseHandler->changeSource(sourceID,sourceClassID,listSoundProperties,listConnectionFormats,listMainSoundProperties)); + logInfo("CAmControlReceiver::changeSourceDB was called, sourceID", sourceID); + return (mDatabaseHandler->changeSourceDB(sourceID,sourceClassID,listSoundProperties,listConnectionFormats,listMainSoundProperties)); } -am_Error_e CAmControlReceiver::changeSinkDB(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector listSoundProperties, const std::vector listConnectionFormats, const std::vector listMainSoundProperties) +am_Error_e CAmControlReceiver::changeSinkDB(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties) { - logInfo("CAmControlReceiver::changeSink was called with sinkID", sinkID); - return (mDatabaseHandler->changeSink(sinkID,sinkClassID,listSoundProperties,listConnectionFormats,listMainSoundProperties)); + logInfo("CAmControlReceiver::changeSinkDB was called with sinkID", sinkID); + return (mDatabaseHandler->changeSinkDB(sinkID,sinkClassID,listSoundProperties,listConnectionFormats,listMainSoundProperties)); } -am_Error_e CAmControlReceiver::changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector listSourceConnectionFormats, const std::vector listSinkConnectionFormats, const std::vector convertionMatrix) +am_Error_e CAmControlReceiver::changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector& listSourceConnectionFormats, const std::vector& listSinkConnectionFormats, const std::vector& convertionMatrix) { logInfo("CAmControlReceiver::changeGatewayDB was called with gatewayID", gatewayID); return (mDatabaseHandler->changeGatewayDB(gatewayID,listSourceConnectionFormats,listSinkConnectionFormats,convertionMatrix)); } -am_Error_e CAmControlReceiver::setVolumes(am_Handle_s& handle, const std::vector listVolumes) +am_Error_e CAmControlReceiver::setVolumes(am_Handle_s& handle, const std::vector& listVolumes) { logInfo("CAmControlReceiver::setVolumes got called"); return (mRoutingSender->asyncSetVolumes(handle,listVolumes)); } -am_Error_e CAmControlReceiver::setSinkNotificationConfiguration(am_Handle_s& handle, const am_sinkID_t sinkID, const am_NotificationConfiguration_s notificationConfiguration) +am_Error_e CAmControlReceiver::setSinkNotificationConfiguration(am_Handle_s& handle, const am_sinkID_t sinkID, const am_NotificationConfiguration_s& notificationConfiguration) { - logInfo("CAmControlReceiver::setSinkNotificationConfiguration called, sinkID=",sinkID,"notificationConfiguration.notificationType=",notificationConfiguration.notificationType,"notificationConfiguration.notificationStatus",notificationConfiguration.notificationStatus,"notificationConfiguration.notificationParameter",notificationConfiguration.notificationParameter); + logInfo("CAmControlReceiver::setSinkNotificationConfiguration called, sinkID=",sinkID,"notificationConfiguration.type=",notificationConfiguration.type,"notificationConfiguration.status",notificationConfiguration.status,"notificationConfiguration.parameter",notificationConfiguration.parameter); return (mRoutingSender->asyncSetSinkNotificationConfiguration(handle,sinkID,notificationConfiguration)); } -am_Error_e CAmControlReceiver::setSourceNotificationConfiguration(am_Handle_s& handle, const am_sourceID_t sourceID, const am_NotificationConfiguration_s notificationConfiguration) +am_Error_e CAmControlReceiver::setSourceNotificationConfiguration(am_Handle_s& handle, const am_sourceID_t sourceID, const am_NotificationConfiguration_s& notificationConfiguration) { - logInfo("CAmControlReceiver::setSourceNotificationConfiguration called, sourceID=",sourceID,"notificationConfiguration.notificationType=",notificationConfiguration.notificationType,"notificationConfiguration.notificationStatus",notificationConfiguration.notificationStatus,"notificationConfiguration.notificationParameter",notificationConfiguration.notificationParameter); + logInfo("CAmControlReceiver::setSourceNotificationConfiguration called, sourceID=",sourceID,"notificationConfiguration.type=",notificationConfiguration.type,"notificationConfiguration.status",notificationConfiguration.status,"notificationConfiguration.parameter",notificationConfiguration.parameter); return (mRoutingSender->asyncSetSourceNotificationConfiguration(handle,sourceID,notificationConfiguration)); } -void CAmControlReceiver::sendSinkMainNotificationPayload(const am_sinkID_t sinkID, const am_NotificationPayload_s notificationPayload) +void CAmControlReceiver::sendMainSinkNotificationPayload(const am_sinkID_t sinkID, const am_NotificationPayload_s& notificationPayload) { - logInfo("CAmControlReceiver::sendSinkMainNotificationPayload called, sinkID=",sinkID,"type=",notificationPayload.notificationType,"value=",notificationPayload.notificationValue); + logInfo("CAmControlReceiver::sendSinkMainNotificationPayload called, sinkID=",sinkID,"type=",notificationPayload.type,"value=",notificationPayload.value); mCommandSender->cbSinkNotification(sinkID,notificationPayload); } -void CAmControlReceiver::sendSourceMainNotificationPayload(const am_sourceID_t sourceID, const am_NotificationPayload_s notificationPayload) +void CAmControlReceiver::sendMainSourceNotificationPayload(const am_sourceID_t sourceID, const am_NotificationPayload_s& notificationPayload) { - logInfo("CAmControlReceiver::sendSourceMainNotificationPayload called, sourceID=",sourceID,"type=",notificationPayload.notificationType,"value=",notificationPayload.notificationValue); + logInfo("CAmControlReceiver::sendSourceMainNotificationPayload called, sourceID=",sourceID,"type=",notificationPayload.type,"value=",notificationPayload.value); mCommandSender->cbSourceNotification(sourceID,notificationPayload); } -am_Error_e CAmControlReceiver::changeMainSinkNotificationConfigurationDB(const am_sinkID_t sinkID, const am_NotificationConfiguration_s mainNotificationConfiguration) +am_Error_e CAmControlReceiver::changeMainSinkNotificationConfigurationDB(const am_sinkID_t sinkID, const am_NotificationConfiguration_s& mainNotificationConfiguration) { logInfo("CAmControlReceiver::changeMainSinkNotificationConfigurationDB was called with sinkID", sinkID); return (mDatabaseHandler->changeMainSinkNotificationConfigurationDB(sinkID,mainNotificationConfiguration)); } -am_Error_e CAmControlReceiver::changeMainSourceNotificationConfigurationDB(const am_sourceID_t sourceID, const am_NotificationConfiguration_s mainNotificationConfiguration) +am_Error_e CAmControlReceiver::changeMainSourceNotificationConfigurationDB(const am_sourceID_t sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration) { logInfo("CAmControlReceiver::changeMainSourceNotificationConfigurationDB was called with sourceID", sourceID); return (mDatabaseHandler->changeMainSourceNotificationConfigurationDB(sourceID,mainNotificationConfiguration)); } -am_Error_e CAmControlReceiver::nsmGetRestartReasonProperty(NsmRestartReason_e& restartReason) +am_Error_e CAmControlReceiver::getRestartReasonPropertyNSM(NsmRestartReason_e& restartReason) { if (!mNodeStateCommunicator) return (E_NON_EXISTENT); @@ -616,7 +616,7 @@ am_Error_e CAmControlReceiver::nsmGetRestartReasonProperty(NsmRestartReason_e& r #endif } -am_Error_e CAmControlReceiver::nsmGetShutdownReasonProperty(NsmShutdownReason_e& ShutdownReason) +am_Error_e CAmControlReceiver::getShutdownReasonPropertyNSM(NsmShutdownReason_e& ShutdownReason) { if (!mNodeStateCommunicator) return (E_NON_EXISTENT); @@ -629,7 +629,7 @@ am_Error_e CAmControlReceiver::nsmGetShutdownReasonProperty(NsmShutdownReason_e& } -am_Error_e CAmControlReceiver::nsmGetRunningReasonProperty(NsmRunningReason_e& nsmRunningReason) +am_Error_e CAmControlReceiver::getRunningReasonPropertyNSM(NsmRunningReason_e& nsmRunningReason) { if (!mNodeStateCommunicator) return (E_NON_EXISTENT); @@ -642,7 +642,7 @@ am_Error_e CAmControlReceiver::nsmGetRunningReasonProperty(NsmRunningReason_e& n } -NsmErrorStatus_e CAmControlReceiver::nsmGetNodeState(NsmNodeState_e& nsmNodeState) +NsmErrorStatus_e CAmControlReceiver::getNodeStateNSM(NsmNodeState_e& nsmNodeState) { if (!mNodeStateCommunicator) return (NsmErrorStatus_Error); @@ -652,10 +652,9 @@ NsmErrorStatus_e CAmControlReceiver::nsmGetNodeState(NsmNodeState_e& nsmNodeStat (void) nsmNodeState; return (NsmErrorStatus_Error); #endif - } -NsmErrorStatus_e CAmControlReceiver::nsmGetSessionState(const std::string& sessionName, const NsmSeat_e& seatID, NsmSessionState_e& sessionState) +NsmErrorStatus_e CAmControlReceiver::getSessionStateNSM(const std::string& sessionName, const NsmSeat_e seatID, NsmSessionState_e& sessionState) { if (!mNodeStateCommunicator) return (NsmErrorStatus_Error); @@ -670,7 +669,7 @@ NsmErrorStatus_e CAmControlReceiver::nsmGetSessionState(const std::string& sessi } -NsmErrorStatus_e CAmControlReceiver::nsmGetApplicationMode(NsmApplicationMode_e& applicationMode) +NsmErrorStatus_e CAmControlReceiver::getApplicationModeNSM(NsmApplicationMode_e& applicationMode) { if (!mNodeStateCommunicator) return (NsmErrorStatus_Error); @@ -683,7 +682,7 @@ NsmErrorStatus_e CAmControlReceiver::nsmGetApplicationMode(NsmApplicationMode_e& } -NsmErrorStatus_e CAmControlReceiver::nsmRegisterShutdownClient(const uint32_t shutdownMode, const uint32_t timeoutMs) +NsmErrorStatus_e CAmControlReceiver::registerShutdownClientNSM(const uint32_t shutdownMode, const uint32_t timeoutMs) { if (!mNodeStateCommunicator) return (NsmErrorStatus_Error); @@ -697,7 +696,7 @@ NsmErrorStatus_e CAmControlReceiver::nsmRegisterShutdownClient(const uint32_t sh } -NsmErrorStatus_e CAmControlReceiver::nsmUnRegisterShutdownClient(const uint32_t shutdownMode) +NsmErrorStatus_e CAmControlReceiver::unRegisterShutdownClientNSM(const uint32_t shutdownMode) { if (!mNodeStateCommunicator) return (NsmErrorStatus_Error); @@ -710,7 +709,7 @@ NsmErrorStatus_e CAmControlReceiver::nsmUnRegisterShutdownClient(const uint32_t } -am_Error_e CAmControlReceiver::nsmGetInterfaceVersion(uint32_t& version) +am_Error_e CAmControlReceiver::getInterfaceVersionNSM(uint32_t& version) { if (!mNodeStateCommunicator) return (E_NON_EXISTENT); @@ -723,7 +722,7 @@ am_Error_e CAmControlReceiver::nsmGetInterfaceVersion(uint32_t& version) } -NsmErrorStatus_e CAmControlReceiver::nsmSendLifecycleRequestComplete(const uint32_t RequestId, const NsmErrorStatus_e status) +NsmErrorStatus_e CAmControlReceiver::sendLifecycleRequestCompleteNSM(const uint32_t RequestId, const NsmErrorStatus_e status) { if (!mNodeStateCommunicator) return (NsmErrorStatus_Error); diff --git a/AudioManagerDaemon/src/CAmControlSender.cpp b/AudioManagerDaemon/src/CAmControlSender.cpp index da2321e..dbbc539 100644 --- a/AudioManagerDaemon/src/CAmControlSender.cpp +++ b/AudioManagerDaemon/src/CAmControlSender.cpp @@ -396,28 +396,28 @@ void CAmControlSender::hookSystemNodeApplicationModeChanged(const NsmApplication mController->hookSystemNodeApplicationModeChanged(ApplicationModeId); } -am_Error_e CAmControlSender::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 CAmControlSender::hookSystemUpdateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties) { assert(mController); return (mController->hookSystemUpdateSink(sinkID,sinkClassID,listSoundProperties,listConnectionFormats,listMainSoundProperties)); } -am_Error_e CAmControlSender::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 CAmControlSender::hookSystemUpdateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties) { assert(mController); return (mController->hookSystemUpdateSource(sourceID,sourceClassID,listSoundProperties,listConnectionFormats,listMainSoundProperties)); } -am_Error_e CAmControlSender::hookSystemUpdateGateway(const am_gatewayID_t gatewayID, const std::vector listSourceConnectionFormats, const std::vector listSinkConnectionFromats, const std::vector convertionMatrix) +am_Error_e CAmControlSender::hookSystemUpdateGateway(const am_gatewayID_t gatewayID, const std::vector& listSourceConnectionFormats, const std::vector& listSinkConnectionFromats, const std::vector& convertionMatrix) { assert(mController); return (mController->hookSystemUpdateGateway(gatewayID,listSourceConnectionFormats,listSinkConnectionFromats,convertionMatrix)); } -void CAmControlSender::cbAckSetVolume(const am_Handle_s handle, const std::vector listVolumes, const am_Error_e error) +void CAmControlSender::cbAckSetVolume(const am_Handle_s handle, const std::vector& listVolumes, const am_Error_e error) { assert(mController); - mController->cbAckSetVolume(handle,listVolumes,error); + mController->cbAckSetVolumes(handle,listVolumes,error); } void CAmControlSender::cbAckSetSinkNotificationConfiguration(const am_Handle_s handle, const am_Error_e error) @@ -432,25 +432,25 @@ void CAmControlSender::cbAckSetSourceNotificationConfiguration(const am_Handle_s mController->cbAckSetSourceNotificationConfiguration(handle,error); } -void CAmControlSender::hookSinkNotificationDataChanged(const am_sinkID_t sinkID, const am_NotificationPayload_s payload) +void CAmControlSender::hookSinkNotificationDataChanged(const am_sinkID_t sinkID, const am_NotificationPayload_s& payload) { assert(mController); mController->hookSinkNotificationDataChanged(sinkID,payload); } -void CAmControlSender::hookSourceNotificationDataChanged(const am_sourceID_t sourceID, const am_NotificationPayload_s payload) +void CAmControlSender::hookSourceNotificationDataChanged(const am_sourceID_t sourceID, const am_NotificationPayload_s& payload) { assert(mController); mController->hookSourceNotificationDataChanged(sourceID,payload); } -am_Error_e CAmControlSender::hookUserSetMainSinkNotificationConfiguration(const am_sinkID_t sinkID, const am_NotificationConfiguration_s notificationConfiguration) +am_Error_e CAmControlSender::hookUserSetMainSinkNotificationConfiguration(const am_sinkID_t sinkID, const am_NotificationConfiguration_s& notificationConfiguration) { assert(mController); return (mController->hookUserSetMainSinkNotificationConfiguration(sinkID,notificationConfiguration)); } -am_Error_e CAmControlSender::hookUserSetMainSourceNotificationConfiguration(const am_sourceID_t sourceID, const am_NotificationConfiguration_s notificationConfiguration) +am_Error_e CAmControlSender::hookUserSetMainSourceNotificationConfiguration(const am_sourceID_t sourceID, const am_NotificationConfiguration_s& notificationConfiguration) { assert(mController); return (mController->hookUserSetMainSourceNotificationConfiguration(sourceID,notificationConfiguration)); @@ -471,7 +471,7 @@ bool CAmControlSender::checkerCallback(const sh_pollHandle_t handle, void* userD return (true); } -void CAmControlSender::hookSystemSessionStateChanged(const std::string sessionName, const int32_t seatID, const NsmSessionState_e sessionStateID) +void CAmControlSender::hookSystemSessionStateChanged(const std::string& sessionName, const NsmSeat_e seatID, const NsmSessionState_e sessionStateID) { assert(mController); mController->hookSystemSessionStateChanged(sessionName,seatID,sessionStateID); diff --git a/AudioManagerDaemon/src/CAmDatabaseHandler.cpp b/AudioManagerDaemon/src/CAmDatabaseHandler.cpp index 06d797b..8ed3bd5 100644 --- a/AudioManagerDaemon/src/CAmDatabaseHandler.cpp +++ b/AudioManagerDaemon/src/CAmDatabaseHandler.cpp @@ -46,7 +46,7 @@ namespace am #define MY_SQLITE_PREPARE_V2_BOOL(db,zSql,nByte,ppStmt,pzTail) \ if ((eCode = sqlite3_prepare_v2(db, zSql, nByte, ppStmt, pzTail))) \ { \ - logError("CAmDatabaseHandler::my_sqlite_prepare_v2_bool on Command",zSql,"failed with errorCode:", eCode); \ + logError("CAmDatabaseHandler::my_sqlite_prepare_v2_bool on Command",zSql,"failed with errorCode:", eCode); \ return (false); \ } @@ -432,7 +432,7 @@ am_Error_e CAmDatabaseHandler::enterSinkDB(const am_Sink_s & sinkData, am_sinkID command = "CREATE TABLE SinkSoundProperty" + i2s(sinkID) + std::string("(soundPropertyType INTEGER, value INTEGER)"); if (!this->sqQuery(command)) return (E_DATABASE_ERROR); - command = "CREATE TABLE SinkNotificationConfiguration" + i2s(sinkID) + std::string("(notificationType INTEGER, notificationStatus INTEGER, notificationParameter INTEGER)"); + command = "CREATE TABLE SinkNotificationConfiguration" + i2s(sinkID) + std::string("(type INTEGER, status INTEGER, parameter INTEGER)"); if (!this->sqQuery(command)) return (E_DATABASE_ERROR); @@ -470,14 +470,14 @@ am_Error_e CAmDatabaseHandler::enterSinkDB(const am_Sink_s & sinkData, am_sinkID } //Fill NotificationConfigurations - command = "INSERT INTO SinkNotificationConfiguration" + i2s(sinkID) + std::string("(notificationType,notificationStatus,notificationParameter) VALUES (?,?,?)"); + command = "INSERT INTO SinkNotificationConfiguration" + i2s(sinkID) + std::string("(type,status,parameter) VALUES (?,?,?)"); MY_SQLITE_PREPARE_V2(mpDatabase, command.c_str(), -1, &query, NULL) std::vector::const_iterator NotificationConfigurationIterator(sinkData.listNotificationConfigurations.begin()); for (; NotificationConfigurationIterator < sinkData.listNotificationConfigurations.end(); ++NotificationConfigurationIterator) { - MY_SQLITE_BIND_INT(query, 1, NotificationConfigurationIterator->notificationType) - MY_SQLITE_BIND_INT(query, 2, NotificationConfigurationIterator->notificationStatus) - MY_SQLITE_BIND_INT(query, 3, NotificationConfigurationIterator->notificationParameter) + MY_SQLITE_BIND_INT(query, 1, NotificationConfigurationIterator->type) + MY_SQLITE_BIND_INT(query, 2, NotificationConfigurationIterator->status) + MY_SQLITE_BIND_INT(query, 3, NotificationConfigurationIterator->parameter) if ((eCode = sqlite3_step(query)) != SQLITE_DONE) { logError("DatabaseHandler::enterSinkDB SQLITE Step error code:", eCode); @@ -512,18 +512,18 @@ am_Error_e CAmDatabaseHandler::enterSinkDB(const am_Sink_s & sinkData, am_sinkID MY_SQLITE_FINALIZE(query) //now we got MainNotificationConfigurations as well - command = "CREATE TABLE SinkMainNotificationConfiguration" + i2s(sinkID) + std::string("(notificationType INTEGER, notificationStatus INTEGER, notificationParameter INTEGER)"); + command = "CREATE TABLE SinkMainNotificationConfiguration" + i2s(sinkID) + std::string("(type INTEGER, status INTEGER, parameter INTEGER)"); if (!this->sqQuery(command)) return (E_DATABASE_ERROR); - command = "INSERT INTO SinkMainNotificationConfiguration" + i2s(sinkID) + std::string("(notificationType,notificationStatus,notificationParameter) VALUES (?,?,?)"); + command = "INSERT INTO SinkMainNotificationConfiguration" + i2s(sinkID) + std::string("(type,status,parameter) VALUES (?,?,?)"); MY_SQLITE_PREPARE_V2(mpDatabase, command.c_str(), -1, &query, NULL) std::vector::const_iterator mainNotificationConfigurationIterator(sinkData.listMainNotificationConfigurations.begin()); for (; mainNotificationConfigurationIterator < sinkData.listMainNotificationConfigurations.end(); ++mainNotificationConfigurationIterator) { - MY_SQLITE_BIND_INT(query, 1, mainNotificationConfigurationIterator->notificationType) - MY_SQLITE_BIND_INT(query, 2, mainNotificationConfigurationIterator->notificationStatus) - MY_SQLITE_BIND_INT(query, 3, mainNotificationConfigurationIterator->notificationParameter) + MY_SQLITE_BIND_INT(query, 1, mainNotificationConfigurationIterator->type) + MY_SQLITE_BIND_INT(query, 2, mainNotificationConfigurationIterator->status) + MY_SQLITE_BIND_INT(query, 3, mainNotificationConfigurationIterator->parameter) if ((eCode = sqlite3_step(query)) != SQLITE_DONE) { logError("DatabaseHandler::enterSinkDB SQLITE Step error code:", eCode); @@ -847,7 +847,7 @@ am_Error_e CAmDatabaseHandler::enterSourceDB(const am_Source_s & sourceData, am_ command = "CREATE TABLE SourceSoundProperty" + i2s(sourceID) + std::string("(soundPropertyType INTEGER, value INTEGER)"); if (!this->sqQuery(command)) return (E_DATABASE_ERROR); - command = "CREATE TABLE SourceNotificationConfiguration" + i2s(sourceID) + std::string("(notificationType INTEGER, notificationStatus INTEGER, notificationParameter INTEGER)"); + command = "CREATE TABLE SourceNotificationConfiguration" + i2s(sourceID) + std::string("(type INTEGER, status INTEGER, parameter INTEGER)"); if (!this->sqQuery(command)) return (E_DATABASE_ERROR); @@ -886,14 +886,14 @@ am_Error_e CAmDatabaseHandler::enterSourceDB(const am_Source_s & sourceData, am_ } //Fill NotificationConfigurations - command = "INSERT INTO SourceNotificationConfiguration" + i2s(sourceID) + std::string("(notificationType,notificationStatus,notificationParameter) VALUES (?,?,?)"); + command = "INSERT INTO SourceNotificationConfiguration" + i2s(sourceID) + std::string("(type,status,parameter) VALUES (?,?,?)"); MY_SQLITE_PREPARE_V2(mpDatabase, command.c_str(), -1, &query, NULL) std::vector::const_iterator NotificationConfigurationIterator(sourceData.listNotificationConfigurations.begin()); for (; NotificationConfigurationIterator < sourceData.listNotificationConfigurations.end(); ++NotificationConfigurationIterator) { - MY_SQLITE_BIND_INT(query, 1, NotificationConfigurationIterator->notificationType) - MY_SQLITE_BIND_INT(query, 2, NotificationConfigurationIterator->notificationStatus) - MY_SQLITE_BIND_INT(query, 3, NotificationConfigurationIterator->notificationParameter) + MY_SQLITE_BIND_INT(query, 1, NotificationConfigurationIterator->type) + MY_SQLITE_BIND_INT(query, 2, NotificationConfigurationIterator->status) + MY_SQLITE_BIND_INT(query, 3, NotificationConfigurationIterator->parameter) if ((eCode = sqlite3_step(query)) != SQLITE_DONE) { logError("DatabaseHandler::enterSinkDB SQLITE Step error code:", eCode); @@ -928,18 +928,18 @@ am_Error_e CAmDatabaseHandler::enterSourceDB(const am_Source_s & sourceData, am_ MY_SQLITE_FINALIZE(query) //now we got MainNotificationConfigurations as well - command = "CREATE TABLE SourceMainNotificationConfiguration" + i2s(sourceID) + std::string("(notificationType INTEGER, notificationStatus INTEGER, notificationParameter INTEGER)"); + command = "CREATE TABLE SourceMainNotificationConfiguration" + i2s(sourceID) + std::string("(type INTEGER, status INTEGER, parameter INTEGER)"); if (!this->sqQuery(command)) return (E_DATABASE_ERROR); - command = "INSERT INTO SourceMainNotificationConfiguration" + i2s(sourceID) + std::string("(notificationType,notificationStatus,notificationParameter) VALUES (?,?,?)"); + command = "INSERT INTO SourceMainNotificationConfiguration" + i2s(sourceID) + std::string("(type,status,parameter) VALUES (?,?,?)"); MY_SQLITE_PREPARE_V2(mpDatabase, command.c_str(), -1, &query, NULL) std::vector::const_iterator mainNotificationConfigurationIterator(sourceData.listMainNotificationConfigurations.begin()); for (; mainNotificationConfigurationIterator != sourceData.listMainNotificationConfigurations.end(); ++mainNotificationConfigurationIterator) { - MY_SQLITE_BIND_INT(query, 1, mainNotificationConfigurationIterator->notificationType) - MY_SQLITE_BIND_INT(query, 2, mainNotificationConfigurationIterator->notificationStatus) - MY_SQLITE_BIND_INT(query, 3, mainNotificationConfigurationIterator->notificationParameter) + MY_SQLITE_BIND_INT(query, 1, mainNotificationConfigurationIterator->type) + MY_SQLITE_BIND_INT(query, 2, mainNotificationConfigurationIterator->status) + MY_SQLITE_BIND_INT(query, 3, mainNotificationConfigurationIterator->parameter) if ((eCode = sqlite3_step(query)) != SQLITE_DONE) { logError("DatabaseHandler::enterSinkDB SQLITE Step error code:", eCode); @@ -1593,7 +1593,7 @@ am_Error_e CAmDatabaseHandler::getSinkInfoDB(const am_sinkID_t sinkID, am_Sink_s sinkData.sinkClassID = sqlite3_column_int(query, 2); sinkData.volume = sqlite3_column_int(query, 3); sinkData.visible = sqlite3_column_int(query, 4); - sinkData.available.availability = (am_Availablility_e) sqlite3_column_int(query, 5); + sinkData.available.availability = (am_Availability_e) sqlite3_column_int(query, 5); sinkData.available.availabilityReason = (am_AvailabilityReason_e) sqlite3_column_int(query, 6); sinkData.muteState = (am_MuteState_e) sqlite3_column_int(query, 7); sinkData.mainVolume = sqlite3_column_int(query, 8); @@ -1622,14 +1622,14 @@ am_Error_e CAmDatabaseHandler::getSinkInfoDB(const am_sinkID_t sinkID, am_Sink_s MY_SQLITE_FINALIZE(qSoundProperty) - std::string notificationCommand = "SELECT notificationType, notificationStatus, notificationParameter FROM SinkNotificationConfiguration" + i2s(sinkID); + std::string notificationCommand = "SELECT type, status, parameter FROM SinkNotificationConfiguration" + i2s(sinkID); MY_SQLITE_PREPARE_V2(mpDatabase, notificationCommand.c_str(), -1, &qNotification, NULL) while ((eCode = sqlite3_step(qNotification)) == SQLITE_ROW) { - tempNotificationConfiguration.notificationType = static_cast(sqlite3_column_int(qNotification, 0)); - tempNotificationConfiguration.notificationStatus = static_cast(sqlite3_column_int(qNotification, 1)); - tempNotificationConfiguration.notificationParameter= static_cast(sqlite3_column_int(qNotification, 2)); + tempNotificationConfiguration.type = static_cast(sqlite3_column_int(qNotification, 0)); + tempNotificationConfiguration.status = static_cast(sqlite3_column_int(qNotification, 1)); + tempNotificationConfiguration.parameter= static_cast(sqlite3_column_int(qNotification, 2)); sinkData.listNotificationConfigurations.push_back(tempNotificationConfiguration); } MY_SQLITE_FINALIZE(qNotification) @@ -1649,14 +1649,14 @@ am_Error_e CAmDatabaseHandler::getSinkInfoDB(const am_sinkID_t sinkID, am_Sink_s MY_SQLITE_FINALIZE(qMAinSoundProperty) - std::string mainNotificationCommand = "SELECT notificationType, notificationStatus, notificationParameter FROM SinkMainNotificationConfiguration" + i2s(sinkID); + std::string mainNotificationCommand = "SELECT type, status, parameter FROM SinkMainNotificationConfiguration" + i2s(sinkID); MY_SQLITE_PREPARE_V2(mpDatabase, mainNotificationCommand.c_str(), -1, &qMainNotification, NULL) while ((eCode = sqlite3_step(qMainNotification)) == SQLITE_ROW) { - tempMainNotification.notificationType = static_cast(sqlite3_column_int(qMainNotification, 0)); - tempMainNotification.notificationStatus = static_cast(sqlite3_column_int(qMainNotification, 1)); - tempMainNotification.notificationParameter= static_cast(sqlite3_column_int(qMainNotification, 2)); + tempMainNotification.type = static_cast(sqlite3_column_int(qMainNotification, 0)); + tempMainNotification.status = static_cast(sqlite3_column_int(qMainNotification, 1)); + tempMainNotification.parameter= static_cast(sqlite3_column_int(qMainNotification, 2)); sinkData.listMainNotificationConfigurations.push_back(tempMainNotification); } MY_SQLITE_FINALIZE(qMainNotification) @@ -1701,7 +1701,7 @@ am_Error_e CAmDatabaseHandler::getSourceInfoDB(const am_sourceID_t sourceID, am_ sourceData.sourceState = (am_SourceState_e) sqlite3_column_int(query, 3); sourceData.volume = sqlite3_column_int(query, 4); sourceData.visible = sqlite3_column_int(query, 5); - sourceData.available.availability = (am_Availablility_e) sqlite3_column_int(query, 6); + sourceData.available.availability = (am_Availability_e) sqlite3_column_int(query, 6); sourceData.available.availabilityReason = (am_AvailabilityReason_e) sqlite3_column_int(query, 7); sourceData.interruptState = (am_InterruptState_e) sqlite3_column_int(query, 8); sourceData.sourceID = sqlite3_column_int(query, 9); @@ -1729,14 +1729,14 @@ am_Error_e CAmDatabaseHandler::getSourceInfoDB(const am_sourceID_t sourceID, am_ MY_SQLITE_FINALIZE(qSoundProperty) - std::string notificationCommand = "SELECT notificationType, notificationStatus, notificationParameter FROM SourceNotificationConfiguration" + i2s(sourceID); + std::string notificationCommand = "SELECT type, status, parameter FROM SourceNotificationConfiguration" + i2s(sourceID); MY_SQLITE_PREPARE_V2(mpDatabase, notificationCommand.c_str(), -1, &qNotification, NULL) while ((eCode = sqlite3_step(qNotification)) == SQLITE_ROW) { - tempNotificationConfiguration.notificationType = static_cast(sqlite3_column_int(qNotification, 0)); - tempNotificationConfiguration.notificationStatus = static_cast(sqlite3_column_int(qNotification, 1)); - tempNotificationConfiguration.notificationParameter= static_cast(sqlite3_column_int(qNotification, 2)); + tempNotificationConfiguration.type = static_cast(sqlite3_column_int(qNotification, 0)); + tempNotificationConfiguration.status = static_cast(sqlite3_column_int(qNotification, 1)); + tempNotificationConfiguration.parameter= static_cast(sqlite3_column_int(qNotification, 2)); sourceData.listNotificationConfigurations.push_back(tempNotificationConfiguration); } MY_SQLITE_FINALIZE(qNotification) @@ -1756,14 +1756,14 @@ am_Error_e CAmDatabaseHandler::getSourceInfoDB(const am_sourceID_t sourceID, am_ MY_SQLITE_FINALIZE(qMAinSoundProperty) - std::string mainNotificationCommand = "SELECT notificationType, notificationStatus, notificationParameter FROM SourceMainNotificationConfiguration" + i2s(sourceID); + std::string mainNotificationCommand = "SELECT type, status, parameter FROM SourceMainNotificationConfiguration" + i2s(sourceID); MY_SQLITE_PREPARE_V2(mpDatabase, mainNotificationCommand.c_str(), -1, &qMainNotification, NULL) while ((eCode = sqlite3_step(qMainNotification)) == SQLITE_ROW) { - tempMainNotification.notificationType = static_cast(sqlite3_column_int(qMainNotification, 0)); - tempMainNotification.notificationStatus = static_cast(sqlite3_column_int(qMainNotification, 1)); - tempMainNotification.notificationParameter= static_cast(sqlite3_column_int(qMainNotification, 2)); + tempMainNotification.type = static_cast(sqlite3_column_int(qMainNotification, 0)); + tempMainNotification.status = static_cast(sqlite3_column_int(qMainNotification, 1)); + tempMainNotification.parameter= static_cast(sqlite3_column_int(qMainNotification, 2)); sourceData.listMainNotificationConfigurations.push_back(tempMainNotification); } MY_SQLITE_FINALIZE(qMainNotification) @@ -2326,7 +2326,7 @@ am_Error_e CAmDatabaseHandler::getListSinks(std::vector & listSinks) temp.sinkClassID = sqlite3_column_int(query, 2); temp.volume = sqlite3_column_int(query, 3); temp.visible = sqlite3_column_int(query, 4); - temp.available.availability = (am_Availablility_e) sqlite3_column_int(query, 5); + temp.available.availability = (am_Availability_e) sqlite3_column_int(query, 5); temp.available.availabilityReason = (am_AvailabilityReason_e) sqlite3_column_int(query, 6); temp.muteState = (am_MuteState_e) sqlite3_column_int(query, 7); temp.mainVolume = sqlite3_column_int(query, 8); @@ -2356,13 +2356,13 @@ am_Error_e CAmDatabaseHandler::getListSinks(std::vector & listSinks) MY_SQLITE_FINALIZE(qSoundProperty) //read out notifications - std::string commandNotificationConfiguration = "SELECT notificationType, notificationStatus, notificationParameter FROM SinkNotificationConfiguration" + i2s(temp.sinkID); + std::string commandNotificationConfiguration = "SELECT type, status, parameter FROM SinkNotificationConfiguration" + i2s(temp.sinkID); MY_SQLITE_PREPARE_V2(mpDatabase, commandNotificationConfiguration.c_str(), -1, &qNotificationConfiguration, NULL) while ((eCode = sqlite3_step(qNotificationConfiguration)) == SQLITE_ROW) { - tempNotificationConfiguration.notificationType = static_cast (sqlite3_column_int(qNotificationConfiguration, 0)); - tempNotificationConfiguration.notificationStatus = static_cast (sqlite3_column_int(qNotificationConfiguration, 1)); - tempNotificationConfiguration.notificationParameter = static_cast (sqlite3_column_int(qNotificationConfiguration, 2)); + tempNotificationConfiguration.type = static_cast (sqlite3_column_int(qNotificationConfiguration, 0)); + tempNotificationConfiguration.status = static_cast (sqlite3_column_int(qNotificationConfiguration, 1)); + tempNotificationConfiguration.parameter = static_cast (sqlite3_column_int(qNotificationConfiguration, 2)); temp.listNotificationConfigurations.push_back(tempNotificationConfiguration); } @@ -2383,13 +2383,13 @@ am_Error_e CAmDatabaseHandler::getListSinks(std::vector & listSinks) MY_SQLITE_FINALIZE(qMAinSoundProperty) //and mainNotificationConfigurations - std::string commandMainNotificationConfiguration = "SELECT notificationType, notificationStatus, notificationParameter FROM SinkMainNotificationConfiguration" + i2s(temp.sinkID); + std::string commandMainNotificationConfiguration = "SELECT type, status, parameter FROM SinkMainNotificationConfiguration" + i2s(temp.sinkID); MY_SQLITE_PREPARE_V2(mpDatabase, commandMainNotificationConfiguration.c_str(), -1, &qMainNotificationConfiguration, NULL) while ((eCode = sqlite3_step(qMainNotificationConfiguration)) == SQLITE_ROW) { - tempMainNotificationConfiguration.notificationType = static_cast (sqlite3_column_int(qMainNotificationConfiguration, 0)); - tempMainNotificationConfiguration.notificationStatus = static_cast (sqlite3_column_int(qMainNotificationConfiguration, 1)); - tempMainNotificationConfiguration.notificationParameter = static_cast (sqlite3_column_int(qMainNotificationConfiguration, 2)); + tempMainNotificationConfiguration.type = static_cast (sqlite3_column_int(qMainNotificationConfiguration, 0)); + tempMainNotificationConfiguration.status = static_cast (sqlite3_column_int(qMainNotificationConfiguration, 1)); + tempMainNotificationConfiguration.parameter = static_cast (sqlite3_column_int(qMainNotificationConfiguration, 2)); temp.listMainNotificationConfigurations.push_back(tempMainNotificationConfiguration); } @@ -2435,7 +2435,7 @@ am_Error_e CAmDatabaseHandler::getListSources(std::vector & listSou temp.sourceState = (am_SourceState_e) sqlite3_column_int(query, 3); temp.volume = sqlite3_column_int(query, 4); temp.visible = sqlite3_column_int(query, 5); - temp.available.availability = (am_Availablility_e) sqlite3_column_int(query, 6); + temp.available.availability = (am_Availability_e) sqlite3_column_int(query, 6); temp.available.availabilityReason = (am_AvailabilityReason_e) sqlite3_column_int(query, 7); temp.interruptState = (am_InterruptState_e) sqlite3_column_int(query, 8); temp.sourceID = sqlite3_column_int(query, 9); @@ -2463,14 +2463,14 @@ am_Error_e CAmDatabaseHandler::getListSources(std::vector & listSou MY_SQLITE_FINALIZE(qSoundProperty) - std::string notificationCommand = "SELECT notificationType, notificationStatus, notificationParameter FROM SourceNotificationConfiguration" + i2s(temp.sourceID); + std::string notificationCommand = "SELECT type, status, parameter FROM SourceNotificationConfiguration" + i2s(temp.sourceID); MY_SQLITE_PREPARE_V2(mpDatabase, notificationCommand.c_str(), -1, &qNotification, NULL) while ((eCode = sqlite3_step(qNotification)) == SQLITE_ROW) { - tempNotificationConfiguration.notificationType = static_cast(sqlite3_column_int(qNotification, 0)); - tempNotificationConfiguration.notificationStatus = static_cast(sqlite3_column_int(qNotification, 1)); - tempNotificationConfiguration.notificationParameter= static_cast(sqlite3_column_int(qNotification, 2)); + tempNotificationConfiguration.type = static_cast(sqlite3_column_int(qNotification, 0)); + tempNotificationConfiguration.status = static_cast(sqlite3_column_int(qNotification, 1)); + tempNotificationConfiguration.parameter= static_cast(sqlite3_column_int(qNotification, 2)); temp.listNotificationConfigurations.push_back(tempNotificationConfiguration); } MY_SQLITE_FINALIZE(qNotification) @@ -2489,14 +2489,14 @@ am_Error_e CAmDatabaseHandler::getListSources(std::vector & listSou MY_SQLITE_FINALIZE(qMAinSoundProperty) - std::string mainNotificationCommand = "SELECT notificationType, notificationStatus, notificationParameter FROM SourceMainNotificationConfiguration" + i2s(temp.sourceID); + std::string mainNotificationCommand = "SELECT type, status, parameter FROM SourceMainNotificationConfiguration" + i2s(temp.sourceID); MY_SQLITE_PREPARE_V2(mpDatabase, mainNotificationCommand.c_str(), -1, &qMainNotification, NULL) while ((eCode = sqlite3_step(qMainNotification)) == SQLITE_ROW) { - tempNotificationConfiguration.notificationType = static_cast(sqlite3_column_int(qMainNotification, 0)); - tempNotificationConfiguration.notificationStatus = static_cast(sqlite3_column_int(qMainNotification, 1)); - tempNotificationConfiguration.notificationParameter= static_cast(sqlite3_column_int(qMainNotification, 2)); + tempNotificationConfiguration.type = static_cast(sqlite3_column_int(qMainNotification, 0)); + tempNotificationConfiguration.status = static_cast(sqlite3_column_int(qMainNotification, 1)); + tempNotificationConfiguration.parameter= static_cast(sqlite3_column_int(qMainNotification, 2)); temp.listMainNotificationConfigurations.push_back(tempNotificationConfiguration); } MY_SQLITE_FINALIZE(qMainNotification) @@ -2777,7 +2777,7 @@ am_Error_e CAmDatabaseHandler::getListMainSinks(std::vector & lis { temp.name = std::string((const char*) sqlite3_column_text(query, 0)); temp.sinkID = sqlite3_column_int(query, 1); - temp.availability.availability = (am_Availablility_e) sqlite3_column_int(query, 2); + temp.availability.availability = (am_Availability_e) sqlite3_column_int(query, 2); temp.availability.availabilityReason = (am_AvailabilityReason_e) sqlite3_column_int(query, 3); temp.muteState = (am_MuteState_e) sqlite3_column_int(query, 4); temp.volume = sqlite3_column_int(query, 5); @@ -2810,7 +2810,7 @@ am_Error_e CAmDatabaseHandler::getListMainSources(std::vector & { temp.name = std::string((const char*) sqlite3_column_text(query, 0)); temp.sourceClassID = sqlite3_column_int(query, 1); - temp.availability.availability = (am_Availablility_e) sqlite3_column_int(query, 2); + temp.availability.availability = (am_Availability_e) sqlite3_column_int(query, 2); temp.availability.availabilityReason = (am_AvailabilityReason_e) sqlite3_column_int(query, 3); temp.sourceID = sqlite3_column_int(query, 4); @@ -4467,7 +4467,7 @@ am_Error_e am::CAmDatabaseHandler::peekSourceClassID(const std::string & name, a } -am_Error_e CAmDatabaseHandler::changeSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector listSoundProperties, const std::vector listConnectionFormats, const std::vector listMainSoundProperties) +am_Error_e CAmDatabaseHandler::changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties) { assert(sourceID!=0); @@ -4604,7 +4604,7 @@ am_Error_e CAmDatabaseHandler::changeSource(const am_sourceID_t sourceID, const } -am_Error_e CAmDatabaseHandler::changeSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector listSoundProperties, const std::vector listConnectionFormats, const std::vector listMainSoundProperties) +am_Error_e CAmDatabaseHandler::changeSinkDB(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties) { assert(sinkID!=0); @@ -4740,7 +4740,7 @@ am_Error_e CAmDatabaseHandler::changeSink(const am_sinkID_t sinkID, const am_sin return (E_OK); } -am_Error_e CAmDatabaseHandler::getListSinkMainNotificationConfigurations(const am_sinkID_t sinkID, std::vector& listMainNotificationConfigurations) +am_Error_e CAmDatabaseHandler::getListMainSinkNotificationConfigurations(const am_sinkID_t sinkID, std::vector& listMainNotificationConfigurations) { assert(sinkID!=0); if (!existSink(sinkID)) @@ -4750,14 +4750,14 @@ am_Error_e CAmDatabaseHandler::getListSinkMainNotificationConfigurations(const a sqlite3_stmt* query = NULL; int eCode = 0; am_NotificationConfiguration_s temp; - std::string command = "SELECT notificationType, notificationStatus, notificationParameter FROM SinkMainNotificationConfiguration" + i2s(sinkID); + std::string command = "SELECT type, status, parameter FROM SinkMainNotificationConfiguration" + i2s(sinkID); MY_SQLITE_PREPARE_V2(mpDatabase, command.c_str(), -1, &query, NULL) while ((eCode = sqlite3_step(query)) == SQLITE_ROW) { - temp.notificationType = static_cast(sqlite3_column_int(query, 0)); - temp.notificationStatus = static_cast(sqlite3_column_int(query, 1)); - temp.notificationParameter= static_cast(sqlite3_column_int(query, 2)); + temp.type = static_cast(sqlite3_column_int(query, 0)); + temp.status = static_cast(sqlite3_column_int(query, 1)); + temp.parameter= static_cast(sqlite3_column_int(query, 2)); listMainNotificationConfigurations.push_back(temp); } @@ -4774,7 +4774,7 @@ am_Error_e CAmDatabaseHandler::getListSinkMainNotificationConfigurations(const a } -am_Error_e CAmDatabaseHandler::getListSourceMainNotificationConfigurations(const am_sourceID_t sourceID, std::vector& listMainNotificationConfigurations) +am_Error_e CAmDatabaseHandler::getListMainSourceNotificationConfigurations(const am_sourceID_t sourceID, std::vector& listMainNotificationConfigurations) { assert(sourceID!=0); if (!existSource(sourceID)) @@ -4784,14 +4784,14 @@ am_Error_e CAmDatabaseHandler::getListSourceMainNotificationConfigurations(const sqlite3_stmt* query = NULL; int eCode = 0; am_NotificationConfiguration_s temp; - std::string command = "SELECT notificationType, notificationStatus, notificationParameter FROM SourceMainNotificationConfiguration" + i2s(sourceID); + std::string command = "SELECT type, status, parameter FROM SourceMainNotificationConfiguration" + i2s(sourceID); MY_SQLITE_PREPARE_V2(mpDatabase, command.c_str(), -1, &query, NULL) while ((eCode = sqlite3_step(query)) == SQLITE_ROW) { - temp.notificationType = static_cast(sqlite3_column_int(query, 0)); - temp.notificationStatus = static_cast(sqlite3_column_int(query, 1)); - temp.notificationParameter= static_cast(sqlite3_column_int(query, 2)); + temp.type = static_cast(sqlite3_column_int(query, 0)); + temp.status = static_cast(sqlite3_column_int(query, 1)); + temp.parameter= static_cast(sqlite3_column_int(query, 2)); listMainNotificationConfigurations.push_back(temp); } @@ -4819,10 +4819,10 @@ am_Error_e CAmDatabaseHandler::changeMainSinkNotificationConfigurationDB(const a { return (E_NON_EXISTENT); } - command = "UPDATE SinkMainNotificationConfiguration" + i2s(sinkID) + " SET notificationStatus=?, notificationParameter=? WHERE notificationType=" + i2s(mainNotificationConfiguration.notificationType); + command = "UPDATE SinkMainNotificationConfiguration" + i2s(sinkID) + " SET status=?, parameter=? WHERE type=" + i2s(mainNotificationConfiguration.type); MY_SQLITE_PREPARE_V2(mpDatabase, command.c_str(), -1, &query, NULL) - MY_SQLITE_BIND_INT(query, 1, mainNotificationConfiguration.notificationStatus) - MY_SQLITE_BIND_INT(query, 2, mainNotificationConfiguration.notificationParameter) + MY_SQLITE_BIND_INT(query, 1, mainNotificationConfiguration.status) + MY_SQLITE_BIND_INT(query, 2, mainNotificationConfiguration.parameter) if ((eCode = sqlite3_step(query)) != SQLITE_DONE) { logError("DatabaseHandler::changeMainSinkNotificationConfigurationDB SQLITE Step error code:", eCode); @@ -4831,7 +4831,7 @@ am_Error_e CAmDatabaseHandler::changeMainSinkNotificationConfigurationDB(const a } MY_SQLITE_FINALIZE(query) - logInfo("DatabaseHandler::changeMainSinkNotificationConfigurationDB changed MainNotificationConfiguration of source:", sinkID, "type:", mainNotificationConfiguration.notificationType, "to status=", mainNotificationConfiguration.notificationStatus, "and parameter=",mainNotificationConfiguration.notificationParameter); + logInfo("DatabaseHandler::changeMainSinkNotificationConfigurationDB changed MainNotificationConfiguration of source:", sinkID, "type:", mainNotificationConfiguration.type, "to status=", mainNotificationConfiguration.status, "and parameter=",mainNotificationConfiguration.parameter); if (mpDatabaseObserver) mpDatabaseObserver->sinkMainNotificationConfigurationChanged(sinkID, mainNotificationConfiguration); @@ -4850,10 +4850,10 @@ am_Error_e CAmDatabaseHandler::changeMainSourceNotificationConfigurationDB(const { return (E_NON_EXISTENT); } - command = "UPDATE SourceMainNotificationConfiguration" + i2s(sourceID) + " SET notificationStatus=?, notificationParameter=? WHERE notificationType=" + i2s(mainNotificationConfiguration.notificationType); + command = "UPDATE SourceMainNotificationConfiguration" + i2s(sourceID) + " SET status=?, parameter=? WHERE type=" + i2s(mainNotificationConfiguration.type); MY_SQLITE_PREPARE_V2(mpDatabase, command.c_str(), -1, &query, NULL) - MY_SQLITE_BIND_INT(query, 1, mainNotificationConfiguration.notificationStatus) - MY_SQLITE_BIND_INT(query, 2, mainNotificationConfiguration.notificationParameter) + MY_SQLITE_BIND_INT(query, 1, mainNotificationConfiguration.status) + MY_SQLITE_BIND_INT(query, 2, mainNotificationConfiguration.parameter) if ((eCode = sqlite3_step(query)) != SQLITE_DONE) { logError("DatabaseHandler::changeMainSourceNotificationConfigurationDB SQLITE Step error code:", eCode); @@ -4862,14 +4862,14 @@ am_Error_e CAmDatabaseHandler::changeMainSourceNotificationConfigurationDB(const } MY_SQLITE_FINALIZE(query) - logInfo("DatabaseHandler::changeMainSourceNotificationConfigurationDB changed MainNotificationConfiguration of source:", sourceID, "type:", mainNotificationConfiguration.notificationType, "to status=", mainNotificationConfiguration.notificationStatus, "and parameter=",mainNotificationConfiguration.notificationParameter); + logInfo("DatabaseHandler::changeMainSourceNotificationConfigurationDB changed MainNotificationConfiguration of source:", sourceID, "type:", mainNotificationConfiguration.type, "to status=", mainNotificationConfiguration.status, "and parameter=",mainNotificationConfiguration.parameter); if (mpDatabaseObserver) mpDatabaseObserver->sourceMainNotificationConfigurationChanged(sourceID, mainNotificationConfiguration); return (E_OK); } -am_Error_e CAmDatabaseHandler::changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector listSourceConnectionFormats, const std::vector listSinkConnectionFormats, const std::vector convertionMatrix) +am_Error_e CAmDatabaseHandler::changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector& listSourceConnectionFormats, const std::vector& listSinkConnectionFormats, const std::vector& convertionMatrix) { assert(gatewayID!=0); @@ -4955,10 +4955,10 @@ am_Error_e CAmDatabaseHandler::changeSinkNotificationConfigurationDB(const am_si { return (E_NON_EXISTENT); } - command = "UPDATE SinkNotificationConfiguration" + i2s(sinkID) + " SET notificationStatus=?, notificationParameter=? WHERE notificationType=" + i2s(notificationConfiguration.notificationType); + command = "UPDATE SinkNotificationConfiguration" + i2s(sinkID) + " SET status=?, parameter=? WHERE type=" + i2s(notificationConfiguration.type); MY_SQLITE_PREPARE_V2(mpDatabase, command.c_str(), -1, &query, NULL) - MY_SQLITE_BIND_INT(query, 1, notificationConfiguration.notificationStatus) - MY_SQLITE_BIND_INT(query, 2, notificationConfiguration.notificationParameter) + MY_SQLITE_BIND_INT(query, 1, notificationConfiguration.status) + MY_SQLITE_BIND_INT(query, 2, notificationConfiguration.parameter) if ((eCode = sqlite3_step(query)) != SQLITE_DONE) { logError("DatabaseHandler::changeMainSinkNotificationConfigurationDB SQLITE Step error code:", eCode); @@ -4967,7 +4967,7 @@ am_Error_e CAmDatabaseHandler::changeSinkNotificationConfigurationDB(const am_si } MY_SQLITE_FINALIZE(query) - logInfo("DatabaseHandler::changeMainSinkNotificationConfigurationDB changed MainNotificationConfiguration of source:", sinkID, "type:", notificationConfiguration.notificationType, "to status=", notificationConfiguration.notificationStatus, "and parameter=",notificationConfiguration.notificationParameter); + logInfo("DatabaseHandler::changeMainSinkNotificationConfigurationDB changed MainNotificationConfiguration of source:", sinkID, "type:", notificationConfiguration.type, "to status=", notificationConfiguration.status, "and parameter=",notificationConfiguration.parameter); //todo:: inform obsever here... return (E_OK); @@ -4985,10 +4985,10 @@ am_Error_e CAmDatabaseHandler::changeSourceNotificationConfigurationDB(const am_ { return (E_NON_EXISTENT); } - command = "UPDATE SourceNotificationConfiguration" + i2s(sourceID) + " SET notificationStatus=?, notificationParameter=? WHERE notificationType=" + i2s(notificationConfiguration.notificationType); + command = "UPDATE SourceNotificationConfiguration" + i2s(sourceID) + " SET status=?, parameter=? WHERE type=" + i2s(notificationConfiguration.type); MY_SQLITE_PREPARE_V2(mpDatabase, command.c_str(), -1, &query, NULL) - MY_SQLITE_BIND_INT(query, 1, notificationConfiguration.notificationStatus) - MY_SQLITE_BIND_INT(query, 2, notificationConfiguration.notificationParameter) + MY_SQLITE_BIND_INT(query, 1, notificationConfiguration.status) + MY_SQLITE_BIND_INT(query, 2, notificationConfiguration.parameter) if ((eCode = sqlite3_step(query)) != SQLITE_DONE) { logError("DatabaseHandler::changeMainSourceNotificationConfigurationDB SQLITE Step error code:", eCode); @@ -4997,7 +4997,7 @@ am_Error_e CAmDatabaseHandler::changeSourceNotificationConfigurationDB(const am_ } MY_SQLITE_FINALIZE(query) - logInfo("DatabaseHandler::changeSourceNotificationConfigurationDB changed MainNotificationConfiguration of source:", sourceID, "type:", notificationConfiguration.notificationType, "to status=", notificationConfiguration.notificationStatus, "and parameter=",notificationConfiguration.notificationParameter); + logInfo("DatabaseHandler::changeSourceNotificationConfigurationDB changed MainNotificationConfiguration of source:", sourceID, "type:", notificationConfiguration.type, "to status=", notificationConfiguration.status, "and parameter=",notificationConfiguration.parameter); //todo:: implement observer function return (E_OK); diff --git a/AudioManagerDaemon/src/CAmRoutingReceiver.cpp b/AudioManagerDaemon/src/CAmRoutingReceiver.cpp index f1f0e09..a9f8642 100644 --- a/AudioManagerDaemon/src/CAmRoutingReceiver.cpp +++ b/AudioManagerDaemon/src/CAmRoutingReceiver.cpp @@ -387,22 +387,46 @@ void am::CAmRoutingReceiver::waitOnStartup(bool startup) mLastStartupError=E_OK; } -am_Error_e CAmRoutingReceiver::updateGateway(const am_gatewayID_t gatewayID, std::vector listSourceFormats, const std::vector listSinkFormats, std::vector convertionMatrix) +void CAmRoutingReceiver::ackSinkNotificationConfiguration(const am_Handle_s handle, const am_Error_e error) +{ + CAmRoutingSender::am_handleData_c handleData = mpRoutingSender->returnHandleData(handle); + if (error == E_OK && handleData.sinkID != 0) + { + mpDatabaseHandler->changeSinkNotificationConfigurationDB(handleData.sinkID,*handleData.notificationConfiguration); + delete handleData.notificationConfiguration; + } + mpRoutingSender->removeHandle(handle); + mpControlSender->cbAckSetSinkNotificationConfiguration(handle,error); +} + +void CAmRoutingReceiver::ackSourceNotificationConfiguration(const am_Handle_s handle, const am_Error_e error) +{ + CAmRoutingSender::am_handleData_c handleData = mpRoutingSender->returnHandleData(handle); + if (error == E_OK && handleData.sourceID != 0) + { + mpDatabaseHandler->changeSourceNotificationConfigurationDB(handleData.sourceID,*handleData.notificationConfiguration); + delete handleData.notificationConfiguration; + } + mpRoutingSender->removeHandle(handle); + mpControlSender->cbAckSetSourceNotificationConfiguration(handle,error); +} + +am_Error_e CAmRoutingReceiver::updateGateway(const am_gatewayID_t gatewayID, const std::vector& listSourceFormats, const std::vector& listSinkFormats, const std::vector& convertionMatrix) { return (mpControlSender->hookSystemUpdateGateway(gatewayID,listSourceFormats,listSinkFormats,convertionMatrix)); } -am_Error_e CAmRoutingReceiver::updateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector listSoundProperties, const std::vector listConnectionFormats, std::vector listMainSoundProperties) +am_Error_e CAmRoutingReceiver::updateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties) { return (mpControlSender->hookSystemUpdateSink(sinkID,sinkClassID,listSoundProperties,listConnectionFormats,listMainSoundProperties)); } -am_Error_e CAmRoutingReceiver::updateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, std::vector listSoundProperties, std::vector listConnectionFormats, const std::vector listMainSoundProperties) +am_Error_e CAmRoutingReceiver::updateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties) { return (mpControlSender->hookSystemUpdateSource(sourceID,sourceClassID,listSoundProperties,listConnectionFormats,listMainSoundProperties)); } -void CAmRoutingReceiver::ackSetVolumes(const am_Handle_s handle, const std::vector listvolumes, const am_Error_e error) +void CAmRoutingReceiver::ackSetVolumes(const am_Handle_s handle, const std::vector& listvolumes, const am_Error_e error) { CAmRoutingSender::am_handleData_c handleData = mpRoutingSender->returnHandleData(handle); if (error == E_OK && handleData.volumeID.sink != 0) @@ -426,39 +450,15 @@ void CAmRoutingReceiver::ackSetVolumes(const am_Handle_s handle, const std::vect mpControlSender->cbAckSetVolume(handle,listvolumes,error); } -void CAmRoutingReceiver::ackSinkNotificationConfiguration(const am_Handle_s handle, const am_Error_e error) -{ - CAmRoutingSender::am_handleData_c handleData = mpRoutingSender->returnHandleData(handle); - if (error == E_OK && handleData.sinkID != 0) - { - mpDatabaseHandler->changeSinkNotificationConfigurationDB(handleData.sinkID,*handleData.notificationConfiguration); - delete handleData.notificationConfiguration; - } - mpRoutingSender->removeHandle(handle); - mpControlSender->cbAckSetSinkNotificationConfiguration(handle,error); -} - -void CAmRoutingReceiver::ackSourceNotificationConfiguration(const am_Handle_s handle, const am_Error_e error) -{ - CAmRoutingSender::am_handleData_c handleData = mpRoutingSender->returnHandleData(handle); - if (error == E_OK && handleData.sourceID != 0) - { - mpDatabaseHandler->changeSourceNotificationConfigurationDB(handleData.sourceID,*handleData.notificationConfiguration); - delete handleData.notificationConfiguration; - } - mpRoutingSender->removeHandle(handle); - mpControlSender->cbAckSetSourceNotificationConfiguration(handle,error); -} - -void CAmRoutingReceiver::hookSinkNotificationDataChange(const am_sinkID_t sinkID, const am_NotificationPayload_s payload) +void CAmRoutingReceiver::hookSinkNotificationDataChange(const am_sinkID_t sinkID, const am_NotificationPayload_s& payload) { - logInfo("CAmRoutingReceiver::hookSinkNotificationDataChange received, sinkID=",sinkID,"notificationType=",payload.notificationType,"notificationValue=",payload.notificationValue); + logInfo("CAmRoutingReceiver::hookSinkNotificationDataChange received, sinkID=",sinkID,"type=",payload.type,"notificationValue=",payload.value); mpControlSender->hookSinkNotificationDataChanged(sinkID,payload); } -void CAmRoutingReceiver::hookSourceNotificationDataChange(const am_sourceID_t sourceID, const am_NotificationPayload_s payload) +void CAmRoutingReceiver::hookSourceNotificationDataChange(const am_sourceID_t sourceID, const am_NotificationPayload_s& payload) { - logInfo("CAmRoutingReceiver::hookSourceNotificationDataChange received, sinkID=",sourceID,"notificationType=",payload.notificationType,"notificationValue=",payload.notificationValue); + logInfo("CAmRoutingReceiver::hookSourceNotificationDataChange received, sinkID=",sourceID,"type=",payload.type,"notificationValue=",payload.value); mpControlSender->hookSourceNotificationDataChanged(sourceID,payload); } diff --git a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp index 14e8577..979db81 100644 --- a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp +++ b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp @@ -1944,9 +1944,9 @@ TEST_F(CAmDatabaseHandlerTest,enterNotificationConfigurationCorrect) std::vector listSinks; am_NotificationConfiguration_s notify; - notify.notificationType=NT_UNKNOWN; - notify.notificationStatus=NS_CHANGE; - notify.notificationParameter=25; + notify.type=NT_UNKNOWN; + notify.status=NS_CHANGE; + notify.parameter=25; testSinkData.listNotificationConfigurations.push_back(notify); //enter the sink in the database @@ -1957,16 +1957,16 @@ TEST_F(CAmDatabaseHandlerTest,enterNotificationConfigurationCorrect) ASSERT_EQ(E_OK,pDatabaseHandler.getListSinks(listSinks)) << "ERROR: database error"; - ASSERT_EQ(listSinks.begin()->listNotificationConfigurations[2].notificationParameter,notify.notificationParameter); - ASSERT_EQ(listSinks.begin()->listNotificationConfigurations[2].notificationStatus,notify.notificationStatus); - ASSERT_EQ(listSinks.begin()->listNotificationConfigurations[2].notificationType,notify.notificationType); + ASSERT_EQ(listSinks.begin()->listNotificationConfigurations[2].parameter,notify.parameter); + ASSERT_EQ(listSinks.begin()->listNotificationConfigurations[2].status,notify.status); + ASSERT_EQ(listSinks.begin()->listNotificationConfigurations[2].type,notify.type); ASSERT_EQ(E_OK,pDatabaseHandler.getSinkInfoDB(testSinkData.sinkID,readoutData)) << "ERROR: database error"; - ASSERT_EQ(readoutData.listNotificationConfigurations[2].notificationParameter,notify.notificationParameter); - ASSERT_EQ(readoutData.listNotificationConfigurations[2].notificationStatus,notify.notificationStatus); - ASSERT_EQ(readoutData.listNotificationConfigurations[2].notificationType,notify.notificationType); + ASSERT_EQ(readoutData.listNotificationConfigurations[2].parameter,notify.parameter); + ASSERT_EQ(readoutData.listNotificationConfigurations[2].status,notify.status); + ASSERT_EQ(readoutData.listNotificationConfigurations[2].type,notify.type); } @@ -1979,9 +1979,9 @@ TEST_F(CAmDatabaseHandlerTest,enterMainNotificationConfigurationCorrect) std::vector listSinks; am_NotificationConfiguration_s notify; - notify.notificationType=NT_UNKNOWN; - notify.notificationStatus=NS_CHANGE; - notify.notificationParameter=25; + notify.type=NT_UNKNOWN; + notify.status=NS_CHANGE; + notify.parameter=25; testSinkData.listMainNotificationConfigurations.push_back(notify); @@ -1993,9 +1993,9 @@ TEST_F(CAmDatabaseHandlerTest,enterMainNotificationConfigurationCorrect) ASSERT_EQ(E_OK,pDatabaseHandler.getListSinks(listSinks)) << "ERROR: database error"; - ASSERT_EQ(listSinks.begin()->listMainNotificationConfigurations[2].notificationParameter,notify.notificationParameter); - ASSERT_EQ(listSinks.begin()->listMainNotificationConfigurations[2].notificationStatus,notify.notificationStatus); - ASSERT_EQ(listSinks.begin()->listMainNotificationConfigurations[2].notificationType,notify.notificationType); + ASSERT_EQ(listSinks.begin()->listMainNotificationConfigurations[2].parameter,notify.parameter); + ASSERT_EQ(listSinks.begin()->listMainNotificationConfigurations[2].status,notify.status); + ASSERT_EQ(listSinks.begin()->listMainNotificationConfigurations[2].type,notify.type); } TEST_F(CAmDatabaseHandlerTest,removeNotificationsSink) @@ -2007,9 +2007,9 @@ TEST_F(CAmDatabaseHandlerTest,removeNotificationsSink) std::vector listSinks; am_NotificationConfiguration_s notify; - notify.notificationType=NT_UNKNOWN; - notify.notificationStatus=NS_CHANGE; - notify.notificationParameter=25; + notify.type=NT_UNKNOWN; + notify.status=NS_CHANGE; + notify.parameter=25; testSinkData.listMainNotificationConfigurations.push_back(notify); @@ -2021,9 +2021,9 @@ TEST_F(CAmDatabaseHandlerTest,removeNotificationsSink) ASSERT_EQ(E_OK,pDatabaseHandler.getListSinks(listSinks)) << "ERROR: database error"; - ASSERT_EQ(listSinks.begin()->listMainNotificationConfigurations[2].notificationParameter,notify.notificationParameter); - ASSERT_EQ(listSinks.begin()->listMainNotificationConfigurations[2].notificationStatus,notify.notificationStatus); - ASSERT_EQ(listSinks.begin()->listMainNotificationConfigurations[2].notificationType,notify.notificationType); + ASSERT_EQ(listSinks.begin()->listMainNotificationConfigurations[2].parameter,notify.parameter); + ASSERT_EQ(listSinks.begin()->listMainNotificationConfigurations[2].status,notify.status); + ASSERT_EQ(listSinks.begin()->listMainNotificationConfigurations[2].type,notify.type); //now we remove the sink ASSERT_EQ(E_OK,pDatabaseHandler.removeSinkDB(sinkID)); @@ -2038,9 +2038,9 @@ TEST_F(CAmDatabaseHandlerTest,removeNotificationsSource) std::vector listSources; am_NotificationConfiguration_s notify; - notify.notificationType=NT_UNKNOWN; - notify.notificationStatus=NS_CHANGE; - notify.notificationParameter=25; + notify.type=NT_UNKNOWN; + notify.status=NS_CHANGE; + notify.parameter=25; testSourceData.listMainNotificationConfigurations.push_back(notify); @@ -2052,9 +2052,9 @@ TEST_F(CAmDatabaseHandlerTest,removeNotificationsSource) ASSERT_EQ(E_OK,pDatabaseHandler.getListSources(listSources)) << "ERROR: database error"; - ASSERT_EQ(listSources.begin()->listMainNotificationConfigurations[2].notificationParameter,notify.notificationParameter); - ASSERT_EQ(listSources.begin()->listMainNotificationConfigurations[2].notificationStatus,notify.notificationStatus); - ASSERT_EQ(listSources.begin()->listMainNotificationConfigurations[2].notificationType,notify.notificationType); + ASSERT_EQ(listSources.begin()->listMainNotificationConfigurations[2].parameter,notify.parameter); + ASSERT_EQ(listSources.begin()->listMainNotificationConfigurations[2].status,notify.status); + ASSERT_EQ(listSources.begin()->listMainNotificationConfigurations[2].type,notify.type); //now we remove the sink ASSERT_EQ(E_OK,pDatabaseHandler.removeSourceDB(sourceID)); @@ -2070,16 +2070,16 @@ TEST_F(CAmDatabaseHandlerTest,getMainNotificationsSink) std::vectorreturnList; am_NotificationConfiguration_s notify; - notify.notificationType=NT_UNKNOWN; - notify.notificationStatus=NS_CHANGE; - notify.notificationParameter=25; + notify.type=NT_UNKNOWN; + notify.status=NS_CHANGE; + notify.parameter=25; testSinkData.listMainNotificationConfigurations.push_back(notify); am_NotificationConfiguration_s notify1; - notify1.notificationType=NT_MAX; - notify1.notificationStatus=NS_PERIODIC; - notify1.notificationParameter=5; + notify1.type=NT_MAX; + notify1.status=NS_PERIODIC; + notify1.parameter=5; testSinkData.listMainNotificationConfigurations.push_back(notify1); @@ -2088,7 +2088,7 @@ TEST_F(CAmDatabaseHandlerTest,getMainNotificationsSink) << "ERROR: database error"; //read it again - ASSERT_EQ(E_OK,pDatabaseHandler.getListSinkMainNotificationConfigurations(sinkID,returnList)) + ASSERT_EQ(E_OK,pDatabaseHandler.getListMainSinkNotificationConfigurations(sinkID,returnList)) << "ERROR: database error"; std::equal(testSinkData.listMainNotificationConfigurations.begin(),testSinkData.listMainNotificationConfigurations.end(),returnList.begin(),equalNotificationConfiguration); @@ -2105,16 +2105,16 @@ TEST_F(CAmDatabaseHandlerTest,getMainNotificationsSources) std::vectorreturnList; am_NotificationConfiguration_s notify; - notify.notificationType=NT_UNKNOWN; - notify.notificationStatus=NS_CHANGE; - notify.notificationParameter=25; + notify.type=NT_UNKNOWN; + notify.status=NS_CHANGE; + notify.parameter=25; testSourceData.listMainNotificationConfigurations.push_back(notify); am_NotificationConfiguration_s notify1; - notify1.notificationType=NT_MAX; - notify1.notificationStatus=NS_PERIODIC; - notify1.notificationParameter=5; + notify1.type=NT_MAX; + notify1.status=NS_PERIODIC; + notify1.parameter=5; testSourceData.listMainNotificationConfigurations.push_back(notify1); @@ -2123,7 +2123,7 @@ TEST_F(CAmDatabaseHandlerTest,getMainNotificationsSources) << "ERROR: database error"; //read it again - ASSERT_EQ(E_OK,pDatabaseHandler.getListSourceMainNotificationConfigurations(sourceID,returnList)) + ASSERT_EQ(E_OK,pDatabaseHandler.getListMainSourceNotificationConfigurations(sourceID,returnList)) << "ERROR: database error"; std::equal(testSourceData.listMainNotificationConfigurations.begin(),testSourceData.listMainNotificationConfigurations.end(),returnList.begin(),equalNotificationConfiguration); @@ -2140,21 +2140,21 @@ TEST_F(CAmDatabaseHandlerTest,changeMainNotificationsSources) std::vectorreturnList,returnList1; am_NotificationConfiguration_s notify; - notify.notificationType=NT_UNKNOWN; - notify.notificationStatus=NS_CHANGE; - notify.notificationParameter=25; + notify.type=NT_UNKNOWN; + notify.status=NS_CHANGE; + notify.parameter=25; testSourceData.listMainNotificationConfigurations.push_back(notify); am_NotificationConfiguration_s notify1; - notify1.notificationType=NT_MAX; - notify1.notificationStatus=NS_PERIODIC; - notify1.notificationParameter=5; + notify1.type=NT_MAX; + notify1.status=NS_PERIODIC; + notify1.parameter=5; am_NotificationConfiguration_s notify2; - notify2.notificationType=NT_MAX; - notify2.notificationStatus=NS_CHANGE; - notify2.notificationParameter=10; + notify2.type=NT_MAX; + notify2.status=NS_CHANGE; + notify2.parameter=10; testSourceData.listMainNotificationConfigurations.push_back(notify1); @@ -2163,7 +2163,7 @@ TEST_F(CAmDatabaseHandlerTest,changeMainNotificationsSources) << "ERROR: database error"; //read it again - ASSERT_EQ(E_OK,pDatabaseHandler.getListSourceMainNotificationConfigurations(sourceID,returnList)) + ASSERT_EQ(E_OK,pDatabaseHandler.getListMainSourceNotificationConfigurations(sourceID,returnList)) << "ERROR: database error"; std::equal(testSourceData.listMainNotificationConfigurations.begin(),testSourceData.listMainNotificationConfigurations.end(),returnList.begin(),equalNotificationConfiguration); @@ -2171,12 +2171,12 @@ TEST_F(CAmDatabaseHandlerTest,changeMainNotificationsSources) //change a setting ASSERT_EQ(E_OK,pDatabaseHandler.changeMainSourceNotificationConfigurationDB(sourceID,notify2)); - ASSERT_EQ(E_OK,pDatabaseHandler.getListSourceMainNotificationConfigurations(sourceID,returnList1)) + ASSERT_EQ(E_OK,pDatabaseHandler.getListMainSourceNotificationConfigurations(sourceID,returnList1)) << "ERROR: database error"; - ASSERT_EQ(returnList1[3].notificationParameter,notify2.notificationParameter); - ASSERT_EQ(returnList1[3].notificationStatus,notify2.notificationStatus); - ASSERT_EQ(returnList1[3].notificationType,notify2.notificationType); + ASSERT_EQ(returnList1[3].parameter,notify2.parameter); + ASSERT_EQ(returnList1[3].status,notify2.status); + ASSERT_EQ(returnList1[3].type,notify2.type); } @@ -2190,21 +2190,21 @@ TEST_F(CAmDatabaseHandlerTest,changeMainNotificationsSink) std::vectorreturnList,returnList1; am_NotificationConfiguration_s notify; - notify.notificationType=NT_UNKNOWN; - notify.notificationStatus=NS_CHANGE; - notify.notificationParameter=25; + notify.type=NT_UNKNOWN; + notify.status=NS_CHANGE; + notify.parameter=25; testSinkData.listMainNotificationConfigurations.push_back(notify); am_NotificationConfiguration_s notify1; - notify1.notificationType=NT_MAX; - notify1.notificationStatus=NS_PERIODIC; - notify1.notificationParameter=5; + notify1.type=NT_MAX; + notify1.status=NS_PERIODIC; + notify1.parameter=5; am_NotificationConfiguration_s notify2; - notify2.notificationType=NT_MAX; - notify2.notificationStatus=NS_CHANGE; - notify2.notificationParameter=27; + notify2.type=NT_MAX; + notify2.status=NS_CHANGE; + notify2.parameter=27; testSinkData.listMainNotificationConfigurations.push_back(notify1); @@ -2213,7 +2213,7 @@ TEST_F(CAmDatabaseHandlerTest,changeMainNotificationsSink) << "ERROR: database error"; //read it again - ASSERT_EQ(E_OK,pDatabaseHandler.getListSinkMainNotificationConfigurations(sinkID,returnList)) + ASSERT_EQ(E_OK,pDatabaseHandler.getListMainSinkNotificationConfigurations(sinkID,returnList)) << "ERROR: database error"; std::equal(testSinkData.listMainNotificationConfigurations.begin(),testSinkData.listMainNotificationConfigurations.end(),returnList.begin(),equalNotificationConfiguration); @@ -2221,12 +2221,12 @@ TEST_F(CAmDatabaseHandlerTest,changeMainNotificationsSink) ASSERT_EQ(E_OK,pDatabaseHandler.changeMainSinkNotificationConfigurationDB(sinkID,notify2)) << "ERROR: database error"; - ASSERT_EQ(E_OK,pDatabaseHandler.getListSinkMainNotificationConfigurations(sinkID,returnList1)) + ASSERT_EQ(E_OK,pDatabaseHandler.getListMainSinkNotificationConfigurations(sinkID,returnList1)) << "ERROR: database error"; - ASSERT_EQ(returnList1[3].notificationParameter,notify2.notificationParameter); - ASSERT_EQ(returnList1[3].notificationStatus,notify2.notificationStatus); - ASSERT_EQ(returnList1[3].notificationType,notify2.notificationType); + ASSERT_EQ(returnList1[3].parameter,notify2.parameter); + ASSERT_EQ(returnList1[3].status,notify2.status); + ASSERT_EQ(returnList1[3].type,notify2.type); } //Commented out - gives always a warning.. diff --git a/AudioManagerDaemon/test/CAmCommonFunctions.cpp b/AudioManagerDaemon/test/CAmCommonFunctions.cpp index c1f1af4..8c5821d 100644 --- a/AudioManagerDaemon/test/CAmCommonFunctions.cpp +++ b/AudioManagerDaemon/test/CAmCommonFunctions.cpp @@ -111,7 +111,7 @@ bool equalMainSoundProperty(const am_MainSoundProperty_s a, const am_MainSoundPr bool equalNotificationConfiguration(const am_NotificationConfiguration_s a, const am_NotificationConfiguration_s b) { - return (a.notificationParameter == b.notificationParameter && a.notificationStatus == b.notificationStatus && a.notificationType == b.notificationType); + return (a.parameter == b.parameter && a.status == b.status && a.type == b.type); } bool equalRoutingElement(const am_RoutingElement_s a, const am_RoutingElement_s b) @@ -320,14 +320,14 @@ std::vector am::CAmCommonFunctions::getStandardN { std::vector listNotificationConfigurations; am_NotificationConfiguration_s tempNotificationConfiguration; - tempNotificationConfiguration.notificationParameter=12; - tempNotificationConfiguration.notificationStatus=NS_PERIODIC; - tempNotificationConfiguration.notificationType=NT_MAX; + tempNotificationConfiguration.parameter=12; + tempNotificationConfiguration.status=NS_PERIODIC; + tempNotificationConfiguration.type=NT_MAX; listNotificationConfigurations.push_back(tempNotificationConfiguration); - tempNotificationConfiguration.notificationParameter=16; - tempNotificationConfiguration.notificationStatus=NS_CHANGE; - tempNotificationConfiguration.notificationType=NT_UNKNOWN; + tempNotificationConfiguration.parameter=16; + tempNotificationConfiguration.status=NS_CHANGE; + tempNotificationConfiguration.type=NT_UNKNOWN; listNotificationConfigurations.push_back(tempNotificationConfiguration); return (listNotificationConfigurations); diff --git a/AudioManagerDaemon/test/MockIAmCommandSend.h b/AudioManagerDaemon/test/MockIAmCommandSend.h index 70cdc4f..381f323 100644 --- a/AudioManagerDaemon/test/MockIAmCommandSend.h +++ b/AudioManagerDaemon/test/MockIAmCommandSend.h @@ -29,60 +29,61 @@ namespace am { class MockIAmCommandSend : public IAmCommandSend { public: - MOCK_METHOD1(startupInterface, - am_Error_e(IAmCommandReceive* commandreceiveinterface)); - MOCK_METHOD1(setCommandReady, - void(const uint16_t handle)); - MOCK_METHOD1(setCommandRundown, - void(const uint16_t handle)); - MOCK_METHOD1(cbNewMainConnection, - void(const am_MainConnectionType_s& mainConnection)); - MOCK_METHOD1(cbRemovedMainConnection, - void(const am_mainConnectionID_t mainConnection)); - MOCK_METHOD1(cbNewSink, - void(const am_SinkType_s& sink)); - MOCK_METHOD1(cbRemovedSink, - void(const am_sinkID_t sinkID)); - MOCK_METHOD1(cbNewSource, - void(const am_SourceType_s& source)); - MOCK_METHOD1(cbRemovedSource, - void(const am_sourceID_t source)); - MOCK_METHOD0(cbNumberOfSinkClassesChanged, - void()); - MOCK_METHOD0(cbNumberOfSourceClassesChanged, - void()); - MOCK_METHOD2(cbMainConnectionStateChanged, - void(const am_mainConnectionID_t connectionID, const am_ConnectionState_e connectionState)); - MOCK_METHOD2(cbMainSinkSoundPropertyChanged, - void(const am_sinkID_t sinkID, const am_MainSoundProperty_s& soundProperty)); - MOCK_METHOD2(cbMainSourceSoundPropertyChanged, - void(const am_sourceID_t sourceID, const am_MainSoundProperty_s& soundProperty)); - MOCK_METHOD2(cbSinkAvailabilityChanged, - void(const am_sinkID_t sinkID, const am_Availability_s& availability)); - MOCK_METHOD2(cbSourceAvailabilityChanged, - void(const am_sourceID_t sourceID, const am_Availability_s& availability)); - MOCK_METHOD2(cbVolumeChanged, - void(const am_sinkID_t sinkID, const am_mainVolume_t volume)); - MOCK_METHOD2(cbSinkMuteStateChanged, - void(const am_sinkID_t sinkID, const am_MuteState_e muteState)); - MOCK_METHOD1(cbSystemPropertyChanged, - void(const am_SystemProperty_s& systemProperty)); - MOCK_METHOD2(cbTimingInformationChanged, - void(const am_mainConnectionID_t mainConnectionID, const am_timeSync_t time)); - MOCK_CONST_METHOD1(getInterfaceVersion, - void(std::string& version)); - MOCK_METHOD3(cbSinkUpdated, - void(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector& listMainSoundProperties)); - MOCK_METHOD3(cbSourceUpdated, - void(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector& listMainSoundProperties)); - MOCK_METHOD2(cbSinkNotification, - void(const am_sinkID_t sinkID, const am_NotificationPayload_s notification)); - MOCK_METHOD2(cbSourceNotification, - void(const am_sourceID_t sourceID, const am_NotificationPayload_s notification)); - MOCK_METHOD2(cbSinkMainNotificationConfigurationChanged, - void(const am_sinkID_t sinkID, const am_NotificationConfiguration_s mainNotificationConfiguration)); - MOCK_METHOD2(cbSourceMainNotificationConfigurationChanged, - void(const am_sourceID_t sourceID, const am_NotificationConfiguration_s mainNotificationConfiguration)); + MOCK_CONST_METHOD1(getInterfaceVersion, + void(std::string& version)); + MOCK_METHOD1(startupInterface, + am_Error_e(IAmCommandReceive* commandreceiveinterface)); + MOCK_METHOD1(setCommandReady, + void(const uint16_t handle)); + MOCK_METHOD1(setCommandRundown, + void(const uint16_t handle)); + MOCK_METHOD1(cbNewMainConnection, + void(const am_MainConnectionType_s& mainConnection)); + MOCK_METHOD1(cbRemovedMainConnection, + void(const am_mainConnectionID_t mainConnection)); + MOCK_METHOD1(cbNewSink, + void(const am_SinkType_s& sink)); + MOCK_METHOD1(cbRemovedSink, + void(const am_sinkID_t sinkID)); + MOCK_METHOD1(cbNewSource, + void(const am_SourceType_s& source)); + MOCK_METHOD1(cbRemovedSource, + void(const am_sourceID_t source)); + MOCK_METHOD0(cbNumberOfSinkClassesChanged, + void()); + MOCK_METHOD0(cbNumberOfSourceClassesChanged, + void()); + MOCK_METHOD2(cbMainConnectionStateChanged, + void(const am_mainConnectionID_t connectionID, const am_ConnectionState_e connectionState)); + MOCK_METHOD2(cbMainSinkSoundPropertyChanged, + void(const am_sinkID_t sinkID, const am_MainSoundProperty_s& soundProperty)); + MOCK_METHOD2(cbMainSourceSoundPropertyChanged, + void(const am_sourceID_t sourceID, const am_MainSoundProperty_s& soundProperty)); + MOCK_METHOD2(cbSinkAvailabilityChanged, + void(const am_sinkID_t sinkID, const am_Availability_s& availability)); + MOCK_METHOD2(cbSourceAvailabilityChanged, + void(const am_sourceID_t sourceID, const am_Availability_s& availability)); + MOCK_METHOD2(cbVolumeChanged, + void(const am_sinkID_t sinkID, const am_mainVolume_t volume)); + MOCK_METHOD2(cbSinkMuteStateChanged, + void(const am_sinkID_t sinkID, const am_MuteState_e muteState)); + MOCK_METHOD1(cbSystemPropertyChanged, + void(const am_SystemProperty_s& systemProperty)); + MOCK_METHOD2(cbTimingInformationChanged, + void(const am_mainConnectionID_t mainConnectionID, const am_timeSync_t time)); + MOCK_METHOD3(cbSinkUpdated, + void(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector& listMainSoundProperties)); + MOCK_METHOD3(cbSourceUpdated, + void(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector& listMainSoundProperties)); + MOCK_METHOD2(cbSinkNotification, + void(const am_sinkID_t sinkID, const am_NotificationPayload_s& notification)); + MOCK_METHOD2(cbSourceNotification, + void(const am_sourceID_t sourceID, const am_NotificationPayload_s& notification)); + MOCK_METHOD2(cbMainSinkNotificationConfigurationChanged, + void(const am_sinkID_t sinkID, const am_NotificationConfiguration_s& mainNotificationConfiguration)); + MOCK_METHOD2(cbMainSourceNotificationConfigurationChanged, + void(const am_sourceID_t sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration)); + }; diff --git a/AudioManagerDaemon/test/MockIAmControlSend.h b/AudioManagerDaemon/test/MockIAmControlSend.h index 7f83823..fca6073 100644 --- a/AudioManagerDaemon/test/MockIAmControlSend.h +++ b/AudioManagerDaemon/test/MockIAmControlSend.h @@ -124,31 +124,31 @@ class MockIAmControlSend : public IAmControlSend { 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 listSoundProperties, const std::vector listConnectionFormats, std::vector listMainSoundProperties)); + am_Error_e(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties)); MOCK_METHOD5(hookSystemUpdateSource, - am_Error_e(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector listSoundProperties, const std::vector listConnectionFormats, std::vector listMainSoundProperties)); + am_Error_e(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties)); MOCK_METHOD4(hookSystemUpdateGateway, - am_Error_e(const am_gatewayID_t gatewayID, const std::vector listSourceConnectionFormats, const std::vector listSinkConnectionFormats, const std::vector convertionMatrix)); - MOCK_METHOD3(cbAckSetVolume, - void(const am_Handle_s handle, const std::vector listVolumes, const am_Error_e error)); + am_Error_e(const am_gatewayID_t gatewayID, const std::vector& listSourceConnectionFormats, const std::vector& listSinkConnectionFormats, const std::vector& convertionMatrix)); + MOCK_METHOD3(cbAckSetVolumes, + void(const am_Handle_s handle, const std::vector& 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)); + 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)); + 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)); + 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)); + 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 int32_t seatID, const NsmSessionState_e sessionStateID)); + 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)); diff --git a/PluginCommandInterfaceDbus/include/CAmCommandSenderDbus.h b/PluginCommandInterfaceDbus/include/CAmCommandSenderDbus.h index d8a2a0c..2394a91 100644 --- a/PluginCommandInterfaceDbus/include/CAmCommandSenderDbus.h +++ b/PluginCommandInterfaceDbus/include/CAmCommandSenderDbus.h @@ -67,10 +67,10 @@ public: void getInterfaceVersion(std::string& version) const; void cbSinkUpdated(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector& listMainSoundProperties); void cbSourceUpdated(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector& listMainSoundProperties); - void cbSinkNotification(const am_sinkID_t sinkID, const am_NotificationPayload_s notification); - void cbSourceNotification(const am_sourceID_t sourceID, const am_NotificationPayload_s notification); - void cbSinkMainNotificationConfigurationChanged(const am_sinkID_t sinkID, const am_NotificationConfiguration_s mainNotificationConfiguration); - void cbSourceMainNotificationConfigurationChanged(const am_sourceID_t sourceID, const am_NotificationConfiguration_s mainNotificationConfiguration); + void cbSinkNotification(const am_sinkID_t sinkID, const am_NotificationPayload_s& notification) ; + void cbSourceNotification(const am_sourceID_t sourceID, const am_NotificationPayload_s& notification) ; + void cbMainSinkNotificationConfigurationChanged(const am_sinkID_t sinkID, const am_NotificationConfiguration_s& mainNotificationConfiguration) ; + void cbMainSourceNotificationConfigurationChanged(const am_sourceID_t sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration) ; #ifdef UNIT_TEST friend class CAmCommandSenderDbusBackdoor; diff --git a/PluginCommandInterfaceDbus/include/CAmDbusMessageHandler.h b/PluginCommandInterfaceDbus/include/CAmDbusMessageHandler.h index 582bf51..8360bff 100644 --- a/PluginCommandInterfaceDbus/include/CAmDbusMessageHandler.h +++ b/PluginCommandInterfaceDbus/include/CAmDbusMessageHandler.h @@ -80,7 +80,7 @@ public: double getDouble(); char* getString(); void getProperty(dbus_int16_t& type, dbus_int16_t& value); - void getNotificationConfiguration(dbus_int16_t& notificationType, dbus_int16_t& notificationStatus, dbus_int16_t& notificationParameter); + void getNotificationConfiguration(dbus_int16_t& type, dbus_int16_t& status, dbus_int16_t& parameter); /** * the overloaded append function appends different datatypes to the dbusmessage diff --git a/PluginCommandInterfaceDbus/include/CommandInterface.xml b/PluginCommandInterfaceDbus/include/CommandInterface.xml index 5eb51c7..294a92a 100644 --- a/PluginCommandInterfaceDbus/include/CommandInterface.xml +++ b/PluginCommandInterfaceDbus/include/CommandInterface.xml @@ -103,13 +103,13 @@ - + - + @@ -204,12 +204,12 @@ - + - + diff --git a/PluginCommandInterfaceDbus/src/CAmCommandSenderDbus.cpp b/PluginCommandInterfaceDbus/src/CAmCommandSenderDbus.cpp index 3705c0d..1d5a088 100644 --- a/PluginCommandInterfaceDbus/src/CAmCommandSenderDbus.cpp +++ b/PluginCommandInterfaceDbus/src/CAmCommandSenderDbus.cpp @@ -348,7 +348,7 @@ void am::CAmCommandSenderDbus::cbSourceUpdated(const am_sourceID_t sourceID, con } } -void am::CAmCommandSenderDbus::cbSinkNotification(const am_sinkID_t sinkID, const am_NotificationPayload_s notification) +void am::CAmCommandSenderDbus::cbSinkNotification(const am_sinkID_t sinkID, const am_NotificationPayload_s& notification) { log(&commandDbus, DLT_LOG_INFO, "cbSinkNotification called, sinkID", sinkID); @@ -361,7 +361,7 @@ void am::CAmCommandSenderDbus::cbSinkNotification(const am_sinkID_t sinkID, cons } } -void am::CAmCommandSenderDbus::cbSourceNotification(const am_sourceID_t sourceID, const am_NotificationPayload_s notification) +void am::CAmCommandSenderDbus::cbSourceNotification(const am_sourceID_t sourceID, const am_NotificationPayload_s& notification) { log(&commandDbus, DLT_LOG_INFO, "cbSourceNotification called, sourceID", sourceID); @@ -374,7 +374,7 @@ void am::CAmCommandSenderDbus::cbSourceNotification(const am_sourceID_t sourceID } } -void am::CAmCommandSenderDbus::cbSinkMainNotificationConfigurationChanged(const am_sinkID_t sinkID, const am_NotificationConfiguration_s mainNotificationConfiguration) +void am::CAmCommandSenderDbus::cbMainSinkNotificationConfigurationChanged(const am_sinkID_t sinkID, const am_NotificationConfiguration_s& mainNotificationConfiguration) { log(&commandDbus, DLT_LOG_INFO, "cbSinkMainNotificationConfigurationChanged called, sinkID", sinkID); @@ -387,7 +387,7 @@ void am::CAmCommandSenderDbus::cbSinkMainNotificationConfigurationChanged(const } } -void am::CAmCommandSenderDbus::cbSourceMainNotificationConfigurationChanged(const am_sourceID_t sourceID, const am_NotificationConfiguration_s mainNotificationConfiguration) +void am::CAmCommandSenderDbus::cbMainSourceNotificationConfigurationChanged(const am_sourceID_t sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration) { log(&commandDbus, DLT_LOG_INFO, "cbSourceMainNotificationConfigurationChanged called, sourceID", sourceID); diff --git a/PluginCommandInterfaceDbus/src/CAmDbusMessageHandler.cpp b/PluginCommandInterfaceDbus/src/CAmDbusMessageHandler.cpp index 55169b2..e60923a 100644 --- a/PluginCommandInterfaceDbus/src/CAmDbusMessageHandler.cpp +++ b/PluginCommandInterfaceDbus/src/CAmDbusMessageHandler.cpp @@ -623,7 +623,7 @@ void CAmDbusMessageHandler::append(const std::vector & } } -void CAmDbusMessageHandler::getNotificationConfiguration(dbus_int16_t& notificationType, dbus_int16_t& notificationStatus, dbus_int16_t& notificationParameter) +void CAmDbusMessageHandler::getNotificationConfiguration(dbus_int16_t& type, dbus_int16_t& status, dbus_int16_t& parameter) { DBusMessageIter arrayIter; if (DBUS_TYPE_STRUCT != dbus_message_iter_get_arg_type(&mDBusMessageIter)) @@ -635,11 +635,11 @@ void CAmDbusMessageHandler::getNotificationConfiguration(dbus_int16_t& notificat else { dbus_message_iter_recurse(&mDBusMessageIter, &arrayIter); - dbus_message_iter_get_basic(&arrayIter, ¬ificationType); + dbus_message_iter_get_basic(&arrayIter, &type); dbus_message_iter_next(&arrayIter); - dbus_message_iter_get_basic(&arrayIter, ¬ificationStatus); + dbus_message_iter_get_basic(&arrayIter, &status); dbus_message_iter_next(&arrayIter); - dbus_message_iter_get_basic(&arrayIter, ¬ificationParameter); + dbus_message_iter_get_basic(&arrayIter, ¶meter); dbus_message_iter_next(&mDBusMessageIter); } } @@ -655,9 +655,9 @@ void CAmDbusMessageHandler::append(const std::vectornotificationType); - success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, &listIterator->notificationStatus); - success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, &listIterator->notificationParameter); + success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, &listIterator->type); + success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, &listIterator->status); + success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, &listIterator->parameter); success = success && dbus_message_iter_close_container(&arrayIter, &structIter); } success = success && dbus_message_iter_close_container(&mDBusMessageIter, &arrayIter); @@ -675,8 +675,8 @@ void CAmDbusMessageHandler::append(const am::am_NotificationPayload_s& notificat DBusMessageIter structIter; dbus_bool_t success = true; success = success && dbus_message_iter_open_container(&mDBusMessageIter, DBUS_TYPE_STRUCT, NULL, &structIter); - success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, ¬ificationPayload.notificationType); - success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, ¬ificationPayload.notificationValue); + success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, ¬ificationPayload.type); + success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, ¬ificationPayload.value); success = success && dbus_message_iter_close_container(&mDBusMessageIter, &structIter); if (!success) @@ -692,9 +692,9 @@ void CAmDbusMessageHandler::append(const am::am_NotificationConfiguration_s& not DBusMessageIter structIter; dbus_bool_t success = true; success = success && dbus_message_iter_open_container(&mDBusMessageIter, DBUS_TYPE_STRUCT, NULL, &structIter); - success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, ¬ificationConfiguration.notificationType); - success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, ¬ificationConfiguration.notificationStatus); - success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, ¬ificationConfiguration.notificationParameter); + success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, ¬ificationConfiguration.type); + success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, ¬ificationConfiguration.status); + success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, ¬ificationConfiguration.parameter); success = success && dbus_message_iter_close_container(&mDBusMessageIter, &structIter); if (!success) diff --git a/PluginCommandInterfaceDbus/src/IAmCommandReceiverShadow.cpp b/PluginCommandInterfaceDbus/src/IAmCommandReceiverShadow.cpp index 42a669d..4dcc0f1 100644 --- a/PluginCommandInterfaceDbus/src/IAmCommandReceiverShadow.cpp +++ b/PluginCommandInterfaceDbus/src/IAmCommandReceiverShadow.cpp @@ -426,7 +426,7 @@ void am::IAmCommandReceiverShadow::getListSinkMainNotificationConfigurations(DBu mDBUSMessageHandler.initReceive(msg); am_sinkID_t sinkID = static_cast(mDBUSMessageHandler.getUInt()); std::vector listNotificationConfigurations; - am_Error_e returnCode = mpIAmCommandReceive->getListSinkMainNotificationConfigurations(sinkID,listNotificationConfigurations); + am_Error_e returnCode = mpIAmCommandReceive->getListMainSinkNotificationConfigurations(sinkID,listNotificationConfigurations); mDBUSMessageHandler.initReply(msg); mDBUSMessageHandler.append((dbus_int16_t) returnCode); mDBUSMessageHandler.append(listNotificationConfigurations); @@ -443,7 +443,7 @@ void am::IAmCommandReceiverShadow::getListSourceMainNotificationConfigurations(D mDBUSMessageHandler.initReceive(msg); am_sourceID_t sourceID = static_cast(mDBUSMessageHandler.getUInt()); std::vector listNotificationConfigurations; - am_Error_e returnCode = mpIAmCommandReceive->getListSourceMainNotificationConfigurations(sourceID,listNotificationConfigurations); + am_Error_e returnCode = mpIAmCommandReceive->getListMainSourceNotificationConfigurations(sourceID,listNotificationConfigurations); mDBUSMessageHandler.initReply(msg); mDBUSMessageHandler.append((dbus_int16_t) returnCode); mDBUSMessageHandler.append(listNotificationConfigurations); @@ -465,10 +465,10 @@ void am::IAmCommandReceiverShadow::setSinkMainNotificationConfiguration(DBusConn dbus_int16_t parameter = 0; mDBUSMessageHandler.getNotificationConfiguration(type, status, parameter); am_NotificationConfiguration_s mainNotificationConfiguration; - mainNotificationConfiguration.notificationType = static_cast (type); - mainNotificationConfiguration.notificationStatus = static_cast (status); - mainNotificationConfiguration.notificationParameter = static_cast(parameter); - am_Error_e returnCode = mpIAmCommandReceive->setSinkMainNotificationConfiguration(sinkID,mainNotificationConfiguration); + mainNotificationConfiguration.type = static_cast (type); + mainNotificationConfiguration.status = static_cast (status); + mainNotificationConfiguration.parameter = static_cast(parameter); + am_Error_e returnCode = mpIAmCommandReceive->setMainSinkNotificationConfiguration(sinkID,mainNotificationConfiguration); mDBUSMessageHandler.initReply(msg); mDBUSMessageHandler.append((dbus_int16_t) returnCode); mDBUSMessageHandler.sendMessage(); @@ -488,10 +488,10 @@ void am::IAmCommandReceiverShadow::setSourceMainNotificationConfiguration(DBusCo dbus_int16_t parameter = 0; mDBUSMessageHandler.getNotificationConfiguration(type, status, parameter); am_NotificationConfiguration_s mainNotificationConfiguration; - mainNotificationConfiguration.notificationType = static_cast (type); - mainNotificationConfiguration.notificationStatus = static_cast (status); - mainNotificationConfiguration.notificationParameter = static_cast(parameter); - am_Error_e returnCode = mpIAmCommandReceive->setSourceMainNotificationConfiguration(sourceID,mainNotificationConfiguration); + mainNotificationConfiguration.type = static_cast (type); + mainNotificationConfiguration.status = static_cast (status); + mainNotificationConfiguration.parameter = static_cast(parameter); + am_Error_e returnCode = mpIAmCommandReceive->setMainSourceNotificationConfiguration(sourceID,mainNotificationConfiguration); mDBUSMessageHandler.initReply(msg); mDBUSMessageHandler.append((dbus_int16_t) returnCode); mDBUSMessageHandler.sendMessage(); diff --git a/PluginCommandInterfaceDbus/test/MockIAmCommandReceive.h b/PluginCommandInterfaceDbus/test/MockIAmCommandReceive.h index ce1dcc4..cf70aa8 100644 --- a/PluginCommandInterfaceDbus/test/MockIAmCommandReceive.h +++ b/PluginCommandInterfaceDbus/test/MockIAmCommandReceive.h @@ -70,14 +70,15 @@ class MockIAmCommandReceive : public IAmCommandReceive { void(const uint16_t handle, const am_Error_e error)); MOCK_METHOD2(confirmCommandRundown, void(const uint16_t handle, const am_Error_e error)); - MOCK_CONST_METHOD2(getListSinkMainNotificationConfigurations, + MOCK_CONST_METHOD2(getListMainSinkNotificationConfigurations, am_Error_e(const am_sinkID_t sinkID, std::vector& listMainNotificationConfigurations)); - MOCK_CONST_METHOD2(getListSourceMainNotificationConfigurations, + MOCK_CONST_METHOD2(getListMainSourceNotificationConfigurations, am_Error_e(const am_sourceID_t sourceID, std::vector& listMainNotificationConfigurations)); - MOCK_METHOD2(setSinkMainNotificationConfiguration, - am_Error_e(const am_sinkID_t sinkID, const am_NotificationConfiguration_s mainNotificationConfiguration)); - MOCK_METHOD2(setSourceMainNotificationConfiguration, - am_Error_e(const am_sourceID_t sourceID, const am_NotificationConfiguration_s mainNotificationConfiguration)); + MOCK_METHOD2(setMainSinkNotificationConfiguration, + am_Error_e(const am_sinkID_t sinkID, const am_NotificationConfiguration_s& mainNotificationConfiguration)); + MOCK_METHOD2(setMainSourceNotificationConfiguration, + am_Error_e(const am_sourceID_t sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration)); + }; 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 listSoundProperties, const std::vector listConnectionFormats, std::vector listMainSoundProperties) ; - am_Error_e 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 hookSystemUpdateGateway(const am_gatewayID_t gatewayID, const std::vector listSourceConnectionFormats, const std::vector listSinkConnectionFormats, const std::vector convertionMatrix) ; - void cbAckSetVolume(const am_Handle_s handle, const std::vector listVolumes, const am_Error_e error) ; + am_Error_e hookSystemUpdateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties) ; + am_Error_e hookSystemUpdateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties) ; + am_Error_e hookSystemUpdateGateway(const am_gatewayID_t gatewayID, const std::vector& listSourceConnectionFormats, const std::vector& listSinkConnectionFormats, const std::vector& convertionMatrix) ; + void cbAckSetVolumes(const am_Handle_s handle, const std::vector& 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 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() 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 listSoundProperties, const std::vector listConnectionFormats, const std::vector listMainSoundProperties)); + am_Error_e(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties)); MOCK_METHOD5(changeSinkDB, - am_Error_e(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector listSoundProperties, const std::vector listConnectionFormats, const std::vector listMainSoundProperties)); + am_Error_e(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties)); MOCK_METHOD4(changeGatewayDB, - am_Error_e(const am_gatewayID_t gatewayID, const std::vector listSourceConnectionFormats, const std::vector listSinkConnectionFormats, const std::vector convertionMatrix)); + am_Error_e(const am_gatewayID_t gatewayID, const std::vector& listSourceConnectionFormats, const std::vector& listSinkConnectionFormats, const std::vector& convertionMatrix)); MOCK_METHOD2(setVolumes, - am_Error_e(am_Handle_s& handle, const std::vector listVolumes)); + am_Error_e(am_Handle_s& handle, const std::vector& 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)); }; diff --git a/PluginRoutingInterfaceAsync/test/MockIAmRoutingReceive.h b/PluginRoutingInterfaceAsync/test/MockIAmRoutingReceive.h index 1dafefc..d9507ab 100644 --- a/PluginRoutingInterfaceAsync/test/MockIAmRoutingReceive.h +++ b/PluginRoutingInterfaceAsync/test/MockIAmRoutingReceive.h @@ -103,21 +103,21 @@ class MockIAmRoutingReceive : public IAmRoutingReceive { MOCK_METHOD2(confirmRoutingRundown, void(const uint16_t handle, const am_Error_e error)); MOCK_METHOD4(updateGateway, - am_Error_e(const am_gatewayID_t gatewayID, std::vector listSourceFormats, const std::vector listSinkFormats, std::vector convertionMatrix)); + am_Error_e(const am_gatewayID_t gatewayID, const std::vector& listSourceFormats, const std::vector& listSinkFormats, const std::vector& convertionMatrix)); MOCK_METHOD5(updateSink, - am_Error_e(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector listSoundProperties, const std::vector listConnectionFormats, std::vector listMainSoundProperties)); + am_Error_e(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties)); MOCK_METHOD5(updateSource, - am_Error_e(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, std::vector listSoundProperties, std::vector listConnectionFormats, const std::vector listMainSoundProperties)); + am_Error_e(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties)); MOCK_METHOD3(ackSetVolumes, - void(const am_Handle_s handle, const std::vector listvolumes, const am_Error_e error)); + void(const am_Handle_s handle, const std::vector& listvolumes, const am_Error_e error)); MOCK_METHOD2(ackSinkNotificationConfiguration, void(const am_Handle_s handle, const am_Error_e error)); MOCK_METHOD2(ackSourceNotificationConfiguration, void(const am_Handle_s handle, const am_Error_e error)); MOCK_METHOD2(hookSinkNotificationDataChange, - void(const am_sinkID_t sinkID, const am_NotificationPayload_s payload)); + void(const am_sinkID_t sinkID, const am_NotificationPayload_s& payload)); MOCK_METHOD2(hookSourceNotificationDataChange, - void(const am_sourceID_t sourceID, const am_NotificationPayload_s payload)); + void(const am_sourceID_t sourceID, const am_NotificationPayload_s& payload)); }; diff --git a/PluginRoutingInterfaceDbus/src/CAmDbusMessageHandler.cpp b/PluginRoutingInterfaceDbus/src/CAmDbusMessageHandler.cpp index 86d840b..82f912a 100644 --- a/PluginRoutingInterfaceDbus/src/CAmDbusMessageHandler.cpp +++ b/PluginRoutingInterfaceDbus/src/CAmDbusMessageHandler.cpp @@ -277,7 +277,7 @@ am::am_Availability_s CAmRoutingDbusMessageHandler::getAvailability() { DBusMessageIter structIter; dbus_message_iter_recurse(&mDBusMessageIter, &structIter); - availability.availability = static_cast(getInt(structIter, true)); + availability.availability = static_cast(getInt(structIter, true)); availability.availabilityReason = static_cast(getInt(structIter, false)); dbus_message_iter_next(&mDBusMessageIter); } @@ -360,7 +360,7 @@ am_Source_s CAmRoutingDbusMessageHandler::getSourceData() sourceData.volume = static_cast(getInt()); sourceData.visible = getBool(); dbus_message_iter_recurse(&mDBusMessageIter, &availIter); - sourceData.available.availability = static_cast(getInt(availIter, true)); + sourceData.available.availability = static_cast(getInt(availIter, true)); sourceData.available.availabilityReason = static_cast(getInt(availIter, false)); dbus_message_iter_next(&mDBusMessageIter); sourceData.interruptState = static_cast(getUInt()); @@ -406,7 +406,7 @@ am_Sink_s CAmRoutingDbusMessageHandler::getSinkData() sinkData.volume = static_cast(getInt()); sinkData.visible = getBool(); dbus_message_iter_recurse(&mDBusMessageIter, &availIter); - sinkData.available.availability = static_cast(getInt(availIter, true)); + sinkData.available.availability = static_cast(getInt(availIter, true)); sinkData.available.availabilityReason = static_cast(getInt(availIter, false)); dbus_message_iter_next(&mDBusMessageIter); sinkData.muteState = static_cast(getInt()); diff --git a/exampleCode/player/audiomanagertypes.h b/exampleCode/player/audiomanagertypes.h index 3fa3137..8ac58b7 100755 --- a/exampleCode/player/audiomanagertypes.h +++ b/exampleCode/player/audiomanagertypes.h @@ -139,7 +139,7 @@ namespace am { * @author Christian Mueller * @created 07-Mar-2012 6:06:14 PM */ - enum am_Availablility_e + enum am_Availability_e { /** * default @@ -427,7 +427,7 @@ namespace am { /** * the current availability state */ - am_Availablility_e availability; + am_Availability_e availability; /** * the reason for the last change. This can be used to trigger events that deal * with state changes. diff --git a/exampleCode/player/dbushandler.cpp b/exampleCode/player/dbushandler.cpp index c449d93..1e8cd80 100644 --- a/exampleCode/player/dbushandler.cpp +++ b/exampleCode/player/dbushandler.cpp @@ -605,7 +605,7 @@ am_Error_e DbusHandler::GetListMainSinks(std::vector &listSinks) fprintf(stderr, "*****************************************\n"); TempSink.sinkID=SinkID; TempSink.name=Sinkname; - TempSink.availability.availability=static_cast(availability); + TempSink.availability.availability=static_cast(availability); TempSink.availability.availabilityReason=static_cast(availability_reason); TempSink.sinkClassID=SinkClassID; TempSink.volume=volume; @@ -674,7 +674,7 @@ am_Error_e DbusHandler::GetListMainSources(std::vector &listSou fprintf(stderr, "*****************************************\n"); TempSource.sourceID=sourceID; TempSource.name=sourcename; - TempSource.availability.availability=static_cast(availability); + TempSource.availability.availability=static_cast(availability); TempSource.availability.availabilityReason=static_cast(availability_reason); TempSource.sourceClassID=SourceClassID; listSources.push_back(TempSource); diff --git a/include/audiomanagertypes.h b/include/audiomanagertypes.h old mode 100644 new mode 100755 index 8e4bf41..cf57933 --- a/include/audiomanagertypes.h +++ b/include/audiomanagertypes.h @@ -19,11 +19,10 @@ * * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN */ -#if !defined(EA_4739DD27_2A1B_4548_8F5F_7D50DB15209C__INCLUDED_) -#define EA_4739DD27_2A1B_4548_8F5F_7D50DB15209C__INCLUDED_ +#if !defined(EA_E6597B7D_75F2_4586_A193_B3C4EA5C6548__INCLUDED_) +#define EA_E6597B7D_75F2_4586_A193_B3C4EA5C6548__INCLUDED_ #include -#include "projecttypes.h" #include #include @@ -35,63 +34,63 @@ namespace am { /** * a domain ID * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ typedef uint16_t am_domainID_t; /** * a source ID * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ typedef uint16_t am_sourceID_t; /** * a sink ID * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ typedef uint16_t am_sinkID_t; /** * a gateway ID * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ typedef uint16_t am_gatewayID_t; /** * a crossfader ID * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ typedef uint16_t am_crossfaderID_t; /** * a connection ID * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ typedef uint16_t am_connectionID_t; /** * a mainConnection ID * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ typedef uint16_t am_mainConnectionID_t; /** * speed * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ typedef uint16_t am_speed_t; /** * The unit is 0.1 db steps,The smallest value -3000 (=AM_MUTE). The minimum and maximum can be limited by actual project. * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ typedef int16_t am_volume_t; @@ -100,40 +99,40 @@ namespace am { * here into meaningful values on the routing interface. * The range of this type is customer specific. * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ typedef int16_t am_mainVolume_t; /** * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ typedef uint16_t am_sourceClass_t; /** * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ typedef uint16_t am_sinkClass_t; /** * time in ms! * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ typedef uint16_t am_time_t; /** * offset time that is introduced in milli seconds. * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ typedef int16_t am_timeSync_t; /** * describes the active sink of a crossfader. * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ enum am_HotSink_e { @@ -159,9 +158,9 @@ namespace am { /** * with the help of this enum, sinks and sources can report their availability state * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ - enum am_Availablility_e + enum am_Availability_e { /** * default @@ -181,7 +180,7 @@ namespace am { /** * represents the connection state * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ enum am_ConnectionState_e { @@ -211,7 +210,7 @@ namespace am { /** * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ enum am_DomainState_e { @@ -237,7 +236,7 @@ namespace am { /** * This enum characterizes the data of the EarlyData_t * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ enum am_EarlyDataType_e { @@ -267,7 +266,7 @@ namespace am { /** * the errors of the audiomanager. All possible errors are in here. This enum is used widely as return parameter. * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ enum am_Error_e { @@ -321,7 +320,7 @@ namespace am { /** * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ enum am_MuteState_e { @@ -343,7 +342,7 @@ namespace am { /** * The source state reflects the state of the source * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ enum am_SourceState_e { @@ -366,7 +365,7 @@ namespace am { /** * This enumeration is used to define the type of the action that is correlated to a handle. * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ enum am_Handle_e { @@ -389,7 +388,7 @@ namespace am { /** * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ enum am_InterruptState_e { @@ -412,7 +411,7 @@ namespace am { * This datatype determines if a sourceID or a sinkID is used in the union following * @author q232968 * @version 1.0 - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ enum am_VolumeType_e { @@ -431,7 +430,7 @@ namespace am { /** * @author q232968 * @version 1.0 - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ enum am_NotificationStatus_e { @@ -453,7 +452,8 @@ namespace am { */ NS_MAXIMUM = 4, /** - * The notification is sent out whena change happend. The Resolution of the change is defined by am_NotificationParameter. + * The notification is sent out when a change happened. The Resolution of the change is defined by + * am_NotificationParameter. */ NS_CHANGE = 5, NS_MAX @@ -462,7 +462,7 @@ namespace am { /** * this describes the availability of a sink or a source together with the latest change * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ struct am_Availability_s { @@ -471,7 +471,7 @@ namespace am { /** * the current availability state */ - am_Availablility_e availability; + am_Availability_e availability; /** * the reason for the last change. This can be used to trigger events that deal with state changes. */ @@ -482,7 +482,7 @@ namespace am { /** * describes class properties * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ struct am_ClassProperty_s { @@ -502,7 +502,7 @@ namespace am { /** * This struct describes the attribiutes of a crossfader. * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ struct am_Crossfader_s { @@ -545,7 +545,7 @@ namespace am { /** * This struct describes the attributes of a gateway. * @author Christian Mueller - * @created 16-Dez-2012 15:58:12 + * @created 17-Jan-2013 10:00:22 */ struct am_Gateway_s { @@ -630,7 +630,7 @@ namespace am { /** * This represents one "hopp" in a route * @author Christian Mueller - * @created 16-Dez-2012 15:58:13 + * @created 17-Jan-2013 10:00:22 */ struct am_RoutingElement_s { @@ -658,7 +658,7 @@ namespace am { /** * a list of routing elements that lead from source to sink * @author Christian Mueller - * @created 16-Dez-2012 15:58:13 + * @created 17-Jan-2013 10:00:22 */ struct am_Route_s { @@ -682,7 +682,7 @@ namespace am { /** * struct describing the sound property * @author Christian Mueller - * @created 16-Dez-2012 15:58:13 + * @created 17-Jan-2013 10:00:22 */ struct am_SoundProperty_s { @@ -702,7 +702,7 @@ namespace am { /** * struct describing system properties * @author Christian Mueller - * @created 16-Dez-2012 15:58:13 + * @created 17-Jan-2013 10:00:22 */ struct am_SystemProperty_s { @@ -722,7 +722,7 @@ namespace am { /** * struct describing sinkclasses * @author Christian Mueller - * @created 16-Dez-2012 15:58:13 + * @created 17-Jan-2013 10:00:22 */ struct am_SinkClass_s { @@ -747,7 +747,7 @@ namespace am { /** * struct describing source classes * @author Christian Mueller - * @created 16-Dez-2012 15:58:13 + * @created 17-Jan-2013 10:00:22 */ struct am_SourceClass_s { @@ -772,7 +772,7 @@ namespace am { /** * this type holds all information of sources relevant to the HMI * @author Christian Mueller - * @created 16-Dez-2012 15:58:13 + * @created 17-Jan-2013 10:00:23 */ struct am_SourceType_s { @@ -803,7 +803,7 @@ namespace am { /** * this type holds all information of sinks relevant to the HMI * @author Christian Mueller - * @created 16-Dez-2012 15:58:13 + * @created 17-Jan-2013 10:00:23 */ struct am_SinkType_s { @@ -846,7 +846,7 @@ namespace am { /** * a handle is used for asynchronous operations and is uniquely assigned for each of this operations * @author Christian Mueller - * @created 16-Dez-2012 15:58:13 + * @created 17-Jan-2013 10:00:23 */ struct am_Handle_s { @@ -866,7 +866,7 @@ namespace am { /** * struct describung mainsound property * @author Christian Mueller - * @created 16-Dez-2012 15:58:13 + * @created 17-Jan-2013 10:00:23 */ struct am_MainSoundProperty_s { @@ -886,7 +886,7 @@ namespace am { /** * this type holds all information of connections relevant to the HMI * @author Christian Mueller - * @created 16-Dez-2012 15:58:13 + * @created 17-Jan-2013 10:00:23 */ struct am_MainConnectionType_s { @@ -918,7 +918,7 @@ namespace am { /** * struct that holds attribiutes of a mainconnection * @author Christian Mueller - * @created 16-Dez-2012 15:58:13 + * @created 17-Jan-2013 10:00:23 */ struct am_MainConnection_s { @@ -955,7 +955,7 @@ namespace am { * This struct holds the payload of a notification. * @author q232968 * @version 1.0 - * @created 16-Dez-2012 15:58:13 + * @created 17-Jan-2013 10:00:23 */ struct am_NotificationPayload_s { @@ -964,11 +964,11 @@ namespace am { /** * This defines the notification type */ - am_NotificationType_e notificationType; + am_NotificationType_e type; /** * This is finally the value of the notification. It's meaning depends on the notificationType */ - int16_t notificationValue; + int16_t value; }; @@ -976,7 +976,7 @@ namespace am { * This struct holds information about the configuration for notifications * @author q232968 * @version 1.0 - * @created 16-Dez-2012 15:58:13 + * @created 17-Jan-2013 10:00:23 */ struct am_NotificationConfiguration_s { @@ -985,11 +985,11 @@ namespace am { /** * The notification type of the notification */ - am_NotificationType_e notificationType; + am_NotificationType_e type; /** * The Notification status. This can be periodic, min/max value based or even off for example */ - am_NotificationStatus_e notificationStatus; + am_NotificationStatus_e status; /** * This gives additional information to the notification status. * Relation between notification status and the value: @@ -998,14 +998,14 @@ namespace am { * NS_MAXIMUM - the maximum value that triggers the notifcation * NS_CHANGE - the resolution of the change value */ - int16_t notificationParameter; + int16_t parameter; }; /** * This struct describes the attribiutes of a sink * @author Christian Mueller - * @created 16-Dez-2012 15:58:13 + * @created 17-Jan-2013 10:00:23 */ struct am_Sink_s { @@ -1089,7 +1089,7 @@ namespace am { /** * This struct describes the attribiutes of a source * @author Christian Mueller - * @created 16-Dez-2012 15:58:14 + * @created 17-Jan-2013 10:00:23 */ struct am_Source_s { @@ -1185,7 +1185,7 @@ namespace am { /** * This struct describes the attribiutes of a domain * @author Christian Mueller - * @created 16-Dez-2012 15:58:14 + * @created 17-Jan-2013 10:00:23 */ struct am_Domain_s { @@ -1225,7 +1225,7 @@ namespace am { /** * a connection * @author Christian Mueller - * @created 16-Dez-2012 15:58:14 + * @created 17-Jan-2013 10:00:23 */ struct am_Connection_s { @@ -1259,7 +1259,7 @@ namespace am { * volume_t in case of ED_SOURCE_VOLUME, ED_SINK_VOLUME * soundProperty_t in case of ED_SOURCE_PROPERTY, ED_SINK_PROPERTY * @author Christian Mueller - * @created 16-Dez-2012 15:58:14 + * @created 17-Jan-2013 10:00:23 */ union am_EarlyData_u { @@ -1275,7 +1275,7 @@ namespace am { * sourceID in case of ED_SOURCE_VOLUME, ED_SOURCE_PROPERTY * sinkID in case of ED_SINK_VOLUME, ED_SINK_PROPERTY * @author Christian Mueller - * @created 16-Dez-2012 15:58:14 + * @created 17-Jan-2013 10:00:23 */ union am_DataType_u { @@ -1288,7 +1288,7 @@ namespace am { /** * @author Christian Mueller - * @created 16-Dez-2012 15:58:14 + * @created 17-Jan-2013 10:00:23 */ struct am_EarlyData_s { @@ -1304,7 +1304,7 @@ namespace am { * This types describe a mixed description for source and sinks volumes. * @author q232968 * @version 1.0 - * @created 16-Dez-2012 15:58:14 + * @created 17-Jan-2013 10:00:24 */ struct am_Volumes_s { @@ -1333,4 +1333,4 @@ namespace am { }; } -#endif // !defined(EA_4739DD27_2A1B_4548_8F5F_7D50DB15209C__INCLUDED_) +#endif // !defined(EA_E6597B7D_75F2_4586_A193_B3C4EA5C6548__INCLUDED_) diff --git a/include/command/IAmCommandReceive.h b/include/command/IAmCommandReceive.h index 5a1a06c..c99fde6 100644 --- a/include/command/IAmCommandReceive.h +++ b/include/command/IAmCommandReceive.h @@ -19,8 +19,8 @@ * * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN */ -#if !defined(EA_3888D932_2C16_4c2a_BD7C_E1F819C9A7F0__INCLUDED_) -#define EA_3888D932_2C16_4c2a_BD7C_E1F819C9A7F0__INCLUDED_ +#if !defined(EA_52591199_D6BE_451e_92F8_032DA5493EF4__INCLUDED_) +#define EA_52591199_D6BE_451e_92F8_032DA5493EF4__INCLUDED_ #include #include @@ -47,7 +47,7 @@ namespace am { * call pattern described on the wiki which also helps to implement calls that are forbidden.\n * For more information, please check CAmSerializer * @author Christian Mueller - * @created 16-Dez-2012 15:58:14 + * @created 17-Jan-2013 10:00:24 */ class IAmCommandReceive { @@ -232,36 +232,38 @@ namespace am { */ virtual void confirmCommandRundown(const uint16_t handle, const am_Error_e error) =0; /** - * Rtrieves the list of MainNotifications for a sink. + * Retrieves the list of MainNotifications for a sink. Does not return the possible ones. * * @param sinkID The sinkID * @param listMainNotificationConfigurations */ - virtual am_Error_e getListSinkMainNotificationConfigurations(const am_sinkID_t sinkID, std::vector& listMainNotificationConfigurations) const =0; + virtual am_Error_e getListMainSinkNotificationConfigurations(const am_sinkID_t sinkID, std::vector& listMainNotificationConfigurations) const =0; /** - * Rtrieves the list of MainNotifications for a source. + * Retrieves the list of MainNotifications for a source. Does not return the possible ones. * * @param sourceID The sourceID * @param listMainNotificationConfigurations */ - virtual am_Error_e getListSourceMainNotificationConfigurations(const am_sourceID_t sourceID, std::vector& listMainNotificationConfigurations) const =0; + virtual am_Error_e getListMainSourceNotificationConfigurations(const am_sourceID_t sourceID, std::vector& listMainNotificationConfigurations) const =0; /** * sets a MainNotificationConfiuration. This can be used to turn on an off notifications an to change the mode of the * configuration. + * @return E_OK on success, E_NON_EXISTENT if sinkID does not exists, E_DATABASE_ERROR on error * * @param sinkID The sinkID of the MainNotification to be changed * @param mainNotificationConfiguration The MainNotifiication that needs to be set */ - virtual am_Error_e setSinkMainNotificationConfiguration(const am_sinkID_t sinkID, const am_NotificationConfiguration_s mainNotificationConfiguration) =0; + virtual am_Error_e setMainSinkNotificationConfiguration(const am_sinkID_t sinkID, const am_NotificationConfiguration_s& mainNotificationConfiguration) =0; /** * sets a MainNotificationConfiuration. This can be used to turn on an off notifications an to change the mode of the * configuration. + * @return E_OK on success, E_NON_EXISTENT if sourceID does not exists, E_DATABASE_ERROR on error * * @param sourceID The sourceID of the MainNotification to be changed * @param mainNotificationConfiguration The MainNotifiication that needs to be set */ - virtual am_Error_e setSourceMainNotificationConfiguration(const am_sourceID_t sourceID, const am_NotificationConfiguration_s mainNotificationConfiguration) =0; + virtual am_Error_e setMainSourceNotificationConfiguration(const am_sourceID_t sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration) =0; }; } -#endif // !defined(EA_3888D932_2C16_4c2a_BD7C_E1F819C9A7F0__INCLUDED_) +#endif // !defined(EA_52591199_D6BE_451e_92F8_032DA5493EF4__INCLUDED_) diff --git a/include/command/IAmCommandSend.h b/include/command/IAmCommandSend.h index ce32131..15577ed 100644 --- a/include/command/IAmCommandSend.h +++ b/include/command/IAmCommandSend.h @@ -19,8 +19,8 @@ * * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN */ -#if !defined(EA_B053C89D_3921_4e1a_836D_C3B98FAD2E36__INCLUDED_) -#define EA_B053C89D_3921_4e1a_836D_C3B98FAD2E36__INCLUDED_ +#if !defined(EA_37AC20B5_5E6D_4a3f_BA5F_B3F3CBB21C36__INCLUDED_) +#define EA_37AC20B5_5E6D_4a3f_BA5F_B3F3CBB21C36__INCLUDED_ #include #include @@ -49,7 +49,7 @@ namespace am { * call pattern described on the wiki which also helps to implement calls that are forbidden.\n * For more information, please check CAmSerializer * @author Christian Mueller - * @created 16-Dez-2012 15:58:14 + * @created 17-Jan-2013 10:00:24 */ class IAmCommandSend { @@ -222,34 +222,34 @@ namespace am { */ virtual void cbSourceUpdated(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector& listMainSoundProperties) =0; /** - * This callback is called when a notifcated value of a sink changes. + * This callback is called when a notificated value of a sink changes. * * @param sinkID The sinkID * @param notification The payload of the notification */ - virtual void cbSinkNotification(const am_sinkID_t sinkID, const am_NotificationPayload_s notification) =0; + virtual void cbSinkNotification(const am_sinkID_t sinkID, const am_NotificationPayload_s& notification) =0; /** * This callback is called when a notifcated value of a source changes. * * @param sourceID The sourceID * @param notification The payload of the notification */ - virtual void cbSourceNotification(const am_sourceID_t sourceID, const am_NotificationPayload_s notification) =0; + virtual void cbSourceNotification(const am_sourceID_t sourceID, const am_NotificationPayload_s& notification) =0; /** * This callback is triggered when a mainNotificationConfiguration is changed. * * @param sinkID * @param mainNotificationConfiguration The MainNotificationConfiguration that changed */ - virtual void cbSinkMainNotificationConfigurationChanged(const am_sinkID_t sinkID, const am_NotificationConfiguration_s mainNotificationConfiguration) =0; + virtual void cbMainSinkNotificationConfigurationChanged(const am_sinkID_t sinkID, const am_NotificationConfiguration_s& mainNotificationConfiguration) =0; /** * This callback is triggered when a mainNotificationConfiguration is changed. * * @param sourceID * @param mainNotificationConfiguration The MainNotificationConfiguration that changed */ - virtual void cbSourceMainNotificationConfigurationChanged(const am_sourceID_t sourceID, const am_NotificationConfiguration_s mainNotificationConfiguration) =0; + virtual void cbMainSourceNotificationConfigurationChanged(const am_sourceID_t sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration) =0; }; } -#endif // !defined(EA_B053C89D_3921_4e1a_836D_C3B98FAD2E36__INCLUDED_) +#endif // !defined(EA_37AC20B5_5E6D_4a3f_BA5F_B3F3CBB21C36__INCLUDED_) diff --git a/include/control/IAmControlReceive.h b/include/control/IAmControlReceive.h index ccba927..b5ed674 100644 --- a/include/control/IAmControlReceive.h +++ b/include/control/IAmControlReceive.h @@ -19,8 +19,8 @@ * * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN */ -#if !defined(EA_AC2A0532_F989_4f95_A467_1055C94D9C1E__INCLUDED_) -#define EA_AC2A0532_F989_4f95_A467_1055C94D9C1E__INCLUDED_ +#if !defined(EA_D485A61C_B7C5_4803_B4BD_2AD92893E9CA__INCLUDED_) +#define EA_D485A61C_B7C5_4803_B4BD_2AD92893E9CA__INCLUDED_ #include #include @@ -48,7 +48,7 @@ namespace am { * call pattern described on the wiki which also helps to implement calls that are forbidden.\n * For more information, please check CAmSerializer * @author Christian Mueller - * @created 16-Dez-2012 15:58:15 + * @created 17-Jan-2013 10:00:24 */ class IAmControlReceive { @@ -677,7 +677,7 @@ namespace am { * @param listConnectionFormats If the size of the list !=0, the list replaces the current one. * @param listMainSoundProperties If the size of the list !=0, the list replaces the current one. */ - virtual am_Error_e changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector listSoundProperties, const std::vector listConnectionFormats, const std::vector listMainSoundProperties) =0; + virtual am_Error_e changeSourceDB(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties) =0; /** * Change the data of the sink. * @@ -690,7 +690,7 @@ namespace am { * @param listMainSoundProperties The list of the mainsoundproperties that need to be changed. Will be changed. if the * length of the list !=0 */ - virtual am_Error_e changeSinkDB(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector listSoundProperties, const std::vector listConnectionFormats, const std::vector listMainSoundProperties) =0; + virtual am_Error_e changeSinkDB(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties) =0; /** * changes Gateway Data * @@ -701,7 +701,7 @@ namespace am { * !=0. * @param convertionMatrix the convertionmatrix */ - virtual am_Error_e changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector listSourceConnectionFormats, const std::vector listSinkConnectionFormats, const std::vector convertionMatrix) =0; + virtual am_Error_e changeGatewayDB(const am_gatewayID_t gatewayID, const std::vector& listSourceConnectionFormats, const std::vector& listSinkConnectionFormats, const std::vector& convertionMatrix) =0; /** * with this function, setting of multiple volumes at a time is done. The behavior of the volume set is depended on the * given ramp and time information. @@ -713,7 +713,7 @@ namespace am { * @param handle * @param listVolumes */ - virtual am_Error_e setVolumes(am_Handle_s& handle, const std::vector listVolumes) =0; + virtual am_Error_e setVolumes(am_Handle_s& handle, const std::vector& listVolumes) =0; /** * set a sink notification configuration * @@ -721,15 +721,15 @@ namespace am { * @param sinkID the sinkID * @param notificationConfiguration */ - virtual am_Error_e setSinkNotificationConfiguration(am_Handle_s& handle, const am_sinkID_t sinkID, const am_NotificationConfiguration_s notificationConfiguration) =0; + virtual am_Error_e setSinkNotificationConfiguration(am_Handle_s& handle, const am_sinkID_t sinkID, const am_NotificationConfiguration_s& notificationConfiguration) =0; /** * set a source notification configuration * * @param handle the handle that will be assigned for this operation * @param sourceID the sinkID - * @param norificationConfiguration + * @param notificationConfiguration */ - virtual am_Error_e setSourceNotificationConfiguration(am_Handle_s& handle, const am_sourceID_t sourceID, const am_NotificationConfiguration_s norificationConfiguration) =0; + virtual am_Error_e setSourceNotificationConfiguration(am_Handle_s& handle, const am_sourceID_t sourceID, const am_NotificationConfiguration_s& notificationConfiguration) =0; /** * Sends out the main notificiation of a sink * @return E_OK on success, E_UNKNOWN on error @@ -737,7 +737,7 @@ namespace am { * @param sinkID * @param notificationPayload the payload */ - virtual void sendSinkMainNotificationPayload(const am_sinkID_t sinkID, const am_NotificationPayload_s notificationPayload) =0; + virtual void sendMainSinkNotificationPayload(const am_sinkID_t sinkID, const am_NotificationPayload_s& notificationPayload) =0; /** * Sends out the main notificiation of a source * @return E_OK on success, E_UNKNOWN on error @@ -745,7 +745,7 @@ namespace am { * @param sourceID * @param notificationPayload the payload */ - virtual void sendSourceMainNotificationPayload(const am_sourceID_t sourceID, const am_NotificationPayload_s notificationPayload) =0; + virtual void sendMainSourceNotificationPayload(const am_sourceID_t sourceID, const am_NotificationPayload_s& notificationPayload) =0; /** * change the mainNotificationConfiguration of a sink * @return E_OK when successful, E_DATABASE on error @@ -753,7 +753,7 @@ namespace am { * @param sinkID the sinkID * @param mainNotificationConfiguration the mainNotificationConfiguration */ - virtual am_Error_e changeMainSinkNotificationConfigurationDB(const am_sinkID_t sinkID, const am_NotificationConfiguration_s mainNotificationConfiguration) =0; + virtual am_Error_e changeMainSinkNotificationConfigurationDB(const am_sinkID_t sinkID, const am_NotificationConfiguration_s& mainNotificationConfiguration) =0; /** * change the mainNotificationConfiguration of a source * @return E_OK when successful, E_DATABASE on error @@ -761,34 +761,34 @@ namespace am { * @param sourceID the sourceID * @param mainNotificationConfiguration the mainNotificationConfiguration */ - virtual am_Error_e changeMainSourceNotificationConfigurationDB(const am_sourceID_t sourceID, const am_NotificationConfiguration_s mainNotificationConfiguration) =0; + virtual am_Error_e changeMainSourceNotificationConfigurationDB(const am_sourceID_t sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration) =0; /** * Retrieves the Restart Reason Property * @return E_OK on success E_UNKNOWN if property could not be retrieved. * * @param restartReason the restart reason */ - virtual am_Error_e nsmGetRestartReasonProperty(NsmRestartReason_e& restartReason) =0; + virtual am_Error_e getRestartReasonPropertyNSM(NsmRestartReason_e& restartReason) =0; /** * Retrieves the shutdown reason property * @return E_OK on success E_UNKNOWN if property could not be retrieved. * * @param ShutdownReason The shutdown reason */ - virtual am_Error_e nsmGetShutdownReasonProperty(NsmShutdownReason_e& ShutdownReason) =0; + virtual am_Error_e getShutdownReasonPropertyNSM(NsmShutdownReason_e& ShutdownReason) =0; /** * Retrieves the running reason * @return E_OK on success E_UNKNOWN if property could not be retrieved. * * @param nsmRunningReason the running reson */ - virtual am_Error_e nsmGetRunningReasonProperty(NsmRunningReason_e& nsmRunningReason) =0; + virtual am_Error_e getRunningReasonPropertyNSM(NsmRunningReason_e& nsmRunningReason) =0; /** * @return NsmErrorStatus_Ok in case of success * * @param nsmNodeState The current node state */ - virtual NsmErrorStatus_e nsmGetNodeState(NsmNodeState_e& nsmNodeState) =0; + virtual NsmErrorStatus_e getNodeStateNSM(NsmNodeState_e& nsmNodeState) =0; /** * Retrieves the current session state * @return NsmErrorStatus_Ok on success E_UNKNOWN if property could not be retrieved. @@ -797,23 +797,23 @@ namespace am { * @param seatID * @param sessionState The sessionState */ - virtual NsmErrorStatus_e nsmGetSessionState(const std::string& sessionName, const NsmSeat_e& seatID, NsmSessionState_e& sessionState) =0; + virtual NsmErrorStatus_e getSessionStateNSM(const std::string& sessionName, const NsmSeat_e seatID, NsmSessionState_e& sessionState) =0; /** * Retrieves the current applicationmode * @return NsmErrorStatus_Ok on success E_UNKNOWN if property could not be retrieved. * * @param applicationMode The current application Mode */ - virtual NsmErrorStatus_e nsmGetApplicationMode(NsmApplicationMode_e& applicationMode) =0; + virtual NsmErrorStatus_e getApplicationModeNSM(NsmApplicationMode_e& applicationMode) =0; /** * Registers the AudioManager as shutdown client * @return NsmErrorStatus_Ok on success * The interface for the client will be provided by the AudioManagerDeamon, therefore is no need to mention it here. * - * @param shutdownMode The shutdown mode that the controller wants to register for. Can be + * @param shutdownMode The shutdown mode that the controller wants to register for. * @param timeoutMs Max. Timeout to wait for response from shutdown client in ms */ - virtual NsmErrorStatus_e nsmRegisterShutdownClient(const uint32_t shutdownMode, const uint32_t timeoutMs) =0; + virtual NsmErrorStatus_e registerShutdownClientNSM(const uint32_t shutdownMode, const uint32_t timeoutMs) =0; /** * unregisters the AudioManager as shutdown client * @return NsmErrorStatus_Ok on success @@ -821,13 +821,13 @@ namespace am { * @param shutdownMode Shutdown mode for which client wants to unregister (NSM_SHUTDOWNTYPE_NORMAL, * NSM_SHUTDOWNTYPE_FAST) */ - virtual NsmErrorStatus_e nsmUnRegisterShutdownClient(const uint32_t shutdownMode) =0; + virtual NsmErrorStatus_e unRegisterShutdownClientNSM(const uint32_t shutdownMode) =0; /** * @return E_OK on success, E_UNKOWN if interface could not be reached * * @param version */ - virtual am_Error_e nsmGetInterfaceVersion(uint32_t& version) =0; + virtual am_Error_e getInterfaceVersionNSM(uint32_t& version) =0; /** * Sends out the lifecyclerequest complete to the NSM * @return NsmErrorStatus_Ok in case of success @@ -836,8 +836,8 @@ namespace am { * @param status The result of the call to "LifecycleRequest". NsmErrorStatus_Ok: Request successfully processed. * NsmErrorStatus_Error: An error occured while processing the "LifecycleRequest". */ - virtual NsmErrorStatus_e nsmSendLifecycleRequestComplete(const uint32_t RequestId, const NsmErrorStatus_e status) =0; + virtual NsmErrorStatus_e sendLifecycleRequestCompleteNSM(const uint32_t RequestId, const NsmErrorStatus_e status) =0; }; } -#endif // !defined(EA_AC2A0532_F989_4f95_A467_1055C94D9C1E__INCLUDED_) +#endif // !defined(EA_D485A61C_B7C5_4803_B4BD_2AD92893E9CA__INCLUDED_) diff --git a/include/control/IAmControlSend.h b/include/control/IAmControlSend.h index 9b2d0b9..6e2fdc4 100644 --- a/include/control/IAmControlSend.h +++ b/include/control/IAmControlSend.h @@ -19,8 +19,8 @@ * * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN */ -#if !defined(EA_9CC33091_C4F5_4262_9C42_042DFB7606F2__INCLUDED_) -#define EA_9CC33091_C4F5_4262_9C42_042DFB7606F2__INCLUDED_ +#if !defined(EA_89F9440C_319B_486f_BAB5_91FED9A658C2__INCLUDED_) +#define EA_89F9440C_319B_486f_BAB5_91FED9A658C2__INCLUDED_ #include #include @@ -49,7 +49,7 @@ namespace am { * call pattern described on the wiki which also helps to implement calls that are forbidden.\n * For more information, please check CAmSerializer * @author Christian Mueller - * @created 16-Dez-2012 15:58:15 + * @created 17-Jan-2013 10:00:25 */ class IAmControlSend { @@ -422,7 +422,7 @@ namespace am { * @param listConnectionFormats * @param listMainSoundProperties */ - virtual am_Error_e hookSystemUpdateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector listSoundProperties, const std::vector listConnectionFormats, std::vector listMainSoundProperties) =0; + virtual am_Error_e hookSystemUpdateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties) =0; /** * update from the source Data * @@ -432,7 +432,7 @@ namespace am { * @param listConnectionFormats * @param listMainSoundProperties */ - virtual am_Error_e hookSystemUpdateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector listSoundProperties, const std::vector listConnectionFormats, std::vector listMainSoundProperties) =0; + virtual am_Error_e hookSystemUpdateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties) =0; /** * updates the Gateway Data * @@ -441,7 +441,7 @@ namespace am { * @param listSinkConnectionFormats * @param convertionMatrix */ - virtual am_Error_e hookSystemUpdateGateway(const am_gatewayID_t gatewayID, const std::vector listSourceConnectionFormats, const std::vector listSinkConnectionFormats, const std::vector convertionMatrix) =0; + virtual am_Error_e hookSystemUpdateGateway(const am_gatewayID_t gatewayID, const std::vector& listSourceConnectionFormats, const std::vector& listSinkConnectionFormats, const std::vector& convertionMatrix) =0; /** * ack for mulitple volume changes * @@ -449,7 +449,7 @@ namespace am { * @param listVolumes the list of volumes with the current status * @param error */ - virtual void cbAckSetVolume(const am_Handle_s handle, const std::vector listVolumes, const am_Error_e error) =0; + virtual void cbAckSetVolumes(const am_Handle_s handle, const std::vector& listVolumes, const am_Error_e error) =0; /** * The acknowledge of the sink notification configuration * @@ -458,24 +458,26 @@ namespace am { */ virtual void cbAckSetSinkNotificationConfiguration(const am_Handle_s handle, const am_Error_e error) =0; /** - * The acknowledge of the sink notification configuration + * The acknowledge of the source notification configuration * * @param handle the handle * @param error the error */ virtual void cbAckSetSourceNotificationConfiguration(const am_Handle_s handle, const am_Error_e error) =0; /** + * new sinkNotification data is there! * * @param sinkID the sinkID of the changed notification * @param payload the payload */ - virtual void hookSinkNotificationDataChanged(const am_sinkID_t sinkID, const am_NotificationPayload_s payload) =0; + virtual void hookSinkNotificationDataChanged(const am_sinkID_t sinkID, const am_NotificationPayload_s& payload) =0; /** + * new sourceNotification data is there! * - * @param sourceID the sinkID of the changed notification + * @param sourceID the sourceID of the changed notification * @param payload the payload */ - virtual void hookSourceNotificationDataChanged(const am_sourceID_t sourceID, const am_NotificationPayload_s payload) =0; + virtual void hookSourceNotificationDataChanged(const am_sourceID_t sourceID, const am_NotificationPayload_s& payload) =0; /** * sets a user MainSinkNotificationConfiguration * @return E_OK on success, E_OUT_OF_RANGE if out of range, E_UNKNOWN on error @@ -483,7 +485,7 @@ namespace am { * @param sinkID * @param notificationConfiguration */ - virtual am_Error_e hookUserSetMainSinkNotificationConfiguration(const am_sinkID_t sinkID, const am_NotificationConfiguration_s notificationConfiguration) =0; + virtual am_Error_e hookUserSetMainSinkNotificationConfiguration(const am_sinkID_t sinkID, const am_NotificationConfiguration_s& notificationConfiguration) =0; /** * sets a user MainSourceNotificationConfiguration * @return E_OK on success, E_OUT_OF_RANGE if out of range, E_UNKNOWN on error @@ -491,7 +493,7 @@ namespace am { * @param sourceID * @param notificationConfiguration */ - virtual am_Error_e hookUserSetMainSourceNotificationConfiguration(const am_sourceID_t sourceID, const am_NotificationConfiguration_s notificationConfiguration) =0; + virtual am_Error_e hookUserSetMainSourceNotificationConfiguration(const am_sourceID_t sourceID, const am_NotificationConfiguration_s& notificationConfiguration) =0; /** * This hook is connected to the NodeState signal of the NodeStateManager * @@ -511,7 +513,7 @@ namespace am { * @param seatID * @param sessionStateID */ - virtual void hookSystemSessionStateChanged(const std::string sessionName, const int32_t seatID, const NsmSessionState_e sessionStateID) =0; + virtual void hookSystemSessionStateChanged(const std::string& sessionName, const NsmSeat_e seatID, const NsmSessionState_e sessionStateID) =0; /** * A lifecycle request comes in from the NSM and must be processed. * @return NsmErrorStatus_Ok if successful @@ -529,4 +531,4 @@ namespace am { }; } -#endif // !defined(EA_9CC33091_C4F5_4262_9C42_042DFB7606F2__INCLUDED_) +#endif // !defined(EA_89F9440C_319B_486f_BAB5_91FED9A658C2__INCLUDED_) diff --git a/include/routing/IAmRoutingReceive.h b/include/routing/IAmRoutingReceive.h index fd88178..2d61f9e 100644 --- a/include/routing/IAmRoutingReceive.h +++ b/include/routing/IAmRoutingReceive.h @@ -19,8 +19,8 @@ * * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN */ -#if !defined(EA_36ADD7D1_5B51_4364_9C3B_4839230FAAC2__INCLUDED_) -#define EA_36ADD7D1_5B51_4364_9C3B_4839230FAAC2__INCLUDED_ +#if !defined(EA_B7A11CC8_9777_4421_8677_D9CE084D5E2B__INCLUDED_) +#define EA_B7A11CC8_9777_4421_8677_D9CE084D5E2B__INCLUDED_ #include #include @@ -47,7 +47,7 @@ namespace am { * call pattern described on the wiki which also helps to implement calls that are forbidden.\n * For more information, please check CAmSerializer * @author Christian Mueller - * @created 16-Dez-2012 15:58:16 + * @created 17-Jan-2013 10:00:25 */ class IAmRoutingReceive { @@ -373,7 +373,7 @@ namespace am { * @param listSinkFormats * @param convertionMatrix */ - virtual am_Error_e updateGateway(const am_gatewayID_t gatewayID, std::vector listSourceFormats, const std::vector listSinkFormats, std::vector convertionMatrix) =0; + virtual am_Error_e updateGateway(const am_gatewayID_t gatewayID, const std::vector& listSourceFormats, const std::vector& listSinkFormats, const std::vector& convertionMatrix) =0; /** * updates data of an gateway. @return E_OK on success, E_NON_EXISTENT if the sinkID is not valid. * @@ -383,7 +383,7 @@ namespace am { * @param listConnectionFormats * @param listMainSoundProperties */ - virtual am_Error_e updateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector listSoundProperties, const std::vector listConnectionFormats, std::vector listMainSoundProperties) =0; + virtual am_Error_e updateSink(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties) =0; /** * updates data of an source. @return E_OK on success, E_NON_EXISTENT if the sourceID in the struct is not valid. * Please note that only the following data out of am_Source_s have effect when they are changed: @@ -398,16 +398,16 @@ namespace am { * @param listConnectionFormats * @param listMainSoundProperties */ - virtual am_Error_e updateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, std::vector listSoundProperties, std::vector listConnectionFormats, const std::vector listMainSoundProperties) =0; + virtual am_Error_e updateSource(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector& listSoundProperties, const std::vector& listConnectionFormats, const std::vector& listMainSoundProperties) =0; /** - * acknowledges a asyncsetSinkVolume + * acknowledges a asyncSetSinkVolumes * * @param handle * @param listvolumes The list of volumes that have been set. ramp and time values have no meaning when the struct is * used here. * @param error E_OK on success, E_ABORTED if action was aborted, E_UNKNOWN on error */ - virtual void ackSetVolumes(const am_Handle_s handle, const std::vector listvolumes, const am_Error_e error) =0; + virtual void ackSetVolumes(const am_Handle_s handle, const std::vector& listvolumes, const am_Error_e error) =0; /** * The acknowledge of the SinkNotificationConfiguration * @@ -428,15 +428,15 @@ namespace am { * @param sinkID The sinkID of the sink where the data changed * @param payload The payload */ - virtual void hookSinkNotificationDataChange(const am_sinkID_t sinkID, const am_NotificationPayload_s payload) =0; + virtual void hookSinkNotificationDataChange(const am_sinkID_t sinkID, const am_NotificationPayload_s& payload) =0; /** * is called whenever a notified value needs to be send * * @param sourceID The sinkID of the sink where the data changed * @param payload The payload */ - virtual void hookSourceNotificationDataChange(const am_sourceID_t sourceID, const am_NotificationPayload_s payload) =0; + virtual void hookSourceNotificationDataChange(const am_sourceID_t sourceID, const am_NotificationPayload_s& payload) =0; }; } -#endif // !defined(EA_36ADD7D1_5B51_4364_9C3B_4839230FAAC2__INCLUDED_) +#endif // !defined(EA_B7A11CC8_9777_4421_8677_D9CE084D5E2B__INCLUDED_) diff --git a/include/routing/IAmRoutingSend.h b/include/routing/IAmRoutingSend.h index d077c73..35024e5 100644 --- a/include/routing/IAmRoutingSend.h +++ b/include/routing/IAmRoutingSend.h @@ -19,8 +19,8 @@ * * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN */ -#if !defined(EA_3921A27D_CF17_4db4_BE29_6A5BD7C5FE53__INCLUDED_) -#define EA_3921A27D_CF17_4db4_BE29_6A5BD7C5FE53__INCLUDED_ +#if !defined(EA_19B3916A_5323_4939_B585_FE9193DA3FAD__INCLUDED_) +#define EA_19B3916A_5323_4939_B585_FE9193DA3FAD__INCLUDED_ #include #include @@ -47,7 +47,7 @@ namespace am { * call pattern described on the wiki which also helps to implement calls that are forbidden.\n * For more information, please check CAmSerializer * @author Christian Mueller - * @created 16-Dez-2012 15:58:16 + * @created 17-Jan-2013 10:00:26 */ class IAmRoutingSend { @@ -217,7 +217,7 @@ namespace am { */ virtual am_Error_e asyncSetVolumes(const am_Handle_s handle, const std::vector& listVolumes) =0; /** - * sets the notification configuration of a source. + * sets the notification configuration of a sink. * @return E_OK on success, E_UNKNOWN on error. * * @param handle The handle for this operation. @@ -237,4 +237,4 @@ namespace am { }; } -#endif // !defined(EA_3921A27D_CF17_4db4_BE29_6A5BD7C5FE53__INCLUDED_) +#endif // !defined(EA_19B3916A_5323_4939_B585_FE9193DA3FAD__INCLUDED_) -- cgit v1.2.1