* routing algorithm improvements

* routing algorithms first tests

2 files changed, 6 insertions, 3 deletions

diff --git a/AudioManagerDaemon/include/DatabaseHandler.h b/AudioManagerDaemon/include/DatabaseHandler.h
index 5d1cac7..96065bd 100644
--- a/AudioManagerDaemon/include/DatabaseHandler.h
+++ b/AudioManagerDaemon/include/DatabaseHandler.h
@@ -28,6 +28,7 @@
 #include "audiomanagertypes.h"
 #include <sqlite3.h>
 #include <map>
+#include <list>
 
 namespace am
 {
@@ -130,7 +131,7 @@ public:
     am_Error_e getDomainOfSink(const am_sinkID_t sinkID, am_domainID_t& domainID) const;
     am_Error_e getSoureState(const am_sourceID_t sourceID, am_SourceState_e& sourceState) const;
     am_Error_e getDomainState(const am_domainID_t domainID, am_DomainState_e state) const;
-    am_Error_e getRoutingTree(bool onlyfree, RoutingTree* tree, std::vector<RoutingTreeItem*>* flatTree);
+    am_Error_e getRoutingTree(bool onlyfree, RoutingTree& tree, std::vector<RoutingTreeItem*>& flatTree);
     am_Error_e peekDomain(const std::string& name, am_domainID_t& domainID);
     am_Error_e peekSink(const std::string& name, am_sinkID_t& sinkID);
     am_Error_e peekSource(const std::string& name, am_sourceID_t& sourceID);
diff --git a/AudioManagerDaemon/include/Router.h b/AudioManagerDaemon/include/Router.h
index 8fb859b..68e33b6 100644
--- a/AudioManagerDaemon/include/Router.h
+++ b/AudioManagerDaemon/include/Router.h
@@ -31,11 +31,12 @@ namespace am
 {
 
 class DatabaseHandler;
+class ControlSender;
 
 class Router
 {
 public:
-    Router(DatabaseHandler* iDatabaseHandler);
+    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();
 
@@ -44,6 +45,7 @@ private:
     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;
+    ControlSender* mControlSender;
 };
 
 class RoutingTreeItem
@@ -68,7 +70,7 @@ class RoutingTree
 public:
     RoutingTree(const am_domainID_t rootDomainID);
     RoutingTreeItem* insertItem(const am_domainID_t domainID, const am_gatewayID_t gatewayID, RoutingTreeItem *parent);
-    void getRoute(RoutingTreeItem* targetItem, std::vector<am_gatewayID_t>* listGateways);
+    void getRoute(RoutingTreeItem* targetItem, std::vector<am_gatewayID_t>& listGateways);
     am_domainID_t returnRootDomainID() const;
     RoutingTreeItem* returnRootItem();
     virtual ~RoutingTree();