diff options
| author | Aleksandar Donchev <Aleksander.Donchev@partner.bmw.de> | 2015-06-26 15:17:40 +0200 |
|---|---|---|
| committer | Christian Linke <christian.linke@bmw.de> | 2015-07-01 09:02:03 +0100 |
| commit | 5d4c1882bbb615720f395c4ff7d0a7223cbf3efb (patch) | |
| tree | f35f60c1d2cafe663464e31752ed7c8623d985f9 /AudioManagerUtilities/src/CAmCommonAPIWrapper.cpp | |
| parent | a3c39077c32ab467b8415d6923f8a82e49482ea8 (diff) | |
| download | audiomanager-5d4c1882bbb615720f395c4ff7d0a7223cbf3efb.tar.gz | |
* Common-API 3.1.2 support with dbus/someip binding.
Signed-off-by: Christian Linke <christian.linke@bmw.de>
Diffstat (limited to 'AudioManagerUtilities/src/CAmCommonAPIWrapper.cpp')
| -rw-r--r-- | AudioManagerUtilities/src/CAmCommonAPIWrapper.cpp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/AudioManagerUtilities/src/CAmCommonAPIWrapper.cpp b/AudioManagerUtilities/src/CAmCommonAPIWrapper.cpp index 9bfeadb..0c00d62 100644 --- a/AudioManagerUtilities/src/CAmCommonAPIWrapper.cpp +++ b/AudioManagerUtilities/src/CAmCommonAPIWrapper.cpp @@ -32,7 +32,12 @@ #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 @@ -69,9 +74,15 @@ CAmCommonAPIWrapper::CAmCommonAPIWrapper(CAmSocketHandler* socketHandler): mFactory = runtime->createFactory(mContext); assert(mFactory); #else - mFactory = CommonAPI::DBus::Factory::get(); - assert(mFactory); - mRuntime->registerFactory("dbus", mFactory); + #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 //Make subscriptions |