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 +-- 16 files changed, 362 insertions(+), 362 deletions(-) (limited to 'AudioManagerDaemon') 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)); -- cgit v1.2.1