diff options
author | christian mueller <christian.ei.mueller@bmw.de> | 2012-01-26 18:10:02 +0100 |
---|---|---|
committer | christian mueller <christian.ei.mueller@bmw.de> | 2012-01-27 14:44:44 +0100 |
commit | 58d62c4af578c10375bf9baa946e33f340c42a1f (patch) | |
tree | c09d7547e4ec8ecdcbeac22b7bc6d845f0d50858 /AudioManagerDaemon/include/ControlReceiver.h | |
parent | 93c6b1973d59ce225e9cb5d2bcaea7d01c5fda52 (diff) | |
download | audiomanager-58d62c4af578c10375bf9baa946e33f340c42a1f.tar.gz |
* regenerated EA code based on Conti Feedback.
* changed paths of audiomanagertypes include in generated files
* changed order of parameters in asyncSetSinkSoundProperty / asyncSetSourceSoundProperty / cbTimingInformationChanged to have common style over all interfaces.
* changed default include paths for Controller etc...
* cleanup of warnings
Diffstat (limited to 'AudioManagerDaemon/include/ControlReceiver.h')
-rw-r--r-- | AudioManagerDaemon/include/ControlReceiver.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/AudioManagerDaemon/include/ControlReceiver.h b/AudioManagerDaemon/include/ControlReceiver.h index ac2168c..a40f800 100644 --- a/AudioManagerDaemon/include/ControlReceiver.h +++ b/AudioManagerDaemon/include/ControlReceiver.h @@ -35,6 +35,7 @@ class SocketHandler; class DatabaseHandler; class RoutingSender; class CommandSender; +class Router; /** * This class is used to receive all commands from the control interface @@ -42,8 +43,8 @@ class CommandSender; class ControlReceiver: public ControlReceiveInterface { public: - ControlReceiver(DatabaseHandler *iDatabaseHandler, RoutingSender *iRoutingSender, CommandSender *iCommandSender, SocketHandler *iSocketHandler); - ControlReceiver(DatabaseHandler *iDatabaseHandler, RoutingSender *iRoutingSender, CommandSender *iCommandSender); + ControlReceiver(DatabaseHandler *iDatabaseHandler, RoutingSender *iRoutingSender, CommandSender *iCommandSender, SocketHandler *iSocketHandler, Router* iRouter); + ControlReceiver(DatabaseHandler *iDatabaseHandler, RoutingSender *iRoutingSender, CommandSender *iCommandSender, Router* iRouter); virtual ~ControlReceiver(); am_Error_e getRoute(const bool onlyfree, const am_sourceID_t sourceID, const am_sinkID_t sinkID, std::vector<am_Route_s>& returnList); am_Error_e connect(am_Handle_s& handle, am_connectionID_t& connectionID, const am_ConnectionFormat_e format, const am_sourceID_t sourceID, const am_sinkID_t sinkID); @@ -116,6 +117,7 @@ private: RoutingSender* mRoutingSender; //!< pointer to the routing send interface. CommandSender* mCommandSender; //!< pointer to the command send interface SocketHandler* mSocketHandler; //!< pointer to the socketHandler + Router* mRouter; //!< pointer to the Router }; } |