From 392d090c63dcb03df8a044abbc6cc84807e341e5 Mon Sep 17 00:00:00 2001 From: Christian Mueller Date: Fri, 16 Dec 2011 12:29:27 +0100 Subject: changes to make controlSender compile & loadable --- PluginCommandInterfaceDbus/CMakeLists.txt | 7 +- PluginCommandInterfaceDbus/include/CommandSender.h | 108 ------- .../include/DBusCommandSender.h | 108 +++++++ .../src/CommandReceiverShadow.cpp | 2 +- PluginCommandInterfaceDbus/src/CommandSender.cpp | 324 --------------------- .../src/DBusCommandSender.cpp | 324 +++++++++++++++++++++ .../src/DBusMessageHandler.cpp | 2 +- 7 files changed, 437 insertions(+), 438 deletions(-) delete mode 100644 PluginCommandInterfaceDbus/include/CommandSender.h create mode 100644 PluginCommandInterfaceDbus/include/DBusCommandSender.h delete mode 100644 PluginCommandInterfaceDbus/src/CommandSender.cpp create mode 100644 PluginCommandInterfaceDbus/src/DBusCommandSender.cpp (limited to 'PluginCommandInterfaceDbus') diff --git a/PluginCommandInterfaceDbus/CMakeLists.txt b/PluginCommandInterfaceDbus/CMakeLists.txt index 5a2877d..8926b33 100644 --- a/PluginCommandInterfaceDbus/CMakeLists.txt +++ b/PluginCommandInterfaceDbus/CMakeLists.txt @@ -16,7 +16,6 @@ set(AUDIO_INCLUDES_FOLDER ${CMAKE_SOURCE_DIR}/../includes) set(DBUS_INCLUDES_FOLDER ${CMAKE_SOURCE_DIR}/../dbusIncludes) set(INCLUDES_FOLDER ${CMAKE_SOURCE_DIR}/include) -find_package (Threads) FIND_PACKAGE(DBUS REQUIRED) FIND_PACKAGE(PkgConfig) pkg_check_modules(DLT REQUIRED automotive-dlt) @@ -43,11 +42,11 @@ file(GLOB PLUGINDBUS_SRCS_CXX "src/*.cpp") add_library(PluginCommandInterfaceDbus SHARED ${PLUGINDBUS_SRCS_CXX}) TARGET_LINK_LIBRARIES(PluginCommandInterfaceDbus - ${DLT_LIBRARIES} - ${DBUS_LIBRARY} - ${CMAKE_THREAD_LIBS_INIT} + ${DLT_LIBRARIES} + ${DBUS_LIBRARY} ) +add_subdirectory (test) #add a target to generate API documentation with Doxygen find_package(Doxygen) diff --git a/PluginCommandInterfaceDbus/include/CommandSender.h b/PluginCommandInterfaceDbus/include/CommandSender.h deleted file mode 100644 index 88fb47e..0000000 --- a/PluginCommandInterfaceDbus/include/CommandSender.h +++ /dev/null @@ -1,108 +0,0 @@ -/** -* Copyright (C) 2011, BMW AG -* -* GeniviAudioMananger DbusPlugin -* -* \file CommandSender.h -* -* \date 20-Oct-2011 3:42:04 PM -* \author Christian Mueller (christian.ei.mueller@bmw.de) -* -* \section License -* GNU Lesser General Public License, version 2.1, with special exception (GENIVI clause) -* Copyright (C) 2011, BMW AG Christian Mueller Christian.ei.mueller@bmw.de -* -* This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. -* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License, version 2.1, for more details. -* You should have received a copy of the GNU Lesser General Public License, version 2.1, along with this program; if not, see . -* Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may also be applicable to programs even in cases in which the program is not a library in the technical sense. -* Linking AudioManager statically or dynamically with other modules is making a combined work based on AudioManager. You may license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to license your linked modules under the GNU Lesser General Public License, version 2.1, you may use the program under the following exception. -* As a special exception, the copyright holders of AudioManager give you permission to combine AudioManager with software programs or libraries that are released under any license unless such a combination is not permitted by the license of such a software program or library. You may copy and distribute such a system following the terms of the GNU Lesser General Public License, version 2.1, including this special exception, for AudioManager and the licenses of the other code concerned. -* Note that people who make modified versions of AudioManager are not obligated to grant this special exception for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, version 2.1, gives permission to release a modified version without this exception; this exception also makes it possible to release a modified version which carries forward this exception. -* -* THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN -*/ - - -#ifndef COMMANDSENDER_H_ -#define COMMANDSENDER_H_ - -#include "DBusMessageHandler.h" -#include "CommandReceiverShadow.h" -#include "DBusWrapper.h" - -#include -#include -#include - -using namespace am; - -#define DLT_CONTEXT DBusCommandPlugin -const char MY_NODE[]="CommandInterface"; - -/** - * Dbus Implementation of CommandSendInterface - */ -class DbusCommandSender: public CommandSendInterface { -public: - DbusCommandSender(); - virtual ~DbusCommandSender(); - am_Error_e startupInterface(CommandReceiveInterface* commandreceiveinterface) ; - am_Error_e stopInterface() ; - am_Error_e cbCommunicationReady() ; - am_Error_e cbCommunicationRundown() ; - void cbNumberOfMainConnectionsChanged() ; - void cbNumberOfSinksChanged() ; - void cbNumberOfSourcesChanged() ; - void cbNumberOfSinkClassesChanged() ; - void cbNumberOfSourceClassesChanged() ; - void cbMainConnectionStateChanged(const am_mainConnectionID_t connectionID, const am_ConnectionState_e connectionState) ; - void cbMainSinkSoundPropertyChanged(const am_sinkID_t sinkID, const am_MainSoundProperty_s SoundProperty) ; - void cbMainSourceSoundPropertyChanged(const am_sourceID_t sourceID, const am_MainSoundProperty_s& SoundProperty) ; - void cbSinkAvailabilityChanged(const am_sinkID_t sinkID, const am_Availability_s& availability) ; - void cbSourceAvailabilityChanged(const am_sourceID_t sourceID, const am_Availability_s& availability) ; - void cbVolumeChanged(const am_sinkID_t sinkID, const am_mainVolume_t volume) ; - void cbSinkMuteStateChanged(const am_sinkID_t sinkID, const am_MuteState_e muteState) ; - void cbSystemPropertyChanged(const am_SystemProperty_s& SystemProperty) ; - void cbTimingInformationChanged(const am_mainConnectionID_t mainConnection, const am_timeSync_t time) ; -private: - DBusMessageHandler mDBUSMessageHandler; - CommandReceiverShadow mCommandReceiverShadow; - DBusWrapper* mDBusWrapper; - CommandReceiveInterface* mCommandReceiveInterface; - - /** - * list of sinks, needed to send out only deltas - */ - std::vector mlistSinks; - - /** - * list of sources, needed to send out only deltas - */ - std::vector mlistSources; - - /** - * used as comparison function for am_SinkType_s - */ - struct sortBySinkID - { - bool operator()(const am_SinkType_s & a, const am_SinkType_s & b) - { - return (a.sinkID < b.sinkID); - } - }; - - /** - * used as comparison function for am_SourceType_s - */ - struct sortBySourceID - { - bool operator()(const am_SourceType_s & a, const am_SourceType_s & b) - { - return (a.sourceID < b.sourceID); - } - }; - -}; - -#endif /* COMMANDSENDER_H_ */ diff --git a/PluginCommandInterfaceDbus/include/DBusCommandSender.h b/PluginCommandInterfaceDbus/include/DBusCommandSender.h new file mode 100644 index 0000000..724f412 --- /dev/null +++ b/PluginCommandInterfaceDbus/include/DBusCommandSender.h @@ -0,0 +1,108 @@ +/** +* Copyright (C) 2011, BMW AG +* +* GeniviAudioMananger DbusPlugin +* +* \file CommandSender.h +* +* \date 20-Oct-2011 3:42:04 PM +* \author Christian Mueller (christian.ei.mueller@bmw.de) +* +* \section License +* GNU Lesser General Public License, version 2.1, with special exception (GENIVI clause) +* Copyright (C) 2011, BMW AG Christian Mueller Christian.ei.mueller@bmw.de +* +* This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. +* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License, version 2.1, for more details. +* You should have received a copy of the GNU Lesser General Public License, version 2.1, along with this program; if not, see . +* Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may also be applicable to programs even in cases in which the program is not a library in the technical sense. +* Linking AudioManager statically or dynamically with other modules is making a combined work based on AudioManager. You may license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to license your linked modules under the GNU Lesser General Public License, version 2.1, you may use the program under the following exception. +* As a special exception, the copyright holders of AudioManager give you permission to combine AudioManager with software programs or libraries that are released under any license unless such a combination is not permitted by the license of such a software program or library. You may copy and distribute such a system following the terms of the GNU Lesser General Public License, version 2.1, including this special exception, for AudioManager and the licenses of the other code concerned. +* Note that people who make modified versions of AudioManager are not obligated to grant this special exception for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, version 2.1, gives permission to release a modified version without this exception; this exception also makes it possible to release a modified version which carries forward this exception. +* +* THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN +*/ + + +#ifndef DBUSCOMMANDSENDER_H_ +#define DBUSCOMMANDSENDER_H_ + +#include "DBusMessageHandler.h" +#include "CommandReceiverShadow.h" +#include "DBusWrapper.h" + +#include +#include +#include + +using namespace am; + +#define DLT_CONTEXT DBusCommandPlugin +const char MY_NODE[]="CommandInterface"; + +/** + * Dbus Implementation of CommandSendInterface + */ +class DbusCommandSender: public CommandSendInterface { +public: + DbusCommandSender(); + virtual ~DbusCommandSender(); + am_Error_e startupInterface(CommandReceiveInterface* commandreceiveinterface) ; + am_Error_e stopInterface() ; + am_Error_e cbCommunicationReady() ; + am_Error_e cbCommunicationRundown() ; + void cbNumberOfMainConnectionsChanged() ; + void cbNumberOfSinksChanged() ; + void cbNumberOfSourcesChanged() ; + void cbNumberOfSinkClassesChanged() ; + void cbNumberOfSourceClassesChanged() ; + void cbMainConnectionStateChanged(const am_mainConnectionID_t connectionID, const am_ConnectionState_e connectionState) ; + void cbMainSinkSoundPropertyChanged(const am_sinkID_t sinkID, const am_MainSoundProperty_s SoundProperty) ; + void cbMainSourceSoundPropertyChanged(const am_sourceID_t sourceID, const am_MainSoundProperty_s& SoundProperty) ; + void cbSinkAvailabilityChanged(const am_sinkID_t sinkID, const am_Availability_s& availability) ; + void cbSourceAvailabilityChanged(const am_sourceID_t sourceID, const am_Availability_s& availability) ; + void cbVolumeChanged(const am_sinkID_t sinkID, const am_mainVolume_t volume) ; + void cbSinkMuteStateChanged(const am_sinkID_t sinkID, const am_MuteState_e muteState) ; + void cbSystemPropertyChanged(const am_SystemProperty_s& SystemProperty) ; + void cbTimingInformationChanged(const am_mainConnectionID_t mainConnection, const am_timeSync_t time) ; +private: + DBusMessageHandler mDBUSMessageHandler; + CommandReceiverShadow mCommandReceiverShadow; + DBusWrapper* mDBusWrapper; + CommandReceiveInterface* mCommandReceiveInterface; + + /** + * list of sinks, needed to send out only deltas + */ + std::vector mlistSinks; + + /** + * list of sources, needed to send out only deltas + */ + std::vector mlistSources; + + /** + * used as comparison function for am_SinkType_s + */ + struct sortBySinkID + { + bool operator()(const am_SinkType_s & a, const am_SinkType_s & b) + { + return (a.sinkID < b.sinkID); + } + }; + + /** + * used as comparison function for am_SourceType_s + */ + struct sortBySourceID + { + bool operator()(const am_SourceType_s & a, const am_SourceType_s & b) + { + return (a.sourceID < b.sourceID); + } + }; + +}; + +#endif /* DBUSCOMMANDSENDER_H_ */ diff --git a/PluginCommandInterfaceDbus/src/CommandReceiverShadow.cpp b/PluginCommandInterfaceDbus/src/CommandReceiverShadow.cpp index 2e359fb..b53fb52 100644 --- a/PluginCommandInterfaceDbus/src/CommandReceiverShadow.cpp +++ b/PluginCommandInterfaceDbus/src/CommandReceiverShadow.cpp @@ -25,7 +25,7 @@ #include "CommandReceiverShadow.h" -#include "CommandSender.h" +#include "DBusCommandSender.h" #include "DBusWrapper.h" #include diff --git a/PluginCommandInterfaceDbus/src/CommandSender.cpp b/PluginCommandInterfaceDbus/src/CommandSender.cpp deleted file mode 100644 index 7b7f8ae..0000000 --- a/PluginCommandInterfaceDbus/src/CommandSender.cpp +++ /dev/null @@ -1,324 +0,0 @@ -/** -* Copyright (C) 2011, BMW AG -* -* GeniviAudioMananger DbusPlugin -* -* \file CommandSender.cpp -* -* \date 20-Oct-2011 3:42:04 PM -* \author Christian Mueller (christian.ei.mueller@bmw.de) -* -* \section License -* GNU Lesser General Public License, version 2.1, with special exception (GENIVI clause) -* Copyright (C) 2011, BMW AG Christian Mueller Christian.ei.mueller@bmw.de -* -* This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. -* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License, version 2.1, for more details. -* You should have received a copy of the GNU Lesser General Public License, version 2.1, along with this program; if not, see . -* Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may also be applicable to programs even in cases in which the program is not a library in the technical sense. -* Linking AudioManager statically or dynamically with other modules is making a combined work based on AudioManager. You may license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to license your linked modules under the GNU Lesser General Public License, version 2.1, you may use the program under the following exception. -* As a special exception, the copyright holders of AudioManager give you permission to combine AudioManager with software programs or libraries that are released under any license unless such a combination is not permitted by the license of such a software program or library. You may copy and distribute such a system following the terms of the GNU Lesser General Public License, version 2.1, including this special exception, for AudioManager and the licenses of the other code concerned. -* Note that people who make modified versions of AudioManager are not obligated to grant this special exception for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, version 2.1, gives permission to release a modified version without this exception; this exception also makes it possible to release a modified version which carries forward this exception. -* -* THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN -*/ - -#include "CommandSender.h" -#include "DBusMessageHandler.h" -#include "DBusWrapper.h" - -#include -#include -#include -#include -#include -#include - -DLT_DECLARE_CONTEXT(DBusCommandPlugin) - -/** - * factory for plugin loading - */ -extern "C" CommandSendInterface* PluginCommandInterfaceDbusFactory() -{ - return (new DbusCommandSender()); -} - -/** - * destroy instance of commandSendInterface - */ -extern "C" void destroyRoutingPluginInterfaceDbus(CommandSendInterface* commandSendInterface) -{ - delete commandSendInterface; -} - - -DbusCommandSender::DbusCommandSender() -: mDBUSMessageHandler(), - mCommandReceiverShadow(), - mDBusWrapper(NULL), - mCommandReceiveInterface(NULL) -{ - DLT_REGISTER_CONTEXT(DBusCommandPlugin,"DBP","DBus Plugin"); - DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("DbusCommandSender constructed")); -} - -DbusCommandSender::~DbusCommandSender() -{ - DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("DbusCommandSender destructed")); - DLT_UNREGISTER_CONTEXT(DBusCommandPlugin); -} - -am_Error_e DbusCommandSender::startupInterface(CommandReceiveInterface* commandreceiveinterface) -{ - DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("startupInterface called")); - - mCommandReceiveInterface=commandreceiveinterface; - mCommandReceiverShadow.setCommandReceiver(mCommandReceiveInterface); - mCommandReceiveInterface->getDBusConnectionWrapper(mDBusWrapper); - assert(mDBusWrapper!=NULL); - return (E_OK); -} - - - -am_Error_e DbusCommandSender::stopInterface() -{ - DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("stopInterface called")); - /** - * todo: finish DbusCommandSender::stopInterface(), what needs to be done? - */ - return(E_OK); -} - - - -am_Error_e DbusCommandSender::cbCommunicationReady() -{ - DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("cbCommunicationReady called")); - /** - * todo: implement DbusCommandSender::cbCommunicationReady() - */ -} - - - -am_Error_e DbusCommandSender::cbCommunicationRundown() -{ - DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("cbCommunicationRundown called")); - /** - * todo: implement DbusCommandSender::cbCommunicationRundown() - */ -} - - - -void DbusCommandSender::cbNumberOfMainConnectionsChanged() -{ - DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("cbNumberOfMainConnectionsChanged called")); - - mDBUSMessageHandler.initSignal(std::string(MY_NODE),std::string("NumberOfMainConnectionsChanged")); - mDBUSMessageHandler.sendMessage(); -} - - - -void DbusCommandSender::cbNumberOfSinksChanged() -{ - DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("cbNumberOfSinksChanged called")); - - std::vector newListSinks; - std::vector diffList; - mCommandReceiveInterface->getListMainSinks(newListSinks); - std::sort(newListSinks.begin(),newListSinks.end(),sortBySinkID()); - std::set_difference(newListSinks.begin(),newListSinks.end(),mlistSinks.begin(),mlistSinks.end(),std::back_inserter(diffList), sortBySinkID()); - assert(diffList.size()==1); - if (newListSinks.size()>mlistSinks.size()) - { - mDBUSMessageHandler.initSignal(std::string(MY_NODE),"SinkAdded"); - mDBUSMessageHandler.append(&diffList.at(0)); - - DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("send signal SinkAdded")); - } - else - { - mDBUSMessageHandler.initSignal(std::string(MY_NODE),"SinkRemoved"); - mDBUSMessageHandler.append(diffList.begin()->sinkID); - - DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("send signal SinkRemoved")); - } - - mDBUSMessageHandler.sendMessage(); - mlistSinks=newListSinks; -} - - - -void DbusCommandSender::cbNumberOfSourcesChanged() -{ - DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("cbNumberOfSourcesChanged called")); - - std::vector newlistSources; - std::vector diffList; - mCommandReceiveInterface->getListMainSources(newlistSources); - std::sort(newlistSources.begin(),newlistSources.end(),sortBySourceID()); - std::set_difference(newlistSources.begin(),newlistSources.end(),mlistSources.begin(),mlistSources.end(),std::back_inserter(diffList), sortBySourceID()); - assert(diffList.size()==1); - if (newlistSources.size()>mlistSources.size()) - { - mDBUSMessageHandler.initSignal(std::string(MY_NODE),"SourceAdded"); - mDBUSMessageHandler.append(&diffList.at(0)); - - DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("send signal SourceAdded")); - } - else - { - mDBUSMessageHandler.initSignal(std::string(MY_NODE),"SourceRemoved"); - mDBUSMessageHandler.append((dbus_uint16_t)diffList.begin()->sourceID); - - DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("send signal SourceRemoved")); - } - - mDBUSMessageHandler.sendMessage(); - mlistSources=newlistSources; -} - - -void DbusCommandSender::cbNumberOfSinkClassesChanged() -{ - DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("cbNumberOfSinkClassesChanged called")); - - mDBUSMessageHandler.initSignal(std::string(MY_NODE),std::string("NumberOfSinkClassesChanged")); - mDBUSMessageHandler.sendMessage(); -} - - - -void DbusCommandSender::cbNumberOfSourceClassesChanged() -{ - DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("cbNumberOfSourceClassesChanged called")); - - mDBUSMessageHandler.initSignal(std::string(MY_NODE),std::string("NumberOfSourceClassesChanged")); - mDBUSMessageHandler.sendMessage(); -} - - - -void DbusCommandSender::cbMainConnectionStateChanged(const am_mainConnectionID_t connectionID, const am_ConnectionState_e connectionState) -{ - DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("cbMainConnectionStateChanged called, connectionID"),DLT_INT16(connectionID),DLT_STRING("connectionState"),DLT_INT16(connectionState)); - - mDBUSMessageHandler.initSignal(std::string(MY_NODE),std::string("MainConnectionStateChanged")); - mDBUSMessageHandler.append((dbus_uint16_t)connectionID); - mDBUSMessageHandler.append((dbus_int16_t)connectionState); - mDBUSMessageHandler.sendMessage(); -} - - - -void DbusCommandSender::cbMainSinkSoundPropertyChanged(const am_sinkID_t sinkID, const am_MainSoundProperty_s SoundProperty) -{ - DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("cbMainSinkSoundPropertyChanged called, sinkID"),DLT_INT16(sinkID),DLT_STRING("SoundProperty.type"),DLT_INT16(SoundProperty.type),DLT_STRING("SoundProperty.value"),DLT_INT16(SoundProperty.value)); - - mDBUSMessageHandler.initSignal(std::string(MY_NODE),std::string("MainSinkSoundPropertyChanged")); - mDBUSMessageHandler.append((dbus_uint16_t)sinkID); - mDBUSMessageHandler.append(SoundProperty); - mDBUSMessageHandler.sendMessage(); -} - - - -void DbusCommandSender::cbMainSourceSoundPropertyChanged(const am_sourceID_t sourceID, const am_MainSoundProperty_s & SoundProperty) -{ - DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("cbMainSourceSoundPropertyChanged called, sourceID"),DLT_INT16(sourceID),DLT_STRING("SoundProperty.type"),DLT_INT16(SoundProperty.type),DLT_STRING("SoundProperty.value"),DLT_INT16(SoundProperty.value)); - - mDBUSMessageHandler.initSignal(std::string(MY_NODE),std::string("MainSourceSoundPropertyChanged")); - mDBUSMessageHandler.append((dbus_uint16_t)sourceID); - mDBUSMessageHandler.append(SoundProperty); - mDBUSMessageHandler.sendMessage(); -} - - - -void DbusCommandSender::cbSinkAvailabilityChanged(const am_sinkID_t sinkID, const am_Availability_s & availability) -{ - DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("cbSinkAvailabilityChanged called, sinkID"),DLT_INT16(sinkID),DLT_STRING("availability.availability"),DLT_INT16(availability.availability),DLT_STRING("SoundProperty.reason"),DLT_INT16(availability.availabilityReason)); - - mDBUSMessageHandler.initSignal(std::string(MY_NODE),std::string("SinkAvailabilityChanged")); - mDBUSMessageHandler.append((dbus_uint16_t)sinkID); - mDBUSMessageHandler.append(availability); - mDBUSMessageHandler.sendMessage(); -} - - - -void DbusCommandSender::cbSourceAvailabilityChanged(const am_sourceID_t sourceID, const am_Availability_s & availability) -{ - DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("cbSourceAvailabilityChanged called, sourceID"),DLT_INT16(sourceID),DLT_STRING("availability.availability"),DLT_INT16(availability.availability),DLT_STRING("SoundProperty.reason"),DLT_INT16(availability.availabilityReason)); - - mDBUSMessageHandler.initSignal(std::string(MY_NODE),std::string("SourceAvailabilityChanged")); - mDBUSMessageHandler.append((dbus_uint16_t)sourceID); - mDBUSMessageHandler.append(availability); - mDBUSMessageHandler.sendMessage(); -} - - - -void DbusCommandSender::cbVolumeChanged(const am_sinkID_t sinkID, const am_mainVolume_t volume) -{ - DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("cbVolumeChanged called, sinkID"),DLT_INT16(sinkID),DLT_STRING("volume"),DLT_INT16(volume)); - - mDBUSMessageHandler.initSignal(std::string(MY_NODE),std::string("VolumeChanged")); - mDBUSMessageHandler.append((dbus_uint16_t)sinkID); - mDBUSMessageHandler.append((dbus_int16_t)volume); - mDBUSMessageHandler.sendMessage(); -} - - - -void DbusCommandSender::cbSinkMuteStateChanged(const am_sinkID_t sinkID, const am_MuteState_e muteState) -{ - DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("cbSinkMuteStateChanged called, sinkID"),DLT_INT16(sinkID),DLT_STRING("muteState"),DLT_INT16(muteState)); - - mDBUSMessageHandler.initSignal(std::string(MY_NODE),std::string("SinkMuteStateChanged")); - mDBUSMessageHandler.append((dbus_uint16_t)sinkID); - mDBUSMessageHandler.append((dbus_int16_t)muteState); - mDBUSMessageHandler.sendMessage(); -} - - - -void DbusCommandSender::cbSystemPropertyChanged(const am_SystemProperty_s & SystemProperty) -{ - DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("cbSystemPropertyChanged called, SystemProperty.type"),DLT_INT16(SystemProperty.type),DLT_STRING("SystemProperty.value"),DLT_INT16(SystemProperty.value)); - - mDBUSMessageHandler.initSignal(std::string(MY_NODE),std::string("SystemPropertyChanged")); - mDBUSMessageHandler.append(SystemProperty); - mDBUSMessageHandler.sendMessage(); -} - - - -void DbusCommandSender::cbTimingInformationChanged(const am_mainConnectionID_t mainConnection, const am_timeSync_t time) -{ - DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("cbTimingInformationChanged called, mainConnectionID"),DLT_INT16(mainConnection),DLT_STRING("time"),DLT_INT16(time)); - - mDBUSMessageHandler.initSignal(std::string(MY_NODE),std::string("TimingInformationChanged")); - mDBUSMessageHandler.append((dbus_uint16_t)mainConnection); - mDBUSMessageHandler.append((dbus_int16_t)time); - mDBUSMessageHandler.sendMessage(); -} - - - - - - - - - - - - - - diff --git a/PluginCommandInterfaceDbus/src/DBusCommandSender.cpp b/PluginCommandInterfaceDbus/src/DBusCommandSender.cpp new file mode 100644 index 0000000..462e794 --- /dev/null +++ b/PluginCommandInterfaceDbus/src/DBusCommandSender.cpp @@ -0,0 +1,324 @@ +/** +* Copyright (C) 2011, BMW AG +* +* GeniviAudioMananger DbusPlugin +* +* \file CommandSender.cpp +* +* \date 20-Oct-2011 3:42:04 PM +* \author Christian Mueller (christian.ei.mueller@bmw.de) +* +* \section License +* GNU Lesser General Public License, version 2.1, with special exception (GENIVI clause) +* Copyright (C) 2011, BMW AG Christian Mueller Christian.ei.mueller@bmw.de +* +* This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. +* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License, version 2.1, for more details. +* You should have received a copy of the GNU Lesser General Public License, version 2.1, along with this program; if not, see . +* Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may also be applicable to programs even in cases in which the program is not a library in the technical sense. +* Linking AudioManager statically or dynamically with other modules is making a combined work based on AudioManager. You may license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to license your linked modules under the GNU Lesser General Public License, version 2.1, you may use the program under the following exception. +* As a special exception, the copyright holders of AudioManager give you permission to combine AudioManager with software programs or libraries that are released under any license unless such a combination is not permitted by the license of such a software program or library. You may copy and distribute such a system following the terms of the GNU Lesser General Public License, version 2.1, including this special exception, for AudioManager and the licenses of the other code concerned. +* Note that people who make modified versions of AudioManager are not obligated to grant this special exception for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, version 2.1, gives permission to release a modified version without this exception; this exception also makes it possible to release a modified version which carries forward this exception. +* +* THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN +*/ + +#include "DBusCommandSender.h" +#include "DBusMessageHandler.h" +#include "DBusWrapper.h" + +#include +#include +#include +#include +#include +#include + +DLT_DECLARE_CONTEXT(DBusCommandPlugin) + +/** + * factory for plugin loading + */ +extern "C" CommandSendInterface* PluginCommandInterfaceDbusFactory() +{ + return (new DbusCommandSender()); +} + +/** + * destroy instance of commandSendInterface + */ +extern "C" void destroyRoutingPluginInterfaceDbus(CommandSendInterface* commandSendInterface) +{ + delete commandSendInterface; +} + + +DbusCommandSender::DbusCommandSender() +: mDBUSMessageHandler(), + mCommandReceiverShadow(), + mDBusWrapper(NULL), + mCommandReceiveInterface(NULL) +{ + DLT_REGISTER_CONTEXT(DBusCommandPlugin,"DBP","DBus Plugin"); + DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("DbusCommandSender constructed")); +} + +DbusCommandSender::~DbusCommandSender() +{ + DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("DbusCommandSender destructed")); + DLT_UNREGISTER_CONTEXT(DBusCommandPlugin); +} + +am_Error_e DbusCommandSender::startupInterface(CommandReceiveInterface* commandreceiveinterface) +{ + DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("startupInterface called")); + + mCommandReceiveInterface=commandreceiveinterface; + mCommandReceiverShadow.setCommandReceiver(mCommandReceiveInterface); + mCommandReceiveInterface->getDBusConnectionWrapper(mDBusWrapper); + assert(mDBusWrapper!=NULL); + return (E_OK); +} + + + +am_Error_e DbusCommandSender::stopInterface() +{ + DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("stopInterface called")); + /** + * todo: finish DbusCommandSender::stopInterface(), what needs to be done? + */ + return(E_OK); +} + + + +am_Error_e DbusCommandSender::cbCommunicationReady() +{ + DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("cbCommunicationReady called")); + /** + * todo: implement DbusCommandSender::cbCommunicationReady() + */ +} + + + +am_Error_e DbusCommandSender::cbCommunicationRundown() +{ + DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("cbCommunicationRundown called")); + /** + * todo: implement DbusCommandSender::cbCommunicationRundown() + */ +} + + + +void DbusCommandSender::cbNumberOfMainConnectionsChanged() +{ + DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("cbNumberOfMainConnectionsChanged called")); + + mDBUSMessageHandler.initSignal(std::string(MY_NODE),std::string("NumberOfMainConnectionsChanged")); + mDBUSMessageHandler.sendMessage(); +} + + + +void DbusCommandSender::cbNumberOfSinksChanged() +{ + DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("cbNumberOfSinksChanged called")); + + std::vector newListSinks; + std::vector diffList; + mCommandReceiveInterface->getListMainSinks(newListSinks); + std::sort(newListSinks.begin(),newListSinks.end(),sortBySinkID()); + std::set_difference(newListSinks.begin(),newListSinks.end(),mlistSinks.begin(),mlistSinks.end(),std::back_inserter(diffList), sortBySinkID()); + assert(diffList.size()==1); + if (newListSinks.size()>mlistSinks.size()) + { + mDBUSMessageHandler.initSignal(std::string(MY_NODE),"SinkAdded"); + mDBUSMessageHandler.append(&diffList.at(0)); + + DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("send signal SinkAdded")); + } + else + { + mDBUSMessageHandler.initSignal(std::string(MY_NODE),"SinkRemoved"); + mDBUSMessageHandler.append(diffList.begin()->sinkID); + + DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("send signal SinkRemoved")); + } + + mDBUSMessageHandler.sendMessage(); + mlistSinks=newListSinks; +} + + + +void DbusCommandSender::cbNumberOfSourcesChanged() +{ + DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("cbNumberOfSourcesChanged called")); + + std::vector newlistSources; + std::vector diffList; + mCommandReceiveInterface->getListMainSources(newlistSources); + std::sort(newlistSources.begin(),newlistSources.end(),sortBySourceID()); + std::set_difference(newlistSources.begin(),newlistSources.end(),mlistSources.begin(),mlistSources.end(),std::back_inserter(diffList), sortBySourceID()); + assert(diffList.size()==1); + if (newlistSources.size()>mlistSources.size()) + { + mDBUSMessageHandler.initSignal(std::string(MY_NODE),"SourceAdded"); + mDBUSMessageHandler.append(&diffList.at(0)); + + DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("send signal SourceAdded")); + } + else + { + mDBUSMessageHandler.initSignal(std::string(MY_NODE),"SourceRemoved"); + mDBUSMessageHandler.append((dbus_uint16_t)diffList.begin()->sourceID); + + DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("send signal SourceRemoved")); + } + + mDBUSMessageHandler.sendMessage(); + mlistSources=newlistSources; +} + + +void DbusCommandSender::cbNumberOfSinkClassesChanged() +{ + DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("cbNumberOfSinkClassesChanged called")); + + mDBUSMessageHandler.initSignal(std::string(MY_NODE),std::string("NumberOfSinkClassesChanged")); + mDBUSMessageHandler.sendMessage(); +} + + + +void DbusCommandSender::cbNumberOfSourceClassesChanged() +{ + DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("cbNumberOfSourceClassesChanged called")); + + mDBUSMessageHandler.initSignal(std::string(MY_NODE),std::string("NumberOfSourceClassesChanged")); + mDBUSMessageHandler.sendMessage(); +} + + + +void DbusCommandSender::cbMainConnectionStateChanged(const am_mainConnectionID_t connectionID, const am_ConnectionState_e connectionState) +{ + DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("cbMainConnectionStateChanged called, connectionID"),DLT_INT16(connectionID),DLT_STRING("connectionState"),DLT_INT16(connectionState)); + + mDBUSMessageHandler.initSignal(std::string(MY_NODE),std::string("MainConnectionStateChanged")); + mDBUSMessageHandler.append((dbus_uint16_t)connectionID); + mDBUSMessageHandler.append((dbus_int16_t)connectionState); + mDBUSMessageHandler.sendMessage(); +} + + + +void DbusCommandSender::cbMainSinkSoundPropertyChanged(const am_sinkID_t sinkID, const am_MainSoundProperty_s SoundProperty) +{ + DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("cbMainSinkSoundPropertyChanged called, sinkID"),DLT_INT16(sinkID),DLT_STRING("SoundProperty.type"),DLT_INT16(SoundProperty.type),DLT_STRING("SoundProperty.value"),DLT_INT16(SoundProperty.value)); + + mDBUSMessageHandler.initSignal(std::string(MY_NODE),std::string("MainSinkSoundPropertyChanged")); + mDBUSMessageHandler.append((dbus_uint16_t)sinkID); + mDBUSMessageHandler.append(SoundProperty); + mDBUSMessageHandler.sendMessage(); +} + + + +void DbusCommandSender::cbMainSourceSoundPropertyChanged(const am_sourceID_t sourceID, const am_MainSoundProperty_s & SoundProperty) +{ + DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("cbMainSourceSoundPropertyChanged called, sourceID"),DLT_INT16(sourceID),DLT_STRING("SoundProperty.type"),DLT_INT16(SoundProperty.type),DLT_STRING("SoundProperty.value"),DLT_INT16(SoundProperty.value)); + + mDBUSMessageHandler.initSignal(std::string(MY_NODE),std::string("MainSourceSoundPropertyChanged")); + mDBUSMessageHandler.append((dbus_uint16_t)sourceID); + mDBUSMessageHandler.append(SoundProperty); + mDBUSMessageHandler.sendMessage(); +} + + + +void DbusCommandSender::cbSinkAvailabilityChanged(const am_sinkID_t sinkID, const am_Availability_s & availability) +{ + DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("cbSinkAvailabilityChanged called, sinkID"),DLT_INT16(sinkID),DLT_STRING("availability.availability"),DLT_INT16(availability.availability),DLT_STRING("SoundProperty.reason"),DLT_INT16(availability.availabilityReason)); + + mDBUSMessageHandler.initSignal(std::string(MY_NODE),std::string("SinkAvailabilityChanged")); + mDBUSMessageHandler.append((dbus_uint16_t)sinkID); + mDBUSMessageHandler.append(availability); + mDBUSMessageHandler.sendMessage(); +} + + + +void DbusCommandSender::cbSourceAvailabilityChanged(const am_sourceID_t sourceID, const am_Availability_s & availability) +{ + DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("cbSourceAvailabilityChanged called, sourceID"),DLT_INT16(sourceID),DLT_STRING("availability.availability"),DLT_INT16(availability.availability),DLT_STRING("SoundProperty.reason"),DLT_INT16(availability.availabilityReason)); + + mDBUSMessageHandler.initSignal(std::string(MY_NODE),std::string("SourceAvailabilityChanged")); + mDBUSMessageHandler.append((dbus_uint16_t)sourceID); + mDBUSMessageHandler.append(availability); + mDBUSMessageHandler.sendMessage(); +} + + + +void DbusCommandSender::cbVolumeChanged(const am_sinkID_t sinkID, const am_mainVolume_t volume) +{ + DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("cbVolumeChanged called, sinkID"),DLT_INT16(sinkID),DLT_STRING("volume"),DLT_INT16(volume)); + + mDBUSMessageHandler.initSignal(std::string(MY_NODE),std::string("VolumeChanged")); + mDBUSMessageHandler.append((dbus_uint16_t)sinkID); + mDBUSMessageHandler.append((dbus_int16_t)volume); + mDBUSMessageHandler.sendMessage(); +} + + + +void DbusCommandSender::cbSinkMuteStateChanged(const am_sinkID_t sinkID, const am_MuteState_e muteState) +{ + DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("cbSinkMuteStateChanged called, sinkID"),DLT_INT16(sinkID),DLT_STRING("muteState"),DLT_INT16(muteState)); + + mDBUSMessageHandler.initSignal(std::string(MY_NODE),std::string("SinkMuteStateChanged")); + mDBUSMessageHandler.append((dbus_uint16_t)sinkID); + mDBUSMessageHandler.append((dbus_int16_t)muteState); + mDBUSMessageHandler.sendMessage(); +} + + + +void DbusCommandSender::cbSystemPropertyChanged(const am_SystemProperty_s & SystemProperty) +{ + DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("cbSystemPropertyChanged called, SystemProperty.type"),DLT_INT16(SystemProperty.type),DLT_STRING("SystemProperty.value"),DLT_INT16(SystemProperty.value)); + + mDBUSMessageHandler.initSignal(std::string(MY_NODE),std::string("SystemPropertyChanged")); + mDBUSMessageHandler.append(SystemProperty); + mDBUSMessageHandler.sendMessage(); +} + + + +void DbusCommandSender::cbTimingInformationChanged(const am_mainConnectionID_t mainConnection, const am_timeSync_t time) +{ + DLT_LOG(DLT_CONTEXT,DLT_LOG_INFO, DLT_STRING("cbTimingInformationChanged called, mainConnectionID"),DLT_INT16(mainConnection),DLT_STRING("time"),DLT_INT16(time)); + + mDBUSMessageHandler.initSignal(std::string(MY_NODE),std::string("TimingInformationChanged")); + mDBUSMessageHandler.append((dbus_uint16_t)mainConnection); + mDBUSMessageHandler.append((dbus_int16_t)time); + mDBUSMessageHandler.sendMessage(); +} + + + + + + + + + + + + + + diff --git a/PluginCommandInterfaceDbus/src/DBusMessageHandler.cpp b/PluginCommandInterfaceDbus/src/DBusMessageHandler.cpp index e6ee3f6..315a51e 100644 --- a/PluginCommandInterfaceDbus/src/DBusMessageHandler.cpp +++ b/PluginCommandInterfaceDbus/src/DBusMessageHandler.cpp @@ -23,7 +23,7 @@ * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN */ #include "DBusMessageHandler.h" -#include "CommandSender.h" +#include "DBusCommandSender.h" #include "DBusConfiguration.h" #include -- cgit v1.2.1