From b616ca1e864f7530b9dfce4c38f9d24a9f0809c9 Mon Sep 17 00:00:00 2001 From: Aleksandar Donchev Date: Fri, 10 Feb 2017 11:12:42 +0100 Subject: * many database observers can be registred now by the database handler. Signed-off-by: Christian Linke --- AudioManagerDaemon/src/main.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'AudioManagerDaemon/src/main.cpp') diff --git a/AudioManagerDaemon/src/main.cpp b/AudioManagerDaemon/src/main.cpp index 6f5c273..26d7cea 100755 --- a/AudioManagerDaemon/src/main.cpp +++ b/AudioManagerDaemon/src/main.cpp @@ -55,7 +55,6 @@ #include "CAmRoutingReceiver.h" #include "CAmCommandReceiver.h" #include "CAmControlReceiver.h" -#include "CAmDatabaseObserver.h" #include "CAmDltWrapper.h" #include "CAmSocketHandler.h" #include "CAmCommandLineSingleton.h" @@ -284,10 +283,10 @@ void mainProgram(int argc, char *argv[]) //later when the plugins are started, the commandline is already parsed and the objects defined before can be used to get the neccesary information CAmDatabaseHandlerMap iDatabaseHandler; - IAmDatabaseHandler *pDatabaseHandler = dynamic_cast( &iDatabaseHandler ); + IAmDatabaseHandler *pDatabaseHandler = dynamic_cast( &iDatabaseHandler ); CAmRoutingSender iRoutingSender(listRoutingPluginDirs,pDatabaseHandler); - CAmCommandSender iCommandSender(listCommandPluginDirs); + CAmCommandSender iCommandSender(listCommandPluginDirs, &iSocketHandler); CAmControlSender iControlSender(controllerPlugin.getValue(),&iSocketHandler); try @@ -332,11 +331,10 @@ CAmRouter iRouter(pDatabaseHandler, &iControlSender); #endif /*WITH_DBUS_WRAPPER*/ CAmControlReceiver iControlReceiver(pDatabaseHandler,&iRoutingSender,&iCommandSender,&iSocketHandler, &iRouter); -CAmDatabaseObserver iObserver(&iCommandSender,&iRoutingSender, &iSocketHandler); - - -iDatabaseHandler.registerObserver(&iObserver); +iDatabaseHandler.registerObserver(&iRoutingSender); +iDatabaseHandler.registerObserver(&iCommandSender); +iDatabaseHandler.registerObserver(&iRouter); //startup all the Plugins and Interfaces //at this point, commandline arguments can be parsed iControlSender.startupController(&iControlReceiver); -- cgit v1.2.1