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 --- .../include/CAmCommandSenderDbus.h | 8 ++++---- .../include/CAmDbusMessageHandler.h | 2 +- .../include/CommandInterface.xml | 8 ++++---- .../src/CAmCommandSenderDbus.cpp | 8 ++++---- .../src/CAmDbusMessageHandler.cpp | 24 +++++++++++----------- .../src/IAmCommandReceiverShadow.cpp | 20 +++++++++--------- .../test/MockIAmCommandReceive.h | 13 ++++++------ 7 files changed, 42 insertions(+), 41 deletions(-) (limited to 'PluginCommandInterfaceDbus') diff --git a/PluginCommandInterfaceDbus/include/CAmCommandSenderDbus.h b/PluginCommandInterfaceDbus/include/CAmCommandSenderDbus.h index d8a2a0c..2394a91 100644 --- a/PluginCommandInterfaceDbus/include/CAmCommandSenderDbus.h +++ b/PluginCommandInterfaceDbus/include/CAmCommandSenderDbus.h @@ -67,10 +67,10 @@ public: void getInterfaceVersion(std::string& version) const; void cbSinkUpdated(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector& listMainSoundProperties); void cbSourceUpdated(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector& listMainSoundProperties); - void cbSinkNotification(const am_sinkID_t sinkID, const am_NotificationPayload_s notification); - void cbSourceNotification(const am_sourceID_t sourceID, const am_NotificationPayload_s notification); - void cbSinkMainNotificationConfigurationChanged(const am_sinkID_t sinkID, const am_NotificationConfiguration_s mainNotificationConfiguration); - void cbSourceMainNotificationConfigurationChanged(const am_sourceID_t sourceID, const am_NotificationConfiguration_s mainNotificationConfiguration); + void cbSinkNotification(const am_sinkID_t sinkID, const am_NotificationPayload_s& notification) ; + void cbSourceNotification(const am_sourceID_t sourceID, const am_NotificationPayload_s& notification) ; + void cbMainSinkNotificationConfigurationChanged(const am_sinkID_t sinkID, const am_NotificationConfiguration_s& mainNotificationConfiguration) ; + void cbMainSourceNotificationConfigurationChanged(const am_sourceID_t sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration) ; #ifdef UNIT_TEST friend class CAmCommandSenderDbusBackdoor; diff --git a/PluginCommandInterfaceDbus/include/CAmDbusMessageHandler.h b/PluginCommandInterfaceDbus/include/CAmDbusMessageHandler.h index 582bf51..8360bff 100644 --- a/PluginCommandInterfaceDbus/include/CAmDbusMessageHandler.h +++ b/PluginCommandInterfaceDbus/include/CAmDbusMessageHandler.h @@ -80,7 +80,7 @@ public: double getDouble(); char* getString(); void getProperty(dbus_int16_t& type, dbus_int16_t& value); - void getNotificationConfiguration(dbus_int16_t& notificationType, dbus_int16_t& notificationStatus, dbus_int16_t& notificationParameter); + void getNotificationConfiguration(dbus_int16_t& type, dbus_int16_t& status, dbus_int16_t& parameter); /** * the overloaded append function appends different datatypes to the dbusmessage diff --git a/PluginCommandInterfaceDbus/include/CommandInterface.xml b/PluginCommandInterfaceDbus/include/CommandInterface.xml index 5eb51c7..294a92a 100644 --- a/PluginCommandInterfaceDbus/include/CommandInterface.xml +++ b/PluginCommandInterfaceDbus/include/CommandInterface.xml @@ -103,13 +103,13 @@ - + - + @@ -204,12 +204,12 @@ - + - + diff --git a/PluginCommandInterfaceDbus/src/CAmCommandSenderDbus.cpp b/PluginCommandInterfaceDbus/src/CAmCommandSenderDbus.cpp index 3705c0d..1d5a088 100644 --- a/PluginCommandInterfaceDbus/src/CAmCommandSenderDbus.cpp +++ b/PluginCommandInterfaceDbus/src/CAmCommandSenderDbus.cpp @@ -348,7 +348,7 @@ void am::CAmCommandSenderDbus::cbSourceUpdated(const am_sourceID_t sourceID, con } } -void am::CAmCommandSenderDbus::cbSinkNotification(const am_sinkID_t sinkID, const am_NotificationPayload_s notification) +void am::CAmCommandSenderDbus::cbSinkNotification(const am_sinkID_t sinkID, const am_NotificationPayload_s& notification) { log(&commandDbus, DLT_LOG_INFO, "cbSinkNotification called, sinkID", sinkID); @@ -361,7 +361,7 @@ void am::CAmCommandSenderDbus::cbSinkNotification(const am_sinkID_t sinkID, cons } } -void am::CAmCommandSenderDbus::cbSourceNotification(const am_sourceID_t sourceID, const am_NotificationPayload_s notification) +void am::CAmCommandSenderDbus::cbSourceNotification(const am_sourceID_t sourceID, const am_NotificationPayload_s& notification) { log(&commandDbus, DLT_LOG_INFO, "cbSourceNotification called, sourceID", sourceID); @@ -374,7 +374,7 @@ void am::CAmCommandSenderDbus::cbSourceNotification(const am_sourceID_t sourceID } } -void am::CAmCommandSenderDbus::cbSinkMainNotificationConfigurationChanged(const am_sinkID_t sinkID, const am_NotificationConfiguration_s mainNotificationConfiguration) +void am::CAmCommandSenderDbus::cbMainSinkNotificationConfigurationChanged(const am_sinkID_t sinkID, const am_NotificationConfiguration_s& mainNotificationConfiguration) { log(&commandDbus, DLT_LOG_INFO, "cbSinkMainNotificationConfigurationChanged called, sinkID", sinkID); @@ -387,7 +387,7 @@ void am::CAmCommandSenderDbus::cbSinkMainNotificationConfigurationChanged(const } } -void am::CAmCommandSenderDbus::cbSourceMainNotificationConfigurationChanged(const am_sourceID_t sourceID, const am_NotificationConfiguration_s mainNotificationConfiguration) +void am::CAmCommandSenderDbus::cbMainSourceNotificationConfigurationChanged(const am_sourceID_t sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration) { log(&commandDbus, DLT_LOG_INFO, "cbSourceMainNotificationConfigurationChanged called, sourceID", sourceID); diff --git a/PluginCommandInterfaceDbus/src/CAmDbusMessageHandler.cpp b/PluginCommandInterfaceDbus/src/CAmDbusMessageHandler.cpp index 55169b2..e60923a 100644 --- a/PluginCommandInterfaceDbus/src/CAmDbusMessageHandler.cpp +++ b/PluginCommandInterfaceDbus/src/CAmDbusMessageHandler.cpp @@ -623,7 +623,7 @@ void CAmDbusMessageHandler::append(const std::vector & } } -void CAmDbusMessageHandler::getNotificationConfiguration(dbus_int16_t& notificationType, dbus_int16_t& notificationStatus, dbus_int16_t& notificationParameter) +void CAmDbusMessageHandler::getNotificationConfiguration(dbus_int16_t& type, dbus_int16_t& status, dbus_int16_t& parameter) { DBusMessageIter arrayIter; if (DBUS_TYPE_STRUCT != dbus_message_iter_get_arg_type(&mDBusMessageIter)) @@ -635,11 +635,11 @@ void CAmDbusMessageHandler::getNotificationConfiguration(dbus_int16_t& notificat else { dbus_message_iter_recurse(&mDBusMessageIter, &arrayIter); - dbus_message_iter_get_basic(&arrayIter, ¬ificationType); + dbus_message_iter_get_basic(&arrayIter, &type); dbus_message_iter_next(&arrayIter); - dbus_message_iter_get_basic(&arrayIter, ¬ificationStatus); + dbus_message_iter_get_basic(&arrayIter, &status); dbus_message_iter_next(&arrayIter); - dbus_message_iter_get_basic(&arrayIter, ¬ificationParameter); + dbus_message_iter_get_basic(&arrayIter, ¶meter); dbus_message_iter_next(&mDBusMessageIter); } } @@ -655,9 +655,9 @@ void CAmDbusMessageHandler::append(const std::vectornotificationType); - success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, &listIterator->notificationStatus); - success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, &listIterator->notificationParameter); + success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, &listIterator->type); + success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, &listIterator->status); + success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, &listIterator->parameter); success = success && dbus_message_iter_close_container(&arrayIter, &structIter); } success = success && dbus_message_iter_close_container(&mDBusMessageIter, &arrayIter); @@ -675,8 +675,8 @@ void CAmDbusMessageHandler::append(const am::am_NotificationPayload_s& notificat DBusMessageIter structIter; dbus_bool_t success = true; success = success && dbus_message_iter_open_container(&mDBusMessageIter, DBUS_TYPE_STRUCT, NULL, &structIter); - success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, ¬ificationPayload.notificationType); - success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, ¬ificationPayload.notificationValue); + success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, ¬ificationPayload.type); + success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, ¬ificationPayload.value); success = success && dbus_message_iter_close_container(&mDBusMessageIter, &structIter); if (!success) @@ -692,9 +692,9 @@ void CAmDbusMessageHandler::append(const am::am_NotificationConfiguration_s& not DBusMessageIter structIter; dbus_bool_t success = true; success = success && dbus_message_iter_open_container(&mDBusMessageIter, DBUS_TYPE_STRUCT, NULL, &structIter); - success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, ¬ificationConfiguration.notificationType); - success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, ¬ificationConfiguration.notificationStatus); - success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, ¬ificationConfiguration.notificationParameter); + success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, ¬ificationConfiguration.type); + success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, ¬ificationConfiguration.status); + success = success && dbus_message_iter_append_basic(&structIter, DBUS_TYPE_INT16, ¬ificationConfiguration.parameter); success = success && dbus_message_iter_close_container(&mDBusMessageIter, &structIter); if (!success) diff --git a/PluginCommandInterfaceDbus/src/IAmCommandReceiverShadow.cpp b/PluginCommandInterfaceDbus/src/IAmCommandReceiverShadow.cpp index 42a669d..4dcc0f1 100644 --- a/PluginCommandInterfaceDbus/src/IAmCommandReceiverShadow.cpp +++ b/PluginCommandInterfaceDbus/src/IAmCommandReceiverShadow.cpp @@ -426,7 +426,7 @@ void am::IAmCommandReceiverShadow::getListSinkMainNotificationConfigurations(DBu mDBUSMessageHandler.initReceive(msg); am_sinkID_t sinkID = static_cast(mDBUSMessageHandler.getUInt()); std::vector listNotificationConfigurations; - am_Error_e returnCode = mpIAmCommandReceive->getListSinkMainNotificationConfigurations(sinkID,listNotificationConfigurations); + am_Error_e returnCode = mpIAmCommandReceive->getListMainSinkNotificationConfigurations(sinkID,listNotificationConfigurations); mDBUSMessageHandler.initReply(msg); mDBUSMessageHandler.append((dbus_int16_t) returnCode); mDBUSMessageHandler.append(listNotificationConfigurations); @@ -443,7 +443,7 @@ void am::IAmCommandReceiverShadow::getListSourceMainNotificationConfigurations(D mDBUSMessageHandler.initReceive(msg); am_sourceID_t sourceID = static_cast(mDBUSMessageHandler.getUInt()); std::vector listNotificationConfigurations; - am_Error_e returnCode = mpIAmCommandReceive->getListSourceMainNotificationConfigurations(sourceID,listNotificationConfigurations); + am_Error_e returnCode = mpIAmCommandReceive->getListMainSourceNotificationConfigurations(sourceID,listNotificationConfigurations); mDBUSMessageHandler.initReply(msg); mDBUSMessageHandler.append((dbus_int16_t) returnCode); mDBUSMessageHandler.append(listNotificationConfigurations); @@ -465,10 +465,10 @@ void am::IAmCommandReceiverShadow::setSinkMainNotificationConfiguration(DBusConn dbus_int16_t parameter = 0; mDBUSMessageHandler.getNotificationConfiguration(type, status, parameter); am_NotificationConfiguration_s mainNotificationConfiguration; - mainNotificationConfiguration.notificationType = static_cast (type); - mainNotificationConfiguration.notificationStatus = static_cast (status); - mainNotificationConfiguration.notificationParameter = static_cast(parameter); - am_Error_e returnCode = mpIAmCommandReceive->setSinkMainNotificationConfiguration(sinkID,mainNotificationConfiguration); + mainNotificationConfiguration.type = static_cast (type); + mainNotificationConfiguration.status = static_cast (status); + mainNotificationConfiguration.parameter = static_cast(parameter); + am_Error_e returnCode = mpIAmCommandReceive->setMainSinkNotificationConfiguration(sinkID,mainNotificationConfiguration); mDBUSMessageHandler.initReply(msg); mDBUSMessageHandler.append((dbus_int16_t) returnCode); mDBUSMessageHandler.sendMessage(); @@ -488,10 +488,10 @@ void am::IAmCommandReceiverShadow::setSourceMainNotificationConfiguration(DBusCo dbus_int16_t parameter = 0; mDBUSMessageHandler.getNotificationConfiguration(type, status, parameter); am_NotificationConfiguration_s mainNotificationConfiguration; - mainNotificationConfiguration.notificationType = static_cast (type); - mainNotificationConfiguration.notificationStatus = static_cast (status); - mainNotificationConfiguration.notificationParameter = static_cast(parameter); - am_Error_e returnCode = mpIAmCommandReceive->setSourceMainNotificationConfiguration(sourceID,mainNotificationConfiguration); + mainNotificationConfiguration.type = static_cast (type); + mainNotificationConfiguration.status = static_cast (status); + mainNotificationConfiguration.parameter = static_cast(parameter); + am_Error_e returnCode = mpIAmCommandReceive->setMainSourceNotificationConfiguration(sourceID,mainNotificationConfiguration); mDBUSMessageHandler.initReply(msg); mDBUSMessageHandler.append((dbus_int16_t) returnCode); mDBUSMessageHandler.sendMessage(); diff --git a/PluginCommandInterfaceDbus/test/MockIAmCommandReceive.h b/PluginCommandInterfaceDbus/test/MockIAmCommandReceive.h index ce1dcc4..cf70aa8 100644 --- a/PluginCommandInterfaceDbus/test/MockIAmCommandReceive.h +++ b/PluginCommandInterfaceDbus/test/MockIAmCommandReceive.h @@ -70,14 +70,15 @@ class MockIAmCommandReceive : public IAmCommandReceive { void(const uint16_t handle, const am_Error_e error)); MOCK_METHOD2(confirmCommandRundown, void(const uint16_t handle, const am_Error_e error)); - MOCK_CONST_METHOD2(getListSinkMainNotificationConfigurations, + MOCK_CONST_METHOD2(getListMainSinkNotificationConfigurations, am_Error_e(const am_sinkID_t sinkID, std::vector& listMainNotificationConfigurations)); - MOCK_CONST_METHOD2(getListSourceMainNotificationConfigurations, + MOCK_CONST_METHOD2(getListMainSourceNotificationConfigurations, am_Error_e(const am_sourceID_t sourceID, std::vector& listMainNotificationConfigurations)); - MOCK_METHOD2(setSinkMainNotificationConfiguration, - am_Error_e(const am_sinkID_t sinkID, const am_NotificationConfiguration_s mainNotificationConfiguration)); - MOCK_METHOD2(setSourceMainNotificationConfiguration, - am_Error_e(const am_sourceID_t sourceID, const am_NotificationConfiguration_s mainNotificationConfiguration)); + MOCK_METHOD2(setMainSinkNotificationConfiguration, + am_Error_e(const am_sinkID_t sinkID, const am_NotificationConfiguration_s& mainNotificationConfiguration)); + MOCK_METHOD2(setMainSourceNotificationConfiguration, + am_Error_e(const am_sourceID_t sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration)); + }; -- cgit v1.2.1