diff options
author | christian mueller <christian.ei.mueller@bmw.de> | 2012-01-10 15:58:38 +0100 |
---|---|---|
committer | christian mueller <christian.ei.mueller@bmw.de> | 2012-01-12 00:09:34 +0100 |
commit | 472d0762b68ce0f2a755b4215515a3e031831495 (patch) | |
tree | 276e811f00dfe17cba15c56092b33d67ba2793f6 /AudioManagerDaemon/src/ControlReceiver.cpp | |
parent | 6ebae8c4d3a340c135ed2f5f611a0e1c31994164 (diff) | |
download | audiomanager-472d0762b68ce0f2a755b4215515a3e031831495.tar.gz |
* recreated the header files out of the model. Added versioning support in the headerfiles generated
* ensured compatibility with 64 bit systems while compiling dbus [ changed FindDBUS.cmake]
* updated the README to better support building
* updated typo in introspectable string of DBusWrapper
* reworked including strategie
* added getInterfafeVersion method on all interfaces
* added Interface Versioning support
* added version as part of .so ending
* it is no possible to set a vector of source and sink sound properties at a time
* added interface to ask for all loaded plugins on RoutingSender
* added first version of telnet server (not yet productive) - set to not active in CMakeLists.txt
* added changelog (created out of git commit log)
* added default values for all enum types to be save even on other if communication is on other domain
Diffstat (limited to 'AudioManagerDaemon/src/ControlReceiver.cpp')
-rw-r--r-- | AudioManagerDaemon/src/ControlReceiver.cpp | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/AudioManagerDaemon/src/ControlReceiver.cpp b/AudioManagerDaemon/src/ControlReceiver.cpp index 3a88c84..763bf2c 100644 --- a/AudioManagerDaemon/src/ControlReceiver.cpp +++ b/AudioManagerDaemon/src/ControlReceiver.cpp @@ -23,7 +23,11 @@ */ #include <config.h> +#include <SocketHandler.h> #include "ControlReceiver.h" +#include "DatabaseHandler.h" +#include "RoutingSender.h" +#include "CommandSender.h" #include <assert.h> #include <dlt/dlt.h> @@ -151,7 +155,21 @@ am_Error_e ControlReceiver::setSinkSoundProperty(am_Handle_s & handle, const am_ return mRoutingSender->asyncSetSinkSoundProperty(handle,sinkID,soundProperty); } +am_Error_e am::ControlReceiver::setSinkSoundProperties(am_Handle_s & handle, const am_sinkID_t sinkID, const std::vector<am_SoundProperty_s> & listSoundProperties) +{ + DLT_LOG(AudioManager,DLT_LOG_INFO, DLT_STRING("ControlReceiver::setSinkSoundProperties got called, sinkID="),DLT_INT(sinkID)); + uint16_t value; + bool noChange=true; + std::vector<am_SoundProperty_s>::const_iterator it=listSoundProperties.begin(); + for(;it!=listSoundProperties.end();++it) + { + if(mDatabaseHandler->getSinkSoundPropertyValue(sinkID,it->type,value)!=E_OK) return (E_UNKNOWN); + if(value!=it->value) noChange=false; + } + if (noChange) return (E_NO_CHANGE); + return (mRoutingSender->asyncSetSinkSoundProperties(handle,listSoundProperties,sinkID)); +} am_Error_e ControlReceiver::setSourceSoundProperty(am_Handle_s & handle, const am_sourceID_t sourceID, const am_SoundProperty_s & soundProperty) { @@ -163,6 +181,21 @@ am_Error_e ControlReceiver::setSourceSoundProperty(am_Handle_s & handle, const a return mRoutingSender->asyncSetSourceSoundProperty(handle,sourceID,soundProperty); } +am_Error_e am::ControlReceiver::setSourceSoundProperties(am_Handle_s & handle, const am_sourceID_t sourceID, const std::vector<am_SoundProperty_s> & listSoundProperties) +{ + DLT_LOG(AudioManager,DLT_LOG_INFO, DLT_STRING("ControlReceiver::setSourceSoundProperties got called, sourceID="),DLT_INT(sourceID)); + + uint16_t value; + bool noChange=true; + std::vector<am_SoundProperty_s>::const_iterator it=listSoundProperties.begin(); + for(;it!=listSoundProperties.end();++it) + { + if(mDatabaseHandler->getSourceSoundPropertyValue(sourceID,it->type,value)!=E_OK) return (E_UNKNOWN); + if(value!=it->value) noChange=false; + } + if (noChange) return (E_NO_CHANGE); + return (mRoutingSender->asyncSetSourceSoundProperties(handle,listSoundProperties,sourceID)); +} am_Error_e ControlReceiver::setDomainState(const am_domainID_t domainID, const am_DomainState_e domainState) @@ -528,6 +561,14 @@ am_Error_e am::ControlReceiver::getSocketHandler(SocketHandler *& socketHandler) } +uint16_t ControlReceiver::getInterfaceVersion() const +{ + return ControlReceiveVersion; +} + + + + |