From 58d62c4af578c10375bf9baa946e33f340c42a1f Mon Sep 17 00:00:00 2001 From: christian mueller Date: Thu, 26 Jan 2012 18:10:02 +0100 Subject: * 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 --- AudioManagerDaemon/include/ControlReceiver.h | 6 ++++-- AudioManagerDaemon/include/Router.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'AudioManagerDaemon/include') 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& 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 }; } diff --git a/AudioManagerDaemon/include/Router.h b/AudioManagerDaemon/include/Router.h index 68e33b6..ab7efab 100644 --- a/AudioManagerDaemon/include/Router.h +++ b/AudioManagerDaemon/include/Router.h @@ -41,7 +41,7 @@ public: virtual ~Router(); private: - am_Error_e findBestWay(std::vector& listRoute, std::vector::iterator routeIterator, std::vector::iterator gatewayIterator, int choiceNumber); + am_Error_e findBestWay(std::vector& listRoute, std::vector::iterator routeIterator, std::vector::iterator gatewayIterator); void listPossibleConnectionFormats(const am_sourceID_t sourceID, const am_sinkID_t sinkID, std::vector& listFormats) const; void listRestrictedOutputFormatsGateways(const am_gatewayID_t gatewayID, const am_ConnectionFormat_e sinkConnectionFormat, std::vector& listFormats) const; DatabaseHandler* mDatabaseHandler; -- cgit v1.2.1