diff options
author | christian mueller <christian.ei.mueller@bmw.de> | 2012-02-27 10:11:08 +0100 |
---|---|---|
committer | christian mueller <christian.ei.mueller@bmw.de> | 2012-02-27 19:10:59 +0100 |
commit | aa93713377d28a8ce7821466ef828f79a18e982d (patch) | |
tree | f1efc6d524ef4656f93977e746d75428e06ac236 /AudioManagerDaemon/src/main.cpp | |
parent | 02b17a992e900ad82df8edf02e5e51e750ece36b (diff) | |
download | audiomanager-aa93713377d28a8ce7821466ef828f79a18e982d.tar.gz |
* [GAM-4] updated interfaces
* shifted mainpage doxygen from EA generated to mainpage.h
* added logo to doxygen documentation
* fixed compile bug in cmakelists when no plugins are build
* [ GAM-23 ]fixed plugin version recognition in cmake
* first working CAmSerializer with DatabaseObserver
Diffstat (limited to 'AudioManagerDaemon/src/main.cpp')
-rw-r--r-- | AudioManagerDaemon/src/main.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/AudioManagerDaemon/src/main.cpp b/AudioManagerDaemon/src/main.cpp index b4f0e99..dee5edb 100644 --- a/AudioManagerDaemon/src/main.cpp +++ b/AudioManagerDaemon/src/main.cpp @@ -277,7 +277,7 @@ int main(int argc, char *argv[]) TelnetServer iTelnetServer(&iSocketHandler, &iCommandSender, &iCommandReceiver, &iRoutingSender, &iRoutingReceiver, &iControlSender, &iControlReceiver, &iDatabaseHandler, &iRouter, telnetport, maxConnections); DatabaseObserver iObserver(&iCommandSender, &iRoutingSender, &iSocketHandler, &iTelnetServer); #else /*WITH_TELNET*/ - DatabaseObserver iObserver(&iCommandSender, &iSocketHandler, &iRoutingSender); + DatabaseObserver iObserver(&iCommandSender,&iRoutingSender, &iSocketHandler); #endif #else /*WITH_DBUS_WRAPPER*/ CommandReceiver iCommandReceiver(&iDatabaseHandler,&iControlSender,&iSocketHandler); @@ -295,11 +295,11 @@ int main(int argc, char *argv[]) //startup all the Plugins and Interfaces iControlSender.startupController(&iControlReceiver); - iCommandSender.startupInterface(&iCommandReceiver); - iRoutingSender.startupRoutingInterface(&iRoutingReceiver); + iCommandSender.startupInterfaces(&iCommandReceiver); + iRoutingSender.startupInterfaces(&iRoutingReceiver); //when the routingInterface is done, all plugins are loaded: - iControlSender.hookAllPluginsLoaded(); + iControlSender.setControllerReady(); //start the mainloop here.... iSocketHandler.start_listenting(); |