Some changes, renaming...

1 files changed, 4 insertions, 29 deletions

diff --git a/AudioManagerDaemon/src/main.cpp b/AudioManagerDaemon/src/main.cpp
index ef5da21..3aa5f8b 100644
--- a/AudioManagerDaemon/src/main.cpp
+++ b/AudioManagerDaemon/src/main.cpp
@@ -6,15 +6,16 @@
  */
 
 //todo: add debug commandline option to allow to use other than memory database
+//todo: make real daemon out of it- systemd conform
+
 #include "RoutingReceiver.h"
 #include "CommandReceiver.h"
 #include "ControlReceiver.h"
 #include "DatabaseHandler.h"
-#include "control/ControlSendInterface.h"
-#include "DBusWrapper.h"
-#include "ControlLoader.h"
+#include "ControlSender.h"
 #include "CommandSender.h"
 #include "RoutingSender.h"
+#include "DBusWrapper.h"
 #include <dbus/dbus.h>
 #include <dlt/dlt.h>
 
@@ -36,32 +37,6 @@ int main(int argc, char *argv[])
 	RoutingSender iRoutingSender;
 	CommandSender iCommandSender;
 
-	am_Connection_s lowCon;
-	am_connectionID_t cID;
-	lowCon.connectionID=0;
-	lowCon.sinkID=2;
-	lowCon.sourceID=3;
-	lowCon.connectionFormat=CF_ANALOG;
-	lowCon.delay=-1;
-	iDatabaseHandler.enterConnectionDB(lowCon,cID);
-
-	am_RoutingElement_s re;
-	re.connectionFormat=CF_ANALOG;
-	re.domainID=1;
-	re.sinkID=2;
-	re.sourceID=3;
-
-	am_MainConnection_s con;
-	am_mainConnectionID_t mainC;
-	con.connectionID=0;
-	con.connectionState=CS_CONNECTING;
-	con.route.sinkID=2;
-	con.route.sourceID=3;
-	con.route.route.push_back(re);
-	iControlReceiver.enterMainConnectionDB(con,mainC);
-	//ControlLoader iControlLoader;
-//	ControlSendInterface* iControlSender =iControlLoader.returnControl();
-
 
 	iCommandSender.startupInterface(&iCommandReceiver);