AM: Reorganize daemon, core, utilities and tests to make use of the new logging architecture.

  - Known side-effect: CAmSerializer.h and TAmPluginTemplate.h no longer indirectly include
    dlt_user.h. Thus macros like DLT_DECLARE_CONTEXT and DLT_IMPORT_CONTEXT
    may be undefined in application code unless CAmDltWrapper.h or dlt_user.h is included explicitly.
  - Since the DLT functionality is now encapsulated inside a dedicated class, such declaration is
    usually superfluous and can be dropped.

Signed-off-by: Martin Koch <mkoch@de.adit-jv.com>

1 files changed, 3 insertions, 4 deletions

diff --git a/AudioManagerCore/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp b/AudioManagerCore/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp
index 27ed2b6..4f2c16a 100644
--- a/AudioManagerCore/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp
+++ b/AudioManagerCore/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp
@@ -25,13 +25,12 @@
 #include <string>
 #include <vector>
 #include <set>
-#include "CAmDltWrapper.h"
+#include "CAmLogWrapper.h"
 #include "CAmCommandLineSingleton.h"
 
 using namespace am;
 using namespace testing;
 
-DLT_DECLARE_CONTEXT(AudioManager)
 TCLAP::SwitchArg enableDebug ("V","logDlt","print DLT logs to stdout or dlt-daemon default on",true);
 
 ACTION(returnResyncConnection)
@@ -71,7 +70,6 @@ CAmControlInterfaceTest::CAmControlInterfaceTest() :
 
 CAmControlInterfaceTest::~CAmControlInterfaceTest()
 {
-	CAmDltWrapper::instance()->unregisterContext(AudioManager);
 }
 
 void CAmControlInterfaceTest::SetUp()
@@ -663,7 +661,8 @@ int main(int argc, char **argv)
 	catch (TCLAP::ArgException &e)  // catch any exceptions
 	{ std::cerr << "error: " << e.error() << " for arg " << e.argId() << std::endl; }
 	CAmCommandLineSingleton::instance()->preparse(argc,argv);
-	CAmDltWrapper::instanctiateOnce("ATEST","AudioManagerControlInterface Test",enableDebug.getValue(),CAmDltWrapper::logDestination::DAEMON);
+	CAmLogWrapper::instantiateOnce("ATEST","AudioManagerControlInterface Test"
+	        ,enableDebug.getValue() ? LS_ON : LS_OFF, LOG_SERVICE_DLT);
 	logInfo("RoutingSendInterface Test started");
     ::testing::InitGoogleTest(&argc, argv);
     return RUN_ALL_TESTS();