diff options
| author | christian mueller <christian.ei.mueller@bmw.de> | 2012-02-21 18:23:05 +0100 |
|---|---|---|
| committer | christian mueller <christian.ei.mueller@bmw.de> | 2012-02-21 18:23:05 +0100 |
| commit | 2f60396684a5d8ed7b64aebf20cc9519f69c5600 (patch) | |
| tree | 0050aed18737129369e68d9ee95837796cfd1a84 /AudioManagerDaemon/include | |
| parent | 817b5ead32bb080bd5a6fff26b3957d400ba598c (diff) | |
| download | audiomanager-2f60396684a5d8ed7b64aebf20cc9519f69c5600.tar.gz | |
* [ GAM-6 ] enhace routing algorithm: changed the way the routing algorithm gets information from controller
Diffstat (limited to 'AudioManagerDaemon/include')
| -rw-r--r-- | AudioManagerDaemon/include/ControlSender.h | 2 | ||||
| -rw-r--r-- | AudioManagerDaemon/include/Router.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/AudioManagerDaemon/include/ControlSender.h b/AudioManagerDaemon/include/ControlSender.h index 3021c3c..66db61c 100644 --- a/AudioManagerDaemon/include/ControlSender.h +++ b/AudioManagerDaemon/include/ControlSender.h @@ -83,7 +83,7 @@ public: void cbAckSetSinkSoundProperties(const am_Handle_s handle, const am_Error_e error); void cbAckSetSinkSoundProperty(const am_Handle_s handle, const am_Error_e error); void cbAckSetSourceSoundProperties(const am_Handle_s handle, const am_Error_e error); - am_Error_e getConnectionFormatChoice(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const std::vector<am_ConnectionFormat_e> listPossibleConnectionFormats, std::vector<am_ConnectionFormat_e>& listPrioConnectionFormats); + am_Error_e getConnectionFormatChoice(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_Route_s listRoute, const std::vector<am_ConnectionFormat_e> listPossibleConnectionFormats, std::vector<am_ConnectionFormat_e> & listPrioConnectionFormats); uint16_t getInterfaceVersion() const; #ifdef UNIT_TEST diff --git a/AudioManagerDaemon/include/Router.h b/AudioManagerDaemon/include/Router.h index ab7efab..5af0cf7 100644 --- a/AudioManagerDaemon/include/Router.h +++ b/AudioManagerDaemon/include/Router.h @@ -36,12 +36,12 @@ class ControlSender; class Router { public: - Router(DatabaseHandler* iDatabaseHandler,ControlSender* iSender); + Router(DatabaseHandler* iDatabaseHandler, ControlSender* iSender); am_Error_e getRoute(const bool onlyfree, const am_sourceID_t sourceID, const am_sinkID_t sinkID, std::vector<am_Route_s>& returnList); virtual ~Router(); private: - am_Error_e findBestWay(std::vector<am_RoutingElement_s>& listRoute, std::vector<am_RoutingElement_s>::iterator routeIterator, std::vector<am_gatewayID_t>::iterator gatewayIterator); + am_Error_e findBestWay(am_sinkID_t sinkID, am_sourceID_t sourceID, std::vector<am_RoutingElement_s>& listRoute, std::vector<am_RoutingElement_s>::iterator routeIterator, std::vector<am_gatewayID_t>::iterator gatewayIterator); void listPossibleConnectionFormats(const am_sourceID_t sourceID, const am_sinkID_t sinkID, std::vector<am_ConnectionFormat_e>& listFormats) const; void listRestrictedOutputFormatsGateways(const am_gatewayID_t gatewayID, const am_ConnectionFormat_e sinkConnectionFormat, std::vector<am_ConnectionFormat_e>& listFormats) const; DatabaseHandler* mDatabaseHandler; |