summaryrefslogtreecommitdiff
path: root/AudioManagerDaemon/src
diff options
context:
space:
mode:
authorchristian mueller <christian.ei.mueller@bmw.de>2012-03-06 20:11:13 +0100
committerchristian mueller <christian.ei.mueller@bmw.de>2012-03-06 20:11:13 +0100
commitf23f9c3ecf40636f176107f6098c308f72fdbd5d (patch)
tree56343b3086da79c629ee58655a7f6886f1f85676 /AudioManagerDaemon/src
parente553e5bc869df63d2e8d3fa0c581b3798db9b439 (diff)
downloadaudiomanager-f23f9c3ecf40636f176107f6098c308f72fdbd5d.tar.gz
* removed all documentation to new place
* removed GENIVI copyright from headers * [GDLT-41] changed DLT dependency to 2.5.0
Diffstat (limited to 'AudioManagerDaemon/src')
-rw-r--r--AudioManagerDaemon/src/CAmCommandReceiver.cpp1
-rw-r--r--AudioManagerDaemon/src/CAmCommandSender.cpp1
-rw-r--r--AudioManagerDaemon/src/CAmControlReceiver.cpp1
-rw-r--r--AudioManagerDaemon/src/CAmControlSender.cpp1
-rw-r--r--AudioManagerDaemon/src/CAmDatabaseHandler.cpp1
-rw-r--r--AudioManagerDaemon/src/CAmDatabaseObserver.cpp1
-rw-r--r--AudioManagerDaemon/src/CAmDbusWrapper.cpp1
-rw-r--r--AudioManagerDaemon/src/CAmDltWrapper.cpp10
-rw-r--r--AudioManagerDaemon/src/CAmRouter.cpp1
-rw-r--r--AudioManagerDaemon/src/CAmRoutingReceiver.cpp1
-rw-r--r--AudioManagerDaemon/src/CAmRoutingSender.cpp1
-rw-r--r--AudioManagerDaemon/src/CAmSocketHandler.cpp1
-rw-r--r--AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp1
-rw-r--r--AudioManagerDaemon/src/CAmTelnetServer.cpp1
-rw-r--r--AudioManagerDaemon/src/main.cpp17
15 files changed, 16 insertions, 24 deletions
diff --git a/AudioManagerDaemon/src/CAmCommandReceiver.cpp b/AudioManagerDaemon/src/CAmCommandReceiver.cpp
index 95554bd..d656720 100644
--- a/AudioManagerDaemon/src/CAmCommandReceiver.cpp
+++ b/AudioManagerDaemon/src/CAmCommandReceiver.cpp
@@ -1,5 +1,4 @@
/**
- * Copyright (C) 2012, GENIVI Alliance, Inc.
* Copyright (C) 2012, BMW AG
*
* This file is part of GENIVI Project AudioManager.
diff --git a/AudioManagerDaemon/src/CAmCommandSender.cpp b/AudioManagerDaemon/src/CAmCommandSender.cpp
index d16485f..fc71ce5 100644
--- a/AudioManagerDaemon/src/CAmCommandSender.cpp
+++ b/AudioManagerDaemon/src/CAmCommandSender.cpp
@@ -1,5 +1,4 @@
/**
- * Copyright (C) 2012, GENIVI Alliance, Inc.
* Copyright (C) 2012, BMW AG
*
* This file is part of GENIVI Project AudioManager.
diff --git a/AudioManagerDaemon/src/CAmControlReceiver.cpp b/AudioManagerDaemon/src/CAmControlReceiver.cpp
index 3d64226..e7cee4b 100644
--- a/AudioManagerDaemon/src/CAmControlReceiver.cpp
+++ b/AudioManagerDaemon/src/CAmControlReceiver.cpp
@@ -1,5 +1,4 @@
/**
- * Copyright (C) 2012, GENIVI Alliance, Inc.
* Copyright (C) 2012, BMW AG
*
* This file is part of GENIVI Project AudioManager.
diff --git a/AudioManagerDaemon/src/CAmControlSender.cpp b/AudioManagerDaemon/src/CAmControlSender.cpp
index 39c29a7..9d82dcb 100644
--- a/AudioManagerDaemon/src/CAmControlSender.cpp
+++ b/AudioManagerDaemon/src/CAmControlSender.cpp
@@ -1,5 +1,4 @@
/**
- * Copyright (C) 2012, GENIVI Alliance, Inc.
* Copyright (C) 2012, BMW AG
*
* This file is part of GENIVI Project AudioManager.
diff --git a/AudioManagerDaemon/src/CAmDatabaseHandler.cpp b/AudioManagerDaemon/src/CAmDatabaseHandler.cpp
index a13b38c..5a5b6fb 100644
--- a/AudioManagerDaemon/src/CAmDatabaseHandler.cpp
+++ b/AudioManagerDaemon/src/CAmDatabaseHandler.cpp
@@ -1,5 +1,4 @@
/**
- * Copyright (C) 2012, GENIVI Alliance, Inc.
* Copyright (C) 2012, BMW AG
*
* This file is part of GENIVI Project AudioManager.
diff --git a/AudioManagerDaemon/src/CAmDatabaseObserver.cpp b/AudioManagerDaemon/src/CAmDatabaseObserver.cpp
index 775b239..ae81a4e 100644
--- a/AudioManagerDaemon/src/CAmDatabaseObserver.cpp
+++ b/AudioManagerDaemon/src/CAmDatabaseObserver.cpp
@@ -1,5 +1,4 @@
/**
- * Copyright (C) 2012, GENIVI Alliance, Inc.
* Copyright (C) 2012, BMW AG
*
* This file is part of GENIVI Project AudioManager.
diff --git a/AudioManagerDaemon/src/CAmDbusWrapper.cpp b/AudioManagerDaemon/src/CAmDbusWrapper.cpp
index 6148edf..115d33d 100644
--- a/AudioManagerDaemon/src/CAmDbusWrapper.cpp
+++ b/AudioManagerDaemon/src/CAmDbusWrapper.cpp
@@ -1,5 +1,4 @@
/**
- * Copyright (C) 2012, GENIVI Alliance, Inc.
* Copyright (C) 2012, BMW AG
*
* This file is part of GENIVI Project AudioManager.
diff --git a/AudioManagerDaemon/src/CAmDltWrapper.cpp b/AudioManagerDaemon/src/CAmDltWrapper.cpp
index 7890e64..6b9e6a5 100644
--- a/AudioManagerDaemon/src/CAmDltWrapper.cpp
+++ b/AudioManagerDaemon/src/CAmDltWrapper.cpp
@@ -1,5 +1,4 @@
/**
- * Copyright (C) 2012, GENIVI Alliance, Inc.
* Copyright (C) 2012, BMW AG
*
* This file is part of GENIVI Project AudioManager.
@@ -25,6 +24,7 @@
#include <string>
#include <sstream>
#include <iostream>
+#include <string.h>
namespace am
{
@@ -46,6 +46,8 @@ void CAmDltWrapper::unregisterContext(DltContext & handle)
{
#ifdef WITH_DLT
dlt_unregister_context(&handle);
+#else
+ (void) handle;
#endif
}
@@ -68,6 +70,9 @@ void CAmDltWrapper::registerApp(const char *appid, const char *description)
dlt_register_app(appid, description);
//register a default context
dlt_register_context(&mDltContext, "def", "default Context registered by DLTWrapper CLass");
+#else
+ (void) appid;
+ (void) description;
#endif
}
@@ -76,8 +81,8 @@ void CAmDltWrapper::registerContext(DltContext& handle, const char *contextid, c
#ifdef WITH_DLT
dlt_register_context(&handle, contextid, description);
#else
+ (void) handle;
memcpy(&mDltContext.contextID,contextid,4);
- strlen(description);
const size_t str_len = strlen(description);
if(str_len < 2000)
{
@@ -89,6 +94,7 @@ void CAmDltWrapper::registerContext(DltContext& handle, const char *contextid, c
void CAmDltWrapper::init(DltLogLevelType loglevel, DltContext* context)
{
+ (void) loglevel;
if (!context)
context = &mDltContext;
#ifdef WITH_DLT
diff --git a/AudioManagerDaemon/src/CAmRouter.cpp b/AudioManagerDaemon/src/CAmRouter.cpp
index fd394a9..fe5a960 100644
--- a/AudioManagerDaemon/src/CAmRouter.cpp
+++ b/AudioManagerDaemon/src/CAmRouter.cpp
@@ -1,5 +1,4 @@
/**
- * Copyright (C) 2012, GENIVI Alliance, Inc.
* Copyright (C) 2012, BMW AG
*
* This file is part of GENIVI Project AudioManager.
diff --git a/AudioManagerDaemon/src/CAmRoutingReceiver.cpp b/AudioManagerDaemon/src/CAmRoutingReceiver.cpp
index 3e9aa65..ea6bfeb 100644
--- a/AudioManagerDaemon/src/CAmRoutingReceiver.cpp
+++ b/AudioManagerDaemon/src/CAmRoutingReceiver.cpp
@@ -1,5 +1,4 @@
/**
- * Copyright (C) 2012, GENIVI Alliance, Inc.
* Copyright (C) 2012, BMW AG
*
* This file is part of GENIVI Project AudioManager.
diff --git a/AudioManagerDaemon/src/CAmRoutingSender.cpp b/AudioManagerDaemon/src/CAmRoutingSender.cpp
index d14c826..e7594cf 100644
--- a/AudioManagerDaemon/src/CAmRoutingSender.cpp
+++ b/AudioManagerDaemon/src/CAmRoutingSender.cpp
@@ -1,5 +1,4 @@
/**
- * Copyright (C) 2012, GENIVI Alliance, Inc.
* Copyright (C) 2012, BMW AG
*
* This file is part of GENIVI Project AudioManager.
diff --git a/AudioManagerDaemon/src/CAmSocketHandler.cpp b/AudioManagerDaemon/src/CAmSocketHandler.cpp
index d13ea7b..2ae1337 100644
--- a/AudioManagerDaemon/src/CAmSocketHandler.cpp
+++ b/AudioManagerDaemon/src/CAmSocketHandler.cpp
@@ -1,5 +1,4 @@
/**
- * Copyright (C) 2012, GENIVI Alliance, Inc.
* Copyright (C) 2012, BMW AG
*
* This file is part of GENIVI Project AudioManager.
diff --git a/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp b/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp
index 46dccf3..ce54286 100644
--- a/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp
+++ b/AudioManagerDaemon/src/CAmTelnetMenuHelper.cpp
@@ -1,5 +1,4 @@
/**
- * Copyright (C) 2012, GENIVI Alliance, Inc.
* Copyright (C) 2012, BMW AG
*
* This file is part of GENIVI Project AudioManager.
diff --git a/AudioManagerDaemon/src/CAmTelnetServer.cpp b/AudioManagerDaemon/src/CAmTelnetServer.cpp
index 079e6e3..3af05af 100644
--- a/AudioManagerDaemon/src/CAmTelnetServer.cpp
+++ b/AudioManagerDaemon/src/CAmTelnetServer.cpp
@@ -1,5 +1,4 @@
/**
- * Copyright (C) 2012, GENIVI Alliance, Inc.
* Copyright (C) 2012, BMW AG
*
* This file is part of GENIVI Project AudioManager.
diff --git a/AudioManagerDaemon/src/main.cpp b/AudioManagerDaemon/src/main.cpp
index 9c5820d..c42640e 100644
--- a/AudioManagerDaemon/src/main.cpp
+++ b/AudioManagerDaemon/src/main.cpp
@@ -1,5 +1,4 @@
/**
- * Copyright (C) 2012, GENIVI Alliance, Inc.
* Copyright (C) 2012, BMW AG
*
* This file is part of GENIVI Project AudioManager.
@@ -21,12 +20,12 @@
*
*/
-//todo: create systemd compatibility
-//todo: all communication like all plugins loaded etc...
-//todo: check the startup sequence. Dbus shall be activated last...
-//todo: there is a bug in the visible flags of sinks and sources. fix it.
-//todo: clean up startup sequences controller, command and routing interfaces----
-//todo: package generation only works if package directory exists...
+/**
+ * \todo create systemd compatibility
+ * \todo all communication like all plugins loaded etc...
+ * \todo check the startup sequence. Dbus shall be activated last...
+ * \bug package generation only works if package directory exists...
+ */
#include "config.h"
@@ -61,9 +60,9 @@
#include "shared/CAmSocketHandler.h"
+using namespace am;
DLT_DECLARE_CONTEXT(AudioManager)
-using namespace am;
const char* USAGE_DESCRIPTION = "Usage:\tAudioManagerDaemon [options]\n"
"options:\t\n"
@@ -265,7 +264,7 @@ int main(int argc, char *argv[])
//parse the commandline options
parseCommandLine(argc, (char**) argv);
- CAmDltWrapper::instance(true)->registerApp("AudioManagerDeamon", "AudioManagerDeamon");
+ CAmDltWrapper::instance(enableNoDLTDebug)->registerApp("AudioManagerDeamon", "AudioManagerDeamon");
CAmDltWrapper::instance()->registerContext(AudioManager, "Main", "Main Context");
logInfo("The Audiomanager is started");
logInfo("The version of the Audiomanager", DAEMONVERSION);