summaryrefslogtreecommitdiff
path: root/AudioManagerDaemon/src
diff options
context:
space:
mode:
authorChristian Linke <christian.linke@bmw.de>2013-06-26 17:14:08 +0200
committerChristian Linke <christian.linke@bmw.de>2013-06-26 17:46:46 +0200
commit6a5f434ff19963d0b37d89c06c0dab9249f34fd9 (patch)
tree92011bdac35c3ce51039b0d8d98e12d637037a66 /AudioManagerDaemon/src
parentc0fd43259ab0e269dd0918231c162d19d2dea593 (diff)
downloadaudiomanager-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')
-rw-r--r--AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp4
-rwxr-xr-xAudioManagerDaemon/src/CAmTelnetServer.cpp4
-rwxr-xr-xAudioManagerDaemon/src/main.cpp19
3 files changed, 17 insertions, 10 deletions
diff --git a/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp b/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp
index 70c9f9b..d8efd6a 100644
--- a/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp
+++ b/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp
@@ -25,7 +25,7 @@
#include "config.h"
#include "CAmRouter.h"
#include "CAmTelnetServer.h"
-#include "CAmDatabaseHandler.h"
+#include "CAmDatabaseHandlerInterface.h"
#include "CAmControlSender.h"
#include "CAmCommandSender.h"
#include "CAmRoutingSender.h"
@@ -44,7 +44,7 @@ namespace am {
CAmTelnetMenuHelper* CAmTelnetMenuHelper::instance = NULL;
/****************************************************************************/
-CAmTelnetMenuHelper::CAmTelnetMenuHelper(CAmSocketHandler *iSocketHandler, CAmCommandSender *iCommandSender, CAmCommandReceiver *iCommandReceiver, CAmRoutingSender *iRoutingSender, CAmRoutingReceiver *iRoutingReceiver, CAmControlSender *iControlSender, CAmControlReceiver *iControlReceiver, CAmDatabaseHandler *iDatabasehandler, CAmRouter *iRouter, CAmTelnetServer *iTelnetServer)
+CAmTelnetMenuHelper::CAmTelnetMenuHelper(CAmSocketHandler *iSocketHandler, CAmCommandSender *iCommandSender, CAmCommandReceiver *iCommandReceiver, CAmRoutingSender *iRoutingSender, CAmRoutingReceiver *iRoutingReceiver, CAmControlSender *iControlSender, CAmControlReceiver *iControlReceiver, CAmDatabaseHandlerInterface *iDatabasehandler, CAmRouter *iRouter, CAmTelnetServer *iTelnetServer)
/****************************************************************************/
:mpTelenetServer(iTelnetServer), mpSocketHandler(iSocketHandler), mpCommandSender(iCommandSender), mpCommandReceiver(iCommandReceiver), mpRoutingSender(iRoutingSender), mpRoutingReceiver(iRoutingReceiver), mpControlSender(iControlSender), mpControlReceiver(iControlReceiver), mpDatabasehandler(iDatabasehandler), mpRouter(iRouter)
{
diff --git a/AudioManagerDaemon/src/CAmTelnetServer.cpp b/AudioManagerDaemon/src/CAmTelnetServer.cpp
index ee8fb26..8ad0ecc 100755
--- a/AudioManagerDaemon/src/CAmTelnetServer.cpp
+++ b/AudioManagerDaemon/src/CAmTelnetServer.cpp
@@ -36,7 +36,7 @@
#include <unistd.h>
#include <stdexcept>
#include <cstdlib>
-#include "CAmDatabaseHandler.h"
+#include "CAmDatabaseHandlerInterface.h"
#include "CAmRoutingSender.h"
#include "CAmTelnetMenuHelper.h"
#include "shared/CAmDltWrapper.h"
@@ -48,7 +48,7 @@ CAmTelnetServer* CAmTelnetServer::mpInstance = NULL;
#define PRINT_BOOL(var) var ? output+="true\t\t" : output+="false\t\t";
-CAmTelnetServer::CAmTelnetServer(CAmSocketHandler *iSocketHandler, CAmCommandSender *iCommandSender, CAmCommandReceiver *iCommandReceiver, CAmRoutingSender *iRoutingSender, CAmRoutingReceiver *iRoutingReceiver, CAmControlSender *iControlSender, CAmControlReceiver *iControlReceiver, CAmDatabaseHandler *iDatabasehandler, CAmRouter *iRouter, unsigned int servPort, unsigned int maxConnections) :
+CAmTelnetServer::CAmTelnetServer(CAmSocketHandler *iSocketHandler, CAmCommandSender *iCommandSender, CAmCommandReceiver *iCommandReceiver, CAmRoutingSender *iRoutingSender, CAmRoutingReceiver *iRoutingReceiver, CAmControlSender *iControlSender, CAmControlReceiver *iControlReceiver, CAmDatabaseHandlerInterface *iDatabasehandler, CAmRouter *iRouter, unsigned int servPort, unsigned int maxConnections) :
telnetConnectFiredCB(this, &CAmTelnetServer::connectSocket), //
telnetReceiveFiredCB(this, &CAmTelnetServer::receiveData), //
telnetDispatchCB(this, &CAmTelnetServer::dispatchData), //
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*/