diff options
author | Aleksandar Donchev <Aleksander.Donchev@partner.bmw.de> | 2015-10-02 13:09:08 +0200 |
---|---|---|
committer | Aleksandar Donchev <Aleksander.Donchev@partner.bmw.de> | 2015-10-02 13:09:08 +0200 |
commit | 6b730d5d2f993a7acddba2ba7ed649ef308a8e8e (patch) | |
tree | 4654ae96abe125990766bc172b566b19520c9205 /AudioManagerUtilities/src | |
parent | bd7ec24a2abe47ae4398b23282e8288e00eaec47 (diff) | |
download | audiomanager-6b730d5d2f993a7acddba2ba7ed649ef308a8e8e.tar.gz |
* Settings for commonAPI without binding code.
Signed-off-by: Christian Linke <christian.linke@bmw.de>
Diffstat (limited to 'AudioManagerUtilities/src')
-rw-r--r-- | AudioManagerUtilities/src/CAmCommonAPIWrapper.cpp | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/AudioManagerUtilities/src/CAmCommonAPIWrapper.cpp b/AudioManagerUtilities/src/CAmCommonAPIWrapper.cpp index 238fa32..6e0cb90 100644 --- a/AudioManagerUtilities/src/CAmCommonAPIWrapper.cpp +++ b/AudioManagerUtilities/src/CAmCommonAPIWrapper.cpp @@ -46,12 +46,11 @@ CAmCommonAPIWrapper::CAmCommonAPIWrapper(CAmSocketHandler* socketHandler, const mWatchToCheck(NULL) { assert(NULL!=socketHandler); - - //Get the runtime +//Get the runtime CommonAPI::Runtime::setProperty("LogContext", "AMCAPI"); mRuntime = CommonAPI::Runtime::get(); - logInfo("CommonAPI runtime has been loaded! Default Binding is", mRuntime->getDefaultBinding()); assert(NULL!=mRuntime); + logInfo("CommonAPI runtime has been loaded! Default Binding is", mRuntime->getDefaultBinding()); //Create the context if(applicationName.size()) @@ -61,17 +60,6 @@ CAmCommonAPIWrapper::CAmCommonAPIWrapper(CAmSocketHandler* socketHandler, const assert(NULL!=mContext); logInfo("CommonAPI main loop context with name '", mContext->getName(), "' has been created!"); -// #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( std::bind(&CAmCommonAPIWrapper::registerDispatchSource, this, std::placeholders::_1, std::placeholders::_2), @@ -89,9 +77,7 @@ CAmCommonAPIWrapper::~CAmCommonAPIWrapper() mContext->unsubscribeForDispatchSources(mDispatchSourceListenerSubscription); mContext->unsubscribeForWatches(mWatchListenerSubscription); mContext->unsubscribeForTimeouts(mTimeoutSourceListenerSubscription); - mFactory.reset(); mContext.reset(); - mRuntime.reset(); mpSocketHandler = NULL; mWatchToCheck = NULL; } |