diff options
author | Christian Linke <Christian.Linke@bmw.de> | 2016-06-21 05:09:06 -0700 |
---|---|---|
committer | Christian Linke <Christian.Linke@bmw.de> | 2016-06-21 05:09:06 -0700 |
commit | 791557b6f7c3efe78aafa20318ef7b90cfdb6e6d (patch) | |
tree | 95983ddadd92ad11955a5dd05e069eebae812e20 /AudioManagerDaemon/src/main.cpp | |
parent | 8f5563bd07f6d71b8358c9e9e84ea6551b60a734 (diff) | |
download | audiomanager-791557b6f7c3efe78aafa20318ef7b90cfdb6e6d.tar.gz |
some updates of the fix
Signed-off-by: Christian Linke <Christian.Linke@bmw.de>
Diffstat (limited to 'AudioManagerDaemon/src/main.cpp')
-rwxr-xr-x | AudioManagerDaemon/src/main.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/AudioManagerDaemon/src/main.cpp b/AudioManagerDaemon/src/main.cpp index 29cb4c9..ac58ebb 100755 --- a/AudioManagerDaemon/src/main.cpp +++ b/AudioManagerDaemon/src/main.cpp @@ -297,8 +297,11 @@ void mainProgram(int argc, char *argv[]) //in this place, the plugins can get the gloval commandlineparser via CAmCommandLineSingleton::instance() and add their options to the commandline //this must be done in the constructor. //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<IAmDatabaseHandler*>( &iDatabaseHandler ); - CAmRoutingSender iRoutingSender(listRoutingPluginDirs); + CAmRoutingSender iRoutingSender(listRoutingPluginDirs,pDatabaseHandler); CAmCommandSender iCommandSender(listCommandPluginDirs); CAmControlSender iControlSender(controllerPlugin.getValue(),&iSocketHandler); @@ -333,13 +336,7 @@ void mainProgram(int argc, char *argv[]) CAmWatchdog iWatchdog(&iSocketHandler); #endif /*WITH_SYSTEMD_WATCHDOG*/ -#ifdef WITH_DATABASE_STORAGE - CAmDatabaseHandlerSQLite iDatabaseHandler(databasePath.getValue()); -#else - CAmDatabaseHandlerMap iDatabaseHandler; -#endif /*WITH_DATABASE_STORAGE*/ - IAmDatabaseHandler *pDatabaseHandler = dynamic_cast<IAmDatabaseHandler*>( &iDatabaseHandler ); - CAmRouter iRouter(pDatabaseHandler, &iControlSender); +CAmRouter iRouter(pDatabaseHandler, &iControlSender); #ifdef WITH_DBUS_WRAPPER CAmCommandReceiver iCommandReceiver(pDatabaseHandler, &iControlSender, &iSocketHandler, &iDBusWrapper); |