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/include/ControlReceiver.h | |
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/include/ControlReceiver.h')
-rw-r--r-- | AudioManagerDaemon/include/ControlReceiver.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/AudioManagerDaemon/include/ControlReceiver.h b/AudioManagerDaemon/include/ControlReceiver.h index 303d675..a8afb79 100644 --- a/AudioManagerDaemon/include/ControlReceiver.h +++ b/AudioManagerDaemon/include/ControlReceiver.h @@ -26,17 +26,16 @@ #define CONTRONLRECEIVER_H_ #include <control/ControlReceiveInterface.h> -#include <SocketHandler.h> #include <config.h> -#ifdef WITH_DBUS_WRAPPER -#include <dbus/DBusWrapper.h> -#endif -#include "DatabaseHandler.h" -#include "RoutingSender.h" -#include "CommandSender.h" + namespace am { +class SocketHandler; +class DatabaseHandler; +class RoutingSender; +class CommandSender; + /** * This class is used to receive all commands from the control interface */ @@ -53,7 +52,9 @@ public: am_Error_e setSinkVolume(am_Handle_s& handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time) ; am_Error_e setSourceVolume(am_Handle_s& handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_RampType_e rampType, const am_time_t time) ; am_Error_e setSinkSoundProperty(am_Handle_s& handle, const am_sinkID_t sinkID, const am_SoundProperty_s& soundProperty) ; + am_Error_e setSinkSoundProperties(am_Handle_s& handle, const am_sinkID_t sinkID, const std::vector<am_SoundProperty_s>& soundProperty) ; am_Error_e setSourceSoundProperty(am_Handle_s& handle, const am_sourceID_t sourceID, const am_SoundProperty_s& soundProperty) ; + am_Error_e setSourceSoundProperties(am_Handle_s& handle, const am_sourceID_t sourceID, const std::vector<am_SoundProperty_s>& soundProperty) ; am_Error_e setDomainState(const am_domainID_t domainID, const am_DomainState_e domainState) ; am_Error_e abortAction(const am_Handle_s handle) ; am_Error_e enterDomainDB(const am_Domain_s& domainData, am_domainID_t& domainID) ; @@ -107,6 +108,7 @@ public: void setRoutingReady() ; void setCommandReady() ; am_Error_e getSocketHandler(SocketHandler*& socketHandler); + uint16_t getInterfaceVersion() const; private: DatabaseHandler* mDatabaseHandler; //!< pointer tto the databasehandler |