summaryrefslogtreecommitdiff
path: root/AudioManagerDaemon/src/main.cpp
diff options
context:
space:
mode:
authorchristian mueller <christian.ei.mueller@bmw.de>2011-12-21 23:58:33 +0100
committerchristian mueller <christian.ei.mueller@bmw.de>2011-12-21 23:58:33 +0100
commitb9b9e9ace5c6c7c493438ecf9a4b33b47543e8e3 (patch)
tree3b5492551a61dd862fb3a042795dd1e59c0cfed6 /AudioManagerDaemon/src/main.cpp
parentf8a41c140abbd1d193ed19f6c2be598adc01292a (diff)
downloadaudiomanager-b9b9e9ace5c6c7c493438ecf9a4b33b47543e8e3.tar.gz
* first version of SocketHandler working with DBus
* currently Sockethandler test not working
Diffstat (limited to 'AudioManagerDaemon/src/main.cpp')
-rw-r--r--AudioManagerDaemon/src/main.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/AudioManagerDaemon/src/main.cpp b/AudioManagerDaemon/src/main.cpp
index 34a0fc1..7da8f2d 100644
--- a/AudioManagerDaemon/src/main.cpp
+++ b/AudioManagerDaemon/src/main.cpp
@@ -34,6 +34,7 @@
//todo: check the startup sequence. Dbus shall be activated last...
//todo: there is a bug in the visible flags of sinks and sources. fix it.
//todo: check namespace handling. no use.. in headers
+//todo: make sure that iterators have a fixed end to prevent crashed while adding vectors while iterating on critical vectors
#include "DatabaseHandler.h"
#include "DatabaseObserver.h"
@@ -44,6 +45,7 @@
#include "CommandSender.h"
#include "RoutingSender.h"
#include "DBusWrapper.h"
+#include "SocketHandler.h"
#include <dbus/dbus.h>
#include <dlt/dlt.h>
@@ -70,7 +72,8 @@ int main(int argc, char *argv[])
//Instantiate all classes. Keep in same order !
DatabaseHandler iDatabaseHandler(std::string(":memory:"));
- DBusWrapper iDBusWrapper;
+ SocketHandler iSocketHandler;
+ DBusWrapper iDBusWrapper(&iSocketHandler);
RoutingSender iRoutingSender(listRoutingPluginDirs);
CommandSender iCommandSender(listCommandPluginDirs);
ControlSender iControlSender(std::string(CONTROLLER_PLUGIN));
@@ -86,8 +89,8 @@ int main(int argc, char *argv[])
iCommandSender.startupInterface(&iCommandReceiver);
iRoutingSender.startupRoutingInterface(&iRoutingReceiver);
-
- iDBusWrapper.dbusMainLoop();
+ iSocketHandler.start_listenting();
+ //iDBusWrapper.dbusMainLoop();
}