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/RoutingReceiver.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/RoutingReceiver.h')
-rw-r--r-- | AudioManagerDaemon/include/RoutingReceiver.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/AudioManagerDaemon/include/RoutingReceiver.h b/AudioManagerDaemon/include/RoutingReceiver.h index f3ba2fe..a53a4ea 100644 --- a/AudioManagerDaemon/include/RoutingReceiver.h +++ b/AudioManagerDaemon/include/RoutingReceiver.h @@ -26,17 +26,16 @@ #define ROUTINGRECEIVER_H_ #include <routing/RoutingReceiveInterface.h> -#include <SocketHandler.h> #include <config.h> -#ifdef WITH_DBUS_WRAPPER -#include <dbus/DBusWrapper.h> -#endif -#include "DatabaseHandler.h" -#include "RoutingSender.h" -#include "ControlSender.h" namespace am { +class SocketHandler; +class DBusWrapper; +class DatabaseHandler; +class RoutingSender; +class ControlSender; + /** * Implements the Receiving side of the RoutingPlugins. */ @@ -52,7 +51,9 @@ public: void ackSetSourceVolumeChange(const am_Handle_s handle, const am_volume_t volume, const am_Error_e error) ; void ackSetSourceState(const am_Handle_s handle, const am_Error_e error) ; void ackSetSinkSoundProperty(const am_Handle_s handle, const am_Error_e error) ; + void ackSetSinkSoundProperties(const am_Handle_s handle, const am_Error_e error) ; void ackSetSourceSoundProperty(const am_Handle_s handle, const am_Error_e error) ; + void ackSetSourceSoundProperties(const am_Handle_s handle, const am_Error_e error) ; void ackCrossFading(const am_Handle_s handle, const am_HotSink_e hotSink, const am_Error_e error) ; void ackSourceVolumeTick(const am_Handle_s handle, const am_sourceID_t sourceID, const am_volume_t volume) ; void ackSinkVolumeTick(const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume) ; @@ -80,13 +81,14 @@ public: am_Error_e sendChangedData(const std::vector<am_EarlyData_s>& earlyData) ; am_Error_e getDBusConnectionWrapper(DBusWrapper*& dbusConnectionWrapper) const ; am_Error_e getSocketHandler(SocketHandler*& socketHandler) const; + uint16_t getInterfaceVersion() const; private: DatabaseHandler *mDatabaseHandler; //!< pointer to the databaseHandler RoutingSender *mRoutingSender; //!< pointer to the routingSender ControlSender *mControlSender; //!< pointer to the controlSender - DBusWrapper *mDBusWrapper; //!< pointer to dbuswrapper SocketHandler *mSocketHandler; //!< pointer to sockethandler + DBusWrapper *mDBusWrapper; //!< pointer to dbuswrapper }; |