diff options
| author | Christian Linke <christian.linke@bmw.de> | 2015-09-22 17:32:01 +0100 |
|---|---|---|
| committer | Christian Linke <christian.linke@bmw.de> | 2015-09-22 17:32:01 +0100 |
| commit | bd7ec24a2abe47ae4398b23282e8288e00eaec47 (patch) | |
| tree | 778cf5ffa440b44752bb1cbcfd4c75d950bd48c4 /AudioManagerUtilities/src | |
| parent | a9f86b94f3cc83a9474e8a0d7e21de4c8e452526 (diff) | |
| download | audiomanager-bd7ec24a2abe47ae4398b23282e8288e00eaec47.tar.gz | |
Remove nodestatemanager7.2
Make audiomanager compile with Dbus and CommonAPI Wrapper at the same time
Signed-off-by: Christian Linke <christian.linke@bmw.de>
Diffstat (limited to 'AudioManagerUtilities/src')
| -rw-r--r-- | AudioManagerUtilities/src/CAmCommonAPIWrapper.cpp | 47 |
1 files changed, 12 insertions, 35 deletions
diff --git a/AudioManagerUtilities/src/CAmCommonAPIWrapper.cpp b/AudioManagerUtilities/src/CAmCommonAPIWrapper.cpp index b6ac399..238fa32 100644 --- a/AudioManagerUtilities/src/CAmCommonAPIWrapper.cpp +++ b/AudioManagerUtilities/src/CAmCommonAPIWrapper.cpp @@ -30,18 +30,6 @@ #include "CAmDltWrapper.h" #include "CAmCommonAPIWrapper.h" -#ifndef COMMONAPI_INTERNAL_COMPILATION -#define COMMONAPI_INTERNAL_COMPILATION -#if COMMONAPI_USED_BINDING > 0 -#include <CommonAPI/SomeIP/Factory.hpp> -#else -#include <CommonAPI/DBus/DBusFactory.hpp> -#endif - -#undef COMMONAPI_INTERNAL_COMPILATION -#endif - - namespace am { @@ -58,42 +46,31 @@ CAmCommonAPIWrapper::CAmCommonAPIWrapper(CAmSocketHandler* socketHandler, const mWatchToCheck(NULL) { assert(NULL!=socketHandler); -//Get the runtime -#if COMMONAPI_VERSION_NUMBER < 300 - mRuntime = CommonAPI::Runtime::load(); -#else + + //Get the runtime CommonAPI::Runtime::setProperty("LogContext", "AMCAPI"); mRuntime = CommonAPI::Runtime::get(); logInfo("CommonAPI runtime has been loaded! Default Binding is", mRuntime->getDefaultBinding()); -#endif assert(NULL!=mRuntime); //Create the context -#if COMMONAPI_VERSION_NUMBER < 300 - mContext = std::make_shared<CommonAPI::MainLoopContext>(); -#else if(applicationName.size()) mContext = std::make_shared<CommonAPI::MainLoopContext>(applicationName); else mContext = std::make_shared<CommonAPI::MainLoopContext>(); -#endif assert(NULL!=mContext); logInfo("CommonAPI main loop context with name '", mContext->getName(), "' has been created!"); -#if COMMONAPI_VERSION_NUMBER < 300 - mFactory = mRuntime->createFactory(mContext); - assert(mFactory); -#else - #if COMMONAPI_USED_BINDING > 0 - mFactory = CommonAPI::SomeIP::Factory::get(); - assert(mFactory); - mRuntime->registerFactory("someip", mFactory); - #else - mFactory = CommonAPI::DBus::Factory::get(); - assert(mFactory); - mRuntime->registerFactory("dbus", mFactory); - #endif -#endif +// #if COMMONAPI_USED_BINDING > 0 +// mFactory = CommonAPI::SomeIP::Factory::get(); +// assert(mFactory); +// mRuntime->registerFactory("someip", mFactory); +// #else +// mFactory = CommonAPI::DBus::Factory::get(); +// assert(mFactory); +// mRuntime->registerFactory("dbus", mFactory); +// #endif + //Make subscriptions mDispatchSourceListenerSubscription = mContext->subscribeForDispatchSources( |