From c0d1d6f620cfb934f2d79c7745677fab4f775bea Mon Sep 17 00:00:00 2001 From: Christian as GENIVI Maintainer Date: Tue, 18 Oct 2016 04:00:54 -0700 Subject: remove sqlite artefact Signed-off-by: Christian as GENIVI Maintainer --- AudioManagerDaemon/src/main.cpp | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/AudioManagerDaemon/src/main.cpp b/AudioManagerDaemon/src/main.cpp index 15cbe9a..f07cfae 100755 --- a/AudioManagerDaemon/src/main.cpp +++ b/AudioManagerDaemon/src/main.cpp @@ -32,12 +32,6 @@ #include "CAmDbusWrapper.h" #endif -#ifdef WITH_DATABASE_STORAGE - #include "CAmDatabaseHandlerSQLite.h" -#else - #include "CAmDatabaseHandlerMap.h" -#endif - #ifdef WITH_SYSTEMD_WATCHDOG #include "CAmWatchdog.h" #endif @@ -65,6 +59,7 @@ #include "CAmDltWrapper.h" #include "CAmSocketHandler.h" #include "CAmCommandLineSingleton.h" +#include "CAmDatabaseHandlerMap.h" using namespace am; @@ -236,9 +231,6 @@ void mainProgram(int argc, char *argv[]) cmd->add(dltOutput); #ifdef WITH_DBUS_WRAPPER cmd->add(dbusWrapperTypeBool); -#endif -#ifdef WITH_DATABASE_STORAGE - cmd->add(databasePath); #endif } catch (TCLAP::ArgException &e) // catch any exceptions @@ -332,18 +324,19 @@ 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(&iObserver); - //startup all the Plugins and Interfaces - //at this point, commandline arguments can be parsed - iControlSender.startupController(&iControlReceiver); - iCommandSender.startupInterfaces(&iCommandReceiver); - iRoutingSender.startupInterfaces(&iRoutingReceiver); +//startup all the Plugins and Interfaces +//at this point, commandline arguments can be parsed +iControlSender.startupController(&iControlReceiver); +iCommandSender.startupInterfaces(&iCommandReceiver); +iRoutingSender.startupInterfaces(&iRoutingReceiver); - //when the routingInterface is done, all plugins are loaded: - iControlSender.setControllerReady(); +//when the routingInterface is done, all plugins are loaded: +iControlSender.setControllerReady(); #ifdef WITH_SYSTEMD_WATCHDOG iWatchdog.startWatchdog(); -- cgit v1.2.1