diff options
Diffstat (limited to 'AudioManagerUtilities')
| -rw-r--r-- | AudioManagerUtilities/include/CAmSerializer.h | 20 | ||||
| -rw-r--r-- | AudioManagerUtilities/include/CAmSocketHandler.h | 10 | ||||
| -rw-r--r-- | AudioManagerUtilities/src/CAmCommonAPIWrapper.cpp | 12 | ||||
| -rw-r--r-- | AudioManagerUtilities/src/CAmDbusWrapper.cpp | 20 | ||||
| -rw-r--r-- | AudioManagerUtilities/src/CAmSocketHandler.cpp | 20 | ||||
| -rwxr-xr-x | AudioManagerUtilities/src/CAmWatchdog.cpp | 6 |
6 files changed, 44 insertions, 44 deletions
diff --git a/AudioManagerUtilities/include/CAmSerializer.h b/AudioManagerUtilities/include/CAmSerializer.h index 8abdf90..fbac255 100644 --- a/AudioManagerUtilities/include/CAmSerializer.h +++ b/AudioManagerUtilities/include/CAmSerializer.h @@ -809,13 +809,13 @@ namespace am * @param iSocketHandler pointer to the CAmSocketHandler */ CAmSerializer(CAmSocketHandler *iSocketHandler) : - mPipe(), // - mReturnPipe(), // + mPipe(), + mReturnPipe(), mHandle(), mpSocketHandler(iSocketHandler), - mListDelegatePoiters(), // - receiverCallbackT(this, &CAmSerializer::receiverCallback), // - dispatcherCallbackT(this, &CAmSerializer::dispatcherCallback), // + mListDelegatePoiters(), + receiverCallbackT(this, &CAmSerializer::receiverCallback), + dispatcherCallbackT(this, &CAmSerializer::dispatcherCallback), checkerCallbackT(this, &CAmSerializer::checkerCallback) { assert(NULL!=iSocketHandler); @@ -1172,13 +1172,13 @@ namespace am * @param iSocketHandler pointer to the CAmSocketHandler */ CAmSerializer(CAmSocketHandler *iSocketHandler) : - mPipe(), // - mReturnPipe(), // + mPipe(), + mReturnPipe(), mHandle(), mpSocketHandler(iSocketHandler), - mListDelegatePointers(), // - receiverCallbackT(this, &CAmSerializer::receiverCallback), // - dispatcherCallbackT(this, &CAmSerializer::dispatcherCallback), // + mListDelegatePointers(), + receiverCallbackT(this, &CAmSerializer::receiverCallback), + dispatcherCallbackT(this, &CAmSerializer::dispatcherCallback), checkerCallbackT(this, &CAmSerializer::checkerCallback) { assert(NULL!=iSocketHandler); diff --git a/AudioManagerUtilities/include/CAmSocketHandler.h b/AudioManagerUtilities/include/CAmSocketHandler.h index db3207e..04d19c3 100644 --- a/AudioManagerUtilities/include/CAmSocketHandler.h +++ b/AudioManagerUtilities/include/CAmSocketHandler.h @@ -113,7 +113,7 @@ private: public: TAmShPollFired(TClass* instance, void (TClass::*function)(const pollfd pollfd, const sh_pollHandle_t handle, void* userData)) : - mInstance(instance), // + mInstance(instance), mFunction(function) {} @@ -134,7 +134,7 @@ private: public: TAmShPollCheck(TClass* instance, bool (TClass::*function)(const sh_pollHandle_t handle, void* userData)) : - mInstance(instance), // + mInstance(instance), mFunction(function) {} @@ -155,7 +155,7 @@ private: public: TAmShPollDispatch(TClass* instance, bool (TClass::*function)(const sh_pollHandle_t handle, void* userData)) : - mInstance(instance), // + mInstance(instance), mFunction(function) {} @@ -176,7 +176,7 @@ private: public: TAmShTimerCallBack(TClass* instance, void (TClass::*function)(sh_timerHandle_t handle, void* userData)) : - IAmShTimerCallBack(), mInstance(instance), // + IAmShTimerCallBack(), mInstance(instance), mFunction(function) {} @@ -198,7 +198,7 @@ private: public: TAmShPollPrepare(TClass* instance, void (TClass::*function)(const sh_pollHandle_t handle, void* userData)) : - mInstance(instance), // + mInstance(instance), mFunction(function) {} diff --git a/AudioManagerUtilities/src/CAmCommonAPIWrapper.cpp b/AudioManagerUtilities/src/CAmCommonAPIWrapper.cpp index caa7aa8..f9cefa6 100644 --- a/AudioManagerUtilities/src/CAmCommonAPIWrapper.cpp +++ b/AudioManagerUtilities/src/CAmCommonAPIWrapper.cpp @@ -37,12 +37,12 @@ static CAmCommonAPIWrapper* pSingleCommonAPIInstance = NULL; CAmCommonAPIWrapper::CAmCommonAPIWrapper(CAmSocketHandler* socketHandler, const std::string & applicationName): - pCommonPrepareCallback(this,&CAmCommonAPIWrapper::commonPrepareCallback), // - pCommonDispatchCallback(this, &CAmCommonAPIWrapper::commonDispatchCallback), // - pCommonFireCallback(this, &CAmCommonAPIWrapper::commonFireCallback), // - pCommonCheckCallback(this, &CAmCommonAPIWrapper::commonCheckCallback), // - pCommonTimerCallback(this, &CAmCommonAPIWrapper::commonTimerCallback), // - mpSocketHandler(socketHandler), // + pCommonPrepareCallback(this,&CAmCommonAPIWrapper::commonPrepareCallback), + pCommonDispatchCallback(this, &CAmCommonAPIWrapper::commonDispatchCallback), + pCommonFireCallback(this, &CAmCommonAPIWrapper::commonFireCallback), + pCommonCheckCallback(this, &CAmCommonAPIWrapper::commonCheckCallback), + pCommonTimerCallback(this, &CAmCommonAPIWrapper::commonTimerCallback), + mpSocketHandler(socketHandler), mWatchToCheck(NULL) { assert(NULL!=socketHandler); diff --git a/AudioManagerUtilities/src/CAmDbusWrapper.cpp b/AudioManagerUtilities/src/CAmDbusWrapper.cpp index e25439c..1881526 100644 --- a/AudioManagerUtilities/src/CAmDbusWrapper.cpp +++ b/AudioManagerUtilities/src/CAmDbusWrapper.cpp @@ -50,16 +50,16 @@ DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE \ CAmDbusWrapper* CAmDbusWrapper::mpReference = NULL; CAmDbusWrapper::CAmDbusWrapper(CAmSocketHandler* socketHandler, DBusBusType type, const std::string& prefix, const std::string& objectPath) : - pDbusPrepareCallback(this,&CAmDbusWrapper::dbusPrepareCallback), // - pDbusDispatchCallback(this, &CAmDbusWrapper::dbusDispatchCallback), // - pDbusFireCallback(this, &CAmDbusWrapper::dbusFireCallback), // - pDbusCheckCallback(this, &CAmDbusWrapper::dbusCheckCallback), // - pDbusTimerCallback(this, &CAmDbusWrapper::dbusTimerCallback), // - mpDbusConnection(0), // - mDBusError(), // - mListNodes(), // - mpListTimerhandles(), // - mpSocketHandler(socketHandler), // + pDbusPrepareCallback(this,&CAmDbusWrapper::dbusPrepareCallback), + pDbusDispatchCallback(this, &CAmDbusWrapper::dbusDispatchCallback), + pDbusFireCallback(this, &CAmDbusWrapper::dbusFireCallback), + pDbusCheckCallback(this, &CAmDbusWrapper::dbusCheckCallback), + pDbusTimerCallback(this, &CAmDbusWrapper::dbusTimerCallback), + mpDbusConnection(0), + mDBusError(), + mListNodes(), + mpListTimerhandles(), + mpSocketHandler(socketHandler), mDbusType(type) { assert(mpSocketHandler!=0); diff --git a/AudioManagerUtilities/src/CAmSocketHandler.cpp b/AudioManagerUtilities/src/CAmSocketHandler.cpp index 472fa7f..9d9196a 100644 --- a/AudioManagerUtilities/src/CAmSocketHandler.cpp +++ b/AudioManagerUtilities/src/CAmSocketHandler.cpp @@ -46,21 +46,21 @@ namespace am { CAmSocketHandler::CAmSocketHandler() : - mEventFd(-1), // - mSignalFd(-1), // - mDispatchDone(true), // - mSetPollKeys(MAX_POLLHANDLE), // - mMapShPoll(), // + mEventFd(-1), + mSignalFd(-1), + mDispatchDone(true), + mSetPollKeys(MAX_POLLHANDLE), + mMapShPoll(), mSetTimerKeys(MAX_TIMERHANDLE), - mListTimer(), // + mListTimer(), #ifndef WITH_TIMERFD - mListActiveTimer(), // + mListActiveTimer(), #endif - mSetSignalhandlerKeys(MAX_POLLHANDLE), // - mSignalHandlers(), // + mSetSignalhandlerKeys(MAX_POLLHANDLE), + mSignalHandlers(), mInternalCodes(internal_codes_e::NO_ERROR) #ifndef WITH_TIMERFD - ,mStartTime() // + ,mStartTime() #endif { diff --git a/AudioManagerUtilities/src/CAmWatchdog.cpp b/AudioManagerUtilities/src/CAmWatchdog.cpp index 9de2a85..2161630 100755 --- a/AudioManagerUtilities/src/CAmWatchdog.cpp +++ b/AudioManagerUtilities/src/CAmWatchdog.cpp @@ -33,9 +33,9 @@ namespace am { CAmWatchdog::CAmWatchdog(CAmSocketHandler* CAmSocketHandler) : - TimerCallback(this, &CAmWatchdog::timerCallback), // - mpCAmSocketHandler(CAmSocketHandler), // - mHandle(0) // + TimerCallback(this, &CAmWatchdog::timerCallback), + mpCAmSocketHandler(CAmSocketHandler), + mHandle(0) { assert(mpCAmSocketHandler); |