diff options
| author | Christian Linke <christian.linke@bmw.de> | 2013-06-26 17:14:08 +0200 |
|---|---|---|
| committer | Christian Linke <christian.linke@bmw.de> | 2013-06-26 17:46:46 +0200 |
| commit | 6a5f434ff19963d0b37d89c06c0dab9249f34fd9 (patch) | |
| tree | 92011bdac35c3ce51039b0d8d98e12d637037a66 /AudioManagerDaemon/src/main.cpp | |
| parent | c0fd43259ab0e269dd0918231c162d19d2dea593 (diff) | |
| download | audiomanager-6a5f434ff19963d0b37d89c06c0dab9249f34fd9.tar.gz | |
* make Telnetserver work with maphandler
* small changes to get cmake script cleaner
* clean up includes of main.cpp
* make DatabaseMaphandler structs private
Signed-off-by: Christian Linke <christian.linke@bmw.de>
Diffstat (limited to 'AudioManagerDaemon/src/main.cpp')
| -rwxr-xr-x | AudioManagerDaemon/src/main.cpp | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/AudioManagerDaemon/src/main.cpp b/AudioManagerDaemon/src/main.cpp index f9414a8..aa2fb19 100755 --- a/AudioManagerDaemon/src/main.cpp +++ b/AudioManagerDaemon/src/main.cpp @@ -39,6 +39,16 @@ #include "CAmNodeStateCommunicator.h" #endif +#ifdef WITH_DATABASE_STORAGE + #include "CAmDatabaseHandler.h" +#else + #include "CAmMapHandler.h" +#endif + +#ifdef WITH_SYSTEMD_WATCHDOG + #include "CAmWatchdog.h" +#endif + #include <sys/resource.h> #include <sys/stat.h> #include <unistd.h> @@ -50,9 +60,8 @@ #include <cstring> #include <cstdio> #include <new> + #include "CAmRouter.h" -#include "CAmDatabaseHandler.h" -#include "CAmMapHandler.h" #include "CAmControlSender.h" #include "CAmCommandSender.h" #include "CAmRoutingSender.h" @@ -60,11 +69,9 @@ #include "CAmCommandReceiver.h" #include "CAmControlReceiver.h" #include "CAmDatabaseObserver.h" -#include "CAmWatchdog.h" #include "shared/CAmDltWrapper.h" #include "shared/CAmSocketHandler.h" - - +#include "CAmDatabaseHandlerInterface.h" using namespace am; DLT_DECLARE_CONTEXT(AudioManager) @@ -315,7 +322,7 @@ void mainProgram() #endif /*WITH_SYSTEMD_WATCHDOG*/ #ifdef WITH_DATABASE_STORAGE - CAmDatabaseHandler * ptr_iDatabaseHandler = new CAmMapHandler(databasePath); + CAmDatabaseHandler * ptr_iDatabaseHandler = new CAmDatabaseHandler(databasePath); #else CAmMapHandler * ptr_iDatabaseHandler = new CAmMapHandler(); #endif /*WITH_DATABASE_STORAGE*/ |