diff options
author | christian mueller <christian.ei.mueller@bmw.de> | 2012-01-30 18:38:07 +0100 |
---|---|---|
committer | christian mueller <christian.ei.mueller@bmw.de> | 2012-01-31 17:40:32 +0100 |
commit | ad0c452e9890a35a1b7a6c2e2421e092c5cf2c2d (patch) | |
tree | 48cc38fa0a4ada0ece0f8571260c5438b64a675c /AudioManagerDaemon/include/PluginTemplate.h | |
parent | 58d62c4af578c10375bf9baa946e33f340c42a1f (diff) | |
download | audiomanager-ad0c452e9890a35a1b7a6c2e2421e092c5cf2c2d.tar.gz |
* wrapping DLT calls in a new Class because of performance, codesize and lazyness reasons
* the whole project now compiles without a warning with -pedantic
Diffstat (limited to 'AudioManagerDaemon/include/PluginTemplate.h')
-rw-r--r-- | AudioManagerDaemon/include/PluginTemplate.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/AudioManagerDaemon/include/PluginTemplate.h b/AudioManagerDaemon/include/PluginTemplate.h index e677acf..2c4dc42 100644 --- a/AudioManagerDaemon/include/PluginTemplate.h +++ b/AudioManagerDaemon/include/PluginTemplate.h @@ -25,11 +25,9 @@ #ifndef PLUGINTEMPLATE_H_ #define PLUGINTEMPLATE_H_ -#include <dlt/dlt.h> #include <dlfcn.h> #include <libgen.h> - -DLT_IMPORT_CONTEXT(AudioManager) +#include "DLTWrapper.h" namespace am { @@ -42,7 +40,7 @@ namespace am template<class T> T* getCreateFunction(const std::string& libname, void*& libraryHandle) { - DLT_LOG(AudioManager, DLT_LOG_INFO, DLT_STRING("Trying to load libray with name: "), DLT_STRING(libname.c_str())); + logInfo("getCreateFunction : Trying to load library with name: ",libname); // cut off directories char* fileWithPath = const_cast<char*>(libname.c_str()); @@ -57,7 +55,7 @@ template<class T> T* getCreateFunction(const std::string& libname, void*& librar const char* dlopen_error = dlerror(); if (!libraryHandle || dlopen_error) { - DLT_LOG(AudioManager, DLT_LOG_ERROR, DLT_STRING("dlopen failed"), DLT_STRING(dlopen_error)); + logError("getCreateFunction : dlopen failed",dlopen_error); return 0; } @@ -80,11 +78,11 @@ template<class T> T* getCreateFunction(const std::string& libname, void*& librar const char* dlsym_error = dlerror(); if (!createFunction || dlsym_error) { - DLT_LOG(AudioManager, DLT_LOG_ERROR, DLT_STRING("Failed to load shared lib entry point"), DLT_STRING(dlsym_error)); + logError("getCreateFunction: Failed to load shared lib entry point",dlsym_error); } else { - DLT_LOG(AudioManager, DLT_LOG_INFO, DLT_STRING("loaded successfully plugin"), DLT_STRING(createFunctionName.c_str())); + logInfo("getCreateFunction : loaded successfully plugin", createFunctionName); } return createFunction; } |