diff options
22 files changed, 442 insertions, 230 deletions
diff --git a/AudioManagerCore/include/CAmDatabaseHandlerMap.h b/AudioManagerCore/include/CAmDatabaseHandlerMap.h index 3686027..2a3a9ec 100644 --- a/AudioManagerCore/include/CAmDatabaseHandlerMap.h +++ b/AudioManagerCore/include/CAmDatabaseHandlerMap.h @@ -258,109 +258,65 @@ public: /** * The following structures extend the base structures with the field 'reserved'. */ - -#define AM_SUBCLASS_BEGIN(Subclass, Class) \ - typedef struct Subclass : public Class\ - { - -#define AM_SUBCLASS_CONSTR(Subclass, Class) \ - Subclass():Class() - -#define AM_SUBCLASS_CONSTR_BODY()\ - {}; - -#define AM_SUBCLASS_COPY_OP_START(Subclass, Class) \ - Subclass & operator=(const Subclass & anObject)\ - {\ - if (this != &anObject)\ - {\ - Class::operator=(anObject); - -#define AM_SUBCLASS_COPY_OP_END()\ - }\ - return *this;\ - }; - -#define AM_SUBCLASS_OP(Subclass, Class) \ - Subclass & operator=(const Class & anObject)\ - {\ - if (this != &anObject)\ - Class::operator=(anObject);\ - return *this;\ - }; - -#define AM_SUBCLASS_END(Typedef) \ - void getDescription (std::string & outString) const;\ - } Typedef; - -#define AM_TYPEDEF_SUBCLASS_RESERVED_FLAG_BEGIN(Subclass, Class)\ - AM_SUBCLASS_BEGIN(Subclass, Class)\ - bool reserved;\ - AM_SUBCLASS_CONSTR(Subclass, Class)\ - ,reserved(false)\ - AM_SUBCLASS_CONSTR_BODY()\ - AM_SUBCLASS_COPY_OP_START(Subclass, Class)\ - reserved = anObject.reserved;\ - AM_SUBCLASS_COPY_OP_END()\ - AM_SUBCLASS_OP(Subclass, Class)\ - -#define AM_TYPEDEF_SUBCLASS_SOUND_PROPERTIES_BEGIN(Subclass, Class)\ - AM_SUBCLASS_BEGIN(Subclass, Class)\ - bool reserved;\ - std::unordered_map<am_CustomSoundPropertyType_t, int16_t> cacheSoundProperties;\ - std::unordered_map<am_CustomMainSoundPropertyType_t, int16_t> cacheMainSoundProperties;\ - AM_SUBCLASS_CONSTR(Subclass, Class)\ - ,reserved(false), cacheSoundProperties(), cacheMainSoundProperties()\ - AM_SUBCLASS_CONSTR_BODY()\ - AM_SUBCLASS_COPY_OP_START(Subclass, Class)\ - reserved = anObject.reserved;\ - cacheSoundProperties = anObject.cacheSoundProperties;\ - cacheMainSoundProperties = anObject.cacheMainSoundProperties;\ - AM_SUBCLASS_COPY_OP_END()\ - AM_SUBCLASS_OP(Subclass, Class)\ - -#define AM_TYPEDEF_SUBCLASS_BEGIN(Subclass, Class)\ - AM_SUBCLASS_BEGIN(Subclass, Class)\ - AM_SUBCLASS_COPY_OP_START(Subclass, Class)\ - AM_SUBCLASS_COPY_OP_END()\ - AM_SUBCLASS_OP(Subclass, Class)\ +#define AM_SUBCLASS(TYPE, SUBCLASS, CLASS, MEMBER, ASSIGN) \ + typedef struct SUBCLASS : public CLASS \ + { \ + MEMBER \ + bool reserved; \ + SUBCLASS() : CLASS(), reserved(false) {} \ + SUBCLASS & operator=(const SUBCLASS &anObject) \ + { \ + if (this != &anObject) \ + { \ + CLASS::operator=(anObject); \ + reserved = anObject.reserved; \ + ASSIGN \ + } \ + return *this; \ + } \ + SUBCLASS & operator=(const CLASS & anObject) \ + { \ + if (this != &anObject) { \ + CLASS::operator=(anObject);} \ + return *this; \ + } \ + void getDescription(std::string & outString) const; \ + } TYPE \ + +#define AM_SUBLCASS_ADD_MAP_TYPE(TYPE, NAME) std::unordered_map<TYPE, int16_t> NAME; +#define AM_SUBLCASS_ADD_ASSIGNMENT(NAME) NAME = anObject.NAME; private: - AM_TYPEDEF_SUBCLASS_RESERVED_FLAG_BEGIN(am_Domain_Database_s,am_Domain_s) - AM_SUBCLASS_END(AmDomain) + AM_SUBCLASS(AmDomain, am_Domain_Database_s, am_Domain_s, , ); - AM_TYPEDEF_SUBCLASS_SOUND_PROPERTIES_BEGIN(am_Sink_Database_s,am_Sink_s) - void getSinkType(am_SinkType_s & sinkType) const;\ - AM_SUBCLASS_END(AmSink) + AM_SUBCLASS(AmSink, am_Sink_Database_s, am_Sink_s, \ + void getSinkType(am_SinkType_s & sinkType) const; \ + AM_SUBLCASS_ADD_MAP_TYPE(am_CustomSoundPropertyType_t, cacheSoundProperties) \ + AM_SUBLCASS_ADD_MAP_TYPE(am_CustomMainSoundPropertyType_t, cacheMainSoundProperties), \ + AM_SUBLCASS_ADD_ASSIGNMENT(cacheSoundProperties) \ + AM_SUBLCASS_ADD_ASSIGNMENT(cacheMainSoundProperties) ); - AM_TYPEDEF_SUBCLASS_SOUND_PROPERTIES_BEGIN(am_Source_Database_s,am_Source_s) - void getSourceType(am_SourceType_s & sourceType) const;\ - AM_SUBCLASS_END(AmSource) + AM_SUBCLASS(AmSource, am_Source_Database_s, am_Source_s, + void getSourceType(am_SourceType_s & sourceType) const; \ + AM_SUBLCASS_ADD_MAP_TYPE(am_CustomSoundPropertyType_t, cacheSoundProperties) \ + AM_SUBLCASS_ADD_MAP_TYPE(am_CustomMainSoundPropertyType_t, cacheMainSoundProperties), \ + AM_SUBLCASS_ADD_ASSIGNMENT(cacheSoundProperties) \ + AM_SUBLCASS_ADD_ASSIGNMENT(cacheMainSoundProperties) ); - AM_TYPEDEF_SUBCLASS_RESERVED_FLAG_BEGIN(am_Connection_Database_s,am_Connection_s) - AM_SUBCLASS_END(AmConnection) + AM_SUBCLASS(AmConnection, am_Connection_Database_s, am_Connection_s, , ); - /** - * The following structures extend the base structures with print capabilities. - */ - AM_TYPEDEF_SUBCLASS_BEGIN(am_MainConnection_Database_s, am_MainConnection_s) - void getMainConnectionType(am_MainConnectionType_s & connectionType) const;\ - AM_SUBCLASS_END(AmMainConnection) + AM_SUBCLASS(AmMainConnection, am_MainConnection_Database_s, am_MainConnection_s, + void getMainConnectionType(am_MainConnectionType_s & connectionType) const;, ); - AM_TYPEDEF_SUBCLASS_BEGIN(am_SourceClass_Database_s, am_SourceClass_s) - AM_SUBCLASS_END(AmSourceClass) + AM_SUBCLASS(AmSourceClass, am_SourceClass_Database_s, am_SourceClass_s, , ); - AM_TYPEDEF_SUBCLASS_BEGIN(am_SinkClass_Database_s, am_SinkClass_s) - AM_SUBCLASS_END(AmSinkClass) + AM_SUBCLASS(AmSinkClass, am_SinkClass_Database_s, am_SinkClass_s, , ); - AM_TYPEDEF_SUBCLASS_BEGIN(am_Gateway_Database_s, am_Gateway_s) - AM_SUBCLASS_END(AmGateway) + AM_SUBCLASS(AmGateway, am_Gateway_Database_s, am_Gateway_s, , ); - AM_TYPEDEF_SUBCLASS_BEGIN(am_Converter_Database_s, am_Converter_s) - AM_SUBCLASS_END(AmConverter) + AM_SUBCLASS(AmConverter, am_Converter_Database_s, am_Converter_s, , ); - AM_TYPEDEF_SUBCLASS_BEGIN(am_Crossfader_Database_s, am_Crossfader_s) - AM_SUBCLASS_END(AmCrossfader) + AM_SUBCLASS(AmCrossfader, am_Crossfader_Database_s, am_Crossfader_s, , ); typedef std::unordered_map<am_domainID_t, AmDomain> AmMapDomain; diff --git a/AudioManagerCore/include/CAmLog.h b/AudioManagerCore/include/CAmLog.h index 35c6a41..cf7a3a6 100644 --- a/AudioManagerCore/include/CAmLog.h +++ b/AudioManagerCore/include/CAmLog.h @@ -44,7 +44,7 @@ #define DEFAULT_LOGFILE_PREFIX "am_dump_" #define DEFAULT_LOGFILE_EXT ".log" -#define DEL( aPointer ) delete aPointer, aPointer = NULL; +#define DEL( aPointer ) delete aPointer, aPointer = NULL /* */ typedef enum { eCAmLogNone = 0, eCAmLogStdout = 1, eCAmLogFile = 2 } eCAmLogType; diff --git a/AudioManagerCore/include/CAmRouter.h b/AudioManagerCore/include/CAmRouter.h index 88f73ea..f62141a 100644 --- a/AudioManagerCore/include/CAmRouter.h +++ b/AudioManagerCore/include/CAmRouter.h @@ -75,8 +75,7 @@ namespace am */ struct am_RoutingNodeData_s { - typedef enum - :int + typedef enum:int { SINK, SOURCE, GATEWAY, CONVERTER } am_NodeDataType_e; am_NodeDataType_e type; //!< data type:sink, source, gateway or converter @@ -114,18 +113,18 @@ namespace am #ifdef TRACE_GRAPH #define COUT_NODE(HEAD, NAME, ID) \ - std::cout << HEAD << "(" << std::setfill('0') << std::setw(4) << ID << " " << NAME << ")"; + std::cout << HEAD << "(" << std::setfill('0') << std::setw(4) << ID << " " << NAME << ")" void trace() const { if(type==SINK) - COUT_NODE("SI", data.sink->name, data.sink->sinkID ) + COUT_NODE("SI", data.sink->name, data.sink->sinkID ); else if(type==SOURCE) - COUT_NODE("SO", data.source->name, data.source->sourceID ) + COUT_NODE("SO", data.source->name, data.source->sourceID ); else if(type==GATEWAY) - COUT_NODE("GA", data.gateway->name, data.gateway->gatewayID ) + COUT_NODE("GA", data.gateway->name, data.gateway->gatewayID ); else if(type==CONVERTER) - COUT_NODE("CO", data.converter->name, data.converter->converterID ) + COUT_NODE("CO", data.converter->name, data.converter->converterID ); }; #endif diff --git a/AudioManagerCore/src/CAmCommandReceiver.cpp b/AudioManagerCore/src/CAmCommandReceiver.cpp index ccf9612..8b60c66 100644 --- a/AudioManagerCore/src/CAmCommandReceiver.cpp +++ b/AudioManagerCore/src/CAmCommandReceiver.cpp @@ -35,17 +35,17 @@ namespace am { CAmCommandReceiver::CAmCommandReceiver(IAmDatabaseHandler *iDatabaseHandler, CAmControlSender *iControlSender, CAmSocketHandler *iSocketHandler) : - mDatabaseHandler(iDatabaseHandler), // - mControlSender(iControlSender), // - mDBusWrapper(NULL), // - mSocketHandler(iSocketHandler), // - handleCount(0),// - mListStartupHandles(), // - mListRundownHandles(), // - mWaitStartup(false), // + mDatabaseHandler(iDatabaseHandler), + mControlSender(iControlSender), + mDBusWrapper(NULL), + mSocketHandler(iSocketHandler), + handleCount(0), + mListStartupHandles(), + mListRundownHandles(), + mWaitStartup(false), mWaitRundown(false), - mLastErrorStartup(E_OK), // - mLastErrorRundown(E_OK) // + mLastErrorStartup(E_OK), + mLastErrorRundown(E_OK) { assert(mDatabaseHandler!=NULL); @@ -54,16 +54,16 @@ CAmCommandReceiver::CAmCommandReceiver(IAmDatabaseHandler *iDatabaseHandler, CAm } CAmCommandReceiver::CAmCommandReceiver(IAmDatabaseHandler *iDatabaseHandler, CAmControlSender *iControlSender, CAmSocketHandler *iSocketHandler, CAmDbusWrapper *iDBusWrapper) : - mDatabaseHandler(iDatabaseHandler), // - mControlSender(iControlSender), // - mDBusWrapper(iDBusWrapper), // - mSocketHandler(iSocketHandler), // - handleCount(0),// - mListStartupHandles(), // - mListRundownHandles(), // - mWaitStartup(false), // - mWaitRundown(false), // - mLastErrorStartup(E_UNKNOWN), // + mDatabaseHandler(iDatabaseHandler), + mControlSender(iControlSender), + mDBusWrapper(iDBusWrapper), + mSocketHandler(iSocketHandler), + handleCount(0), + mListStartupHandles(), + mListRundownHandles(), + mWaitStartup(false), + mWaitRundown(false), + mLastErrorStartup(E_UNKNOWN), mLastErrorRundown(E_UNKNOWN) { assert(mDatabaseHandler!=NULL); diff --git a/AudioManagerCore/src/CAmCommandSender.cpp b/AudioManagerCore/src/CAmCommandSender.cpp index ded3247..1a61883 100644 --- a/AudioManagerCore/src/CAmCommandSender.cpp +++ b/AudioManagerCore/src/CAmCommandSender.cpp @@ -53,9 +53,9 @@ namespace am CAmCommandSender::CAmCommandSender(const std::vector<std::string>& listOfPluginDirectories, CAmSocketHandler *iSocketHandler) : CAmDatabaseHandlerMap::AmDatabaseObserverCallbacks(), - mListInterfaces(), // - mListLibraryHandles(), // - mListLibraryNames(), // + mListInterfaces(), + mListLibraryHandles(), + mListLibraryNames(), mCommandReceiver(), mSerializer(iSocketHandler) { diff --git a/AudioManagerCore/src/CAmControlReceiver.cpp b/AudioManagerCore/src/CAmControlReceiver.cpp index b1738e0..3280c04 100644 --- a/AudioManagerCore/src/CAmControlReceiver.cpp +++ b/AudioManagerCore/src/CAmControlReceiver.cpp @@ -38,11 +38,11 @@ namespace am { #define __METHOD_NAME__ std::string (std::string("CAmControlReceiver::") + __func__) CAmControlReceiver::CAmControlReceiver(IAmDatabaseHandler *iDatabaseHandler, CAmRoutingSender *iRoutingSender, CAmCommandSender *iCommandSender, CAmSocketHandler *iSocketHandler, CAmRouter* iRouter) : - mDatabaseHandler(iDatabaseHandler), // - mRoutingSender(iRoutingSender), // - mCommandSender(iCommandSender), // - mSocketHandler(iSocketHandler), // - mRouter(iRouter), // + mDatabaseHandler(iDatabaseHandler), + mRoutingSender(iRoutingSender), + mCommandSender(iCommandSender), + mSocketHandler(iSocketHandler), + mRouter(iRouter), mNodeStateCommunicator(NULL) { assert(mDatabaseHandler!=NULL); diff --git a/AudioManagerCore/src/CAmControlSender.cpp b/AudioManagerCore/src/CAmControlSender.cpp index 530de32..d80460d 100644 --- a/AudioManagerCore/src/CAmControlSender.cpp +++ b/AudioManagerCore/src/CAmControlSender.cpp @@ -43,12 +43,12 @@ namespace am CAmControlSender* CAmControlSender::mInstance=NULL; CAmControlSender::CAmControlSender(std::string controlPluginFile,CAmSocketHandler* sockethandler) : - receiverCallbackT(this, &CAmControlSender::receiverCallback),// - checkerCallbackT(this, &CAmControlSender::checkerCallback),// - dispatcherCallbackT(this, &CAmControlSender::dispatcherCallback), // - mPipe(), // - mlibHandle(NULL), // - mController(NULL), // + receiverCallbackT(this, &CAmControlSender::receiverCallback), + checkerCallbackT(this, &CAmControlSender::checkerCallback), + dispatcherCallbackT(this, &CAmControlSender::dispatcherCallback), + mPipe(), + mlibHandle(NULL), + mController(NULL), mSignal(0) { assert(sockethandler); @@ -563,11 +563,11 @@ void CAmControlSender::hookSystemSingleTimingInformationChanged(const am_connect * */ CAmControlSender::CAmControlSender() : - receiverCallbackT(this, &CAmControlSender::receiverCallback),// - checkerCallbackT(this, &CAmControlSender::checkerCallback),// - dispatcherCallbackT(this, &CAmControlSender::dispatcherCallback), // - mlibHandle(NULL), // - mController(NULL), // + receiverCallbackT(this, &CAmControlSender::receiverCallback), + checkerCallbackT(this, &CAmControlSender::checkerCallback), + dispatcherCallbackT(this, &CAmControlSender::dispatcherCallback), + mlibHandle(NULL), + mController(NULL), mSignal(0) { logInfo("CAmControlSender was loaded in test mode!"); diff --git a/AudioManagerCore/src/CAmDatabaseHandlerMap.cpp b/AudioManagerCore/src/CAmDatabaseHandlerMap.cpp index cc95d28..895b234 100644 --- a/AudioManagerCore/src/CAmDatabaseHandlerMap.cpp +++ b/AudioManagerCore/src/CAmDatabaseHandlerMap.cpp @@ -454,14 +454,14 @@ bool CAmDatabaseHandlerMap::AmMappedData::increaseConnectionID(int16_t & resultI CAmDatabaseHandlerMap::CAmDatabaseHandlerMap(): IAmDatabaseHandler(), - mFirstStaticSink(true), // - mFirstStaticSource(true), // - mFirstStaticGateway(true), // - mFirstStaticConverter(true), // - mFirstStaticSinkClass(true), // - mFirstStaticSourceClass(true), // - mFirstStaticCrossfader(true), // - mListConnectionFormat(), // + mFirstStaticSink(true), + mFirstStaticSource(true), + mFirstStaticGateway(true), + mFirstStaticConverter(true), + mFirstStaticSinkClass(true), + mFirstStaticSourceClass(true), + mFirstStaticCrossfader(true), + mListConnectionFormat(), mMappedData(), mDatabaseObservers() { diff --git a/AudioManagerCore/src/CAmLog.cpp b/AudioManagerCore/src/CAmLog.cpp index f68f660..5e58f27 100644 --- a/AudioManagerCore/src/CAmLog.cpp +++ b/AudioManagerCore/src/CAmLog.cpp @@ -42,7 +42,7 @@ CAmLog::CAmFileLogger::~CAmFileLogger() { std::ofstream* of = static_cast<std::ofstream*>(mOutputStream); of->close(); - DEL(mOutputStream) + DEL(mOutputStream); } } @@ -64,7 +64,7 @@ CAmLog::~CAmLog() void CAmLog::releaseLogger() { if(mLogger) - DEL(mLogger) + DEL(mLogger); } void CAmLog::instantiateLogger( const eCAmLogType type) diff --git a/AudioManagerCore/src/CAmRouter.cpp b/AudioManagerCore/src/CAmRouter.cpp index 6f1fe61..3c9bee4 100644 --- a/AudioManagerCore/src/CAmRouter.cpp +++ b/AudioManagerCore/src/CAmRouter.cpp @@ -48,7 +48,7 @@ namespace am CAmRouter::CAmRouter(IAmDatabaseHandler* iDatabaseHandler, CAmControlSender* iSender) : CAmDatabaseHandlerMap::AmDatabaseObserverCallbacks(), - mpDatabaseHandler(iDatabaseHandler), // + mpDatabaseHandler(iDatabaseHandler), mpControlSender(iSender), mUpdateGraphNodesAction(true), mMaxAllowedCycles(MAX_ALLOWED_DOMAIN_CYCLES), diff --git a/AudioManagerCore/src/CAmRoutingReceiver.cpp b/AudioManagerCore/src/CAmRoutingReceiver.cpp index dfcb6f6..b3815cd 100644 --- a/AudioManagerCore/src/CAmRoutingReceiver.cpp +++ b/AudioManagerCore/src/CAmRoutingReceiver.cpp @@ -36,18 +36,18 @@ namespace am { CAmRoutingReceiver::CAmRoutingReceiver(IAmDatabaseHandler *iDatabaseHandler, CAmRoutingSender *iRoutingSender, CAmControlSender *iControlSender, CAmSocketHandler *iSocketHandler) : - mpDatabaseHandler(iDatabaseHandler), // - mpRoutingSender(iRoutingSender), // - mpControlSender(iControlSender), // - mpSocketHandler(iSocketHandler), // - mpDBusWrapper(NULL), // - mListStartupHandles(), // - mListRundownHandles(), // - handleCount(0), // - mWaitStartup(false), // - mWaitRundown(false), // - mLastStartupError(E_OK), // - mLastRundownError(E_OK) // + mpDatabaseHandler(iDatabaseHandler), + mpRoutingSender(iRoutingSender), + mpControlSender(iControlSender), + mpSocketHandler(iSocketHandler), + mpDBusWrapper(NULL), + mListStartupHandles(), + mListRundownHandles(), + handleCount(0), + mWaitStartup(false), + mWaitRundown(false), + mLastStartupError(E_OK), + mLastRundownError(E_OK) { assert(mpDatabaseHandler!=NULL); assert(mpRoutingSender!=NULL); @@ -56,18 +56,18 @@ CAmRoutingReceiver::CAmRoutingReceiver(IAmDatabaseHandler *iDatabaseHandler, CAm } CAmRoutingReceiver::CAmRoutingReceiver(IAmDatabaseHandler *iDatabaseHandler, CAmRoutingSender *iRoutingSender, CAmControlSender *iControlSender, CAmSocketHandler *iSocketHandler, CAmDbusWrapper *iDBusWrapper) : - mpDatabaseHandler(iDatabaseHandler), // - mpRoutingSender(iRoutingSender), // - mpControlSender(iControlSender), // - mpSocketHandler(iSocketHandler), // - mpDBusWrapper(iDBusWrapper), // - mListStartupHandles(), // - mListRundownHandles(), // - handleCount(0), // - mWaitStartup(false), // + mpDatabaseHandler(iDatabaseHandler), + mpRoutingSender(iRoutingSender), + mpControlSender(iControlSender), + mpSocketHandler(iSocketHandler), + mpDBusWrapper(iDBusWrapper), + mListStartupHandles(), + mListRundownHandles(), + handleCount(0), + mWaitStartup(false), mWaitRundown(false), - mLastStartupError(E_OK), // - mLastRundownError(E_OK) // + mLastStartupError(E_OK), + mLastRundownError(E_OK) { assert(mpDatabaseHandler!=NULL); assert(mpRoutingSender!=NULL); diff --git a/AudioManagerCore/src/CAmRoutingSender.cpp b/AudioManagerCore/src/CAmRoutingSender.cpp index 603d7b3..9c6e658 100644 --- a/AudioManagerCore/src/CAmRoutingSender.cpp +++ b/AudioManagerCore/src/CAmRoutingSender.cpp @@ -48,15 +48,15 @@ namespace am CAmRoutingSender::CAmRoutingSender( const std::vector<std::string>& listOfPluginDirectories, IAmDatabaseHandler* databaseHandler) : - mHandleCount(0), // - mlistActiveHandles(), // - mListInterfaces(), // - mMapConnectionInterface(), // - mMapCrossfaderInterface(), // - mMapDomainInterface(), // - mMapSinkInterface(), // - mMapSourceInterface(), // - mpRoutingReceiver(), // + mHandleCount(0), + mlistActiveHandles(), + mListInterfaces(), + mMapConnectionInterface(), + mMapCrossfaderInterface(), + mMapDomainInterface(), + mMapSinkInterface(), + mMapSourceInterface(), + mpRoutingReceiver(), mpDatabaseHandler(databaseHandler) { loadPlugins(listOfPluginDirectories); 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); diff --git a/CMakeLists.txt b/CMakeLists.txt index 3919fac..8bfc7c6 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -169,7 +169,7 @@ write_basic_package_version_file( COMPATIBILITY SameMajorVersion ) configure_file( ${CMAKE_SOURCE_DIR}/docx/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/DoxyFile ) -configure_file( ${CMAKE_SOURCE_DIR}/cmake/config.cmake.in ${CMAKE_BINARY_DIR}/include/audiomanagerconfig.h ) +configure_file( ${CMAKE_SOURCE_DIR}/cmake/audiomanagerconfig.h.in ${CMAKE_BINARY_DIR}/include/audiomanagerconfig.h ) configure_file( ${CMAKE_SOURCE_DIR}/cmake/audiomanager.pc.in ${CMAKE_BINARY_DIR}/audiomanager.pc @ONLY ) add_subdirectory (AudioManagerUtilities) diff --git a/Foo/uncrustify.cfg b/Foo/uncrustify.cfg new file mode 100644 index 0000000..9effacb --- /dev/null +++ b/Foo/uncrustify.cfg @@ -0,0 +1,214 @@ +# Uncrustify 0.66.1_f + +# +# General options +# +newlines = lf # auto/lf/crlf/cr +input_tab_size = 4 # number +output_tab_size = 4 # number +utf8_bom = remove # ignore/add/remove/force + +# +# Indenting +# +indent_columns = 4 # number +indent_with_tabs = 0 # number +indent_align_string = true # false/true +indent_class = true # false/true +indent_class_colon = true # false/true +indent_class_on_colon = true # false/true +indent_ctor_init_leading = 4 # number +indent_ctor_init = 0 # number +indent_func_call_param = true # false/true +indent_func_def_param = true # false/true +indent_func_proto_param = true # false/true +indent_func_class_param = true # false/true +indent_func_ctor_var_param = true # false/true +indent_access_spec = -4 # number +indent_align_assign = false # false/true +indent_cpp_lambda_body = true # false/true + +# +# Spacing options +# +sp_arith = force # ignore/add/remove/force +sp_assign = force # ignore/add/remove/force +sp_assign_default = add # ignore/add/remove/force +sp_before_assign = force # ignore/add/remove/force +sp_after_assign = force # ignore/add/remove/force +sp_enum_assign = force # ignore/add/remove/force +sp_enum_before_assign = force # ignore/add/remove/force +sp_enum_after_assign = force # ignore/add/remove/force +sp_bool = force # ignore/add/remove/force +sp_compare = force # ignore/add/remove/force +sp_inside_paren = remove # ignore/add/remove/force +sp_paren_paren = remove # ignore/add/remove/force +sp_paren_brace = add # ignore/add/remove/force +sp_before_ptr_star = force # ignore/add/remove/force +sp_before_unnamed_ptr_star = force # ignore/add/remove/force +sp_after_ptr_star = remove # ignore/add/remove/force +sp_after_ptr_star_func = remove # ignore/add/remove/force +sp_before_byref = force # ignore/add/remove/force +sp_before_unnamed_byref = force # ignore/add/remove/force +sp_after_byref = remove # ignore/add/remove/force +sp_after_byref_func = remove # ignore/add/remove/force +sp_before_byref_func = force # ignore/add/remove/force +sp_before_sparen = force # ignore/add/remove/force +sp_after_comma = force # ignore/add/remove/force +sp_before_ellipsis = remove # ignore/add/remove/force +sp_after_cast = remove # ignore/add/remove/force +sp_inside_paren_cast = remove # ignore/add/remove/force +sp_cpp_cast_paren = remove # ignore/add/remove/force +sp_sizeof_paren = remove # ignore/add/remove/force +sp_after_type_brace_init_lst_open = force # ignore/add/remove/force +sp_before_type_brace_init_lst_close = force # ignore/add/remove/force +sp_type_func = force # ignore/add/remove/force +sp_func_proto_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren = remove # ignore/add/remove/force +sp_func_def_paren_empty = remove # ignore/add/remove/force +sp_inside_fparens = remove # ignore/add/remove/force +sp_inside_fparen = remove # ignore/add/remove/force +sp_inside_tparen = remove # ignore/add/remove/force +sp_func_call_paren = remove # ignore/add/remove/force +sp_func_call_paren_empty = remove # ignore/add/remove/force +sp_defined_paren = force # ignore/add/remove/force +sp_version_paren = remove # ignore/add/remove/force +sp_scope_paren = remove # ignore/add/remove/force +sp_brace_typedef = force # ignore/add/remove/force +sp_catch_brace = ignore # ignore/add/remove/force + +sp_cond_colon = add # ignore/add/remove/force +sp_cond_question = add # ignore/add/remove/force +sp_case_label = force # ignore/add/remove/force +sp_cmt_cpp_start = force # ignore/add/remove/force +sp_cmt_cpp_doxygen = true # false/true +sp_endif_cmt = force # ignore/add/remove/force +sp_after_new = force # ignore/add/remove/force + +# +# Code alignment (not left column spaces/tabs) +# +align_func_params = false # false/true +align_var_def_span = 1 # number +align_var_def_star_style = 2 # number +align_var_def_amp_style = 2 # number +align_assign_span = 1 # number +align_enum_equ_span = 8 # number +align_enum_equ_thresh = 8 # number +align_var_class_span = 2 # number +align_var_class_thresh = 20 # number +align_func_proto_gap = 1 # number +align_typedef_span = 1 # number +align_typedef_star_style = 2 # number +align_typedef_amp_style = 2 # number +align_right_cmt_span = 2 # number +align_right_cmt_gap = 0 # number +align_nl_cont = true # false/true +align_pp_define_span = 1 # number +align_pp_define_together = true # false/true + +# +# Newline adding and removing options +# +nl_class_leave_one_liners = true # false/true +nl_enum_leave_one_liners = true # false/true +nl_end_of_file = force # ignore/add/remove/force +nl_end_of_file_min = 1 # number +nl_after_square_assign = force # ignore/add/remove/force +nl_fcall_brace = force # ignore/add/remove/force +nl_enum_brace = force # ignore/add/remove/force +nl_struct_brace = force # ignore/add/remove/force +nl_union_brace = force # ignore/add/remove/force +nl_if_brace = force # ignore/add/remove/force +nl_brace_else = force # ignore/add/remove/force +nl_elseif_brace = force # ignore/add/remove/force +nl_else_brace = force # ignore/add/remove/force +nl_else_if = remove # ignore/add/remove/force +nl_brace_finally = force # ignore/add/remove/force +nl_finally_brace = force # ignore/add/remove/force +nl_try_brace = force # ignore/add/remove/force +nl_getset_brace = force # ignore/add/remove/force +nl_for_brace = force # ignore/add/remove/force +nl_catch_brace = force # ignore/add/remove/force +nl_brace_catch = force # ignore/add/remove/force +nl_while_brace = force # ignore/add/remove/force +nl_using_brace = force # ignore/add/remove/force +nl_brace_brace = force # ignore/add/remove/force +nl_do_brace = force # ignore/add/remove/force +nl_brace_while = remove # ignore/add/remove/force +nl_switch_brace = force # ignore/add/remove/force +nl_multi_line_cond = true # false/true +nl_multi_line_define = true # false/true +nl_after_case = true # false/true +nl_template_class = force # ignore/add/remove/force +nl_class_brace = force # ignore/add/remove/force +nl_class_init_args = remove # ignore/add/remove/force +nl_enum_own_lines = ignore # ignore/add/remove/force +nl_constr_init_args = force # ignore/add/remove/force +nl_fdef_brace = force # ignore/add/remove/force +nl_cpp_ldef_brace = remove # ignore/add/remove/force +nl_after_semicolon = true # false/true +nl_squeeze_ifdef = true # false/true +nl_after_brace_open = true # false/true +nl_define_macro = false # false/true +nl_after_if = force # ignore/add/remove/force +nl_after_for = force # ignore/add/remove/force +nl_after_while = force # ignore/add/remove/force +nl_after_switch = force # ignore/add/remove/force +nl_after_do = force # ignore/add/remove/force +nl_class_colon = remove # ignore/add/remove/force +nl_constr_colon = force # ignore/add/remove/force +nl_split_if_one_liner = true # false/true +nl_split_for_one_liner = true # false/true +nl_split_while_one_liner = true # false/true + +# +# Positioning options +# +pos_constr_colon = lead_force # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force +pos_constr_comma = lead_force # ignore/lead/lead_break/lead_force/trail/trail_break/trail_force + +# +# Blank line options +# + +nl_max = 2 # number +nl_after_func_proto_group = 2 # number +nl_after_func_body = 2 # number +nl_after_struct = 2 # number +nl_after_class = 2 # number +nl_comment_func_def = 1 # number +nl_after_try_catch_finally = 2 # number + +# +# Code modifying options (non-whitespace) +# +mod_full_brace_do = force # ignore/add/remove/force +mod_full_brace_for = force # ignore/add/remove/force +mod_full_brace_function = force # ignore/add/remove/force +mod_full_brace_if = force # ignore/add/remove/force +mod_full_brace_while = add # ignore/add/remove/force +mod_remove_extra_semicolon = true # false/true +mod_add_long_ifdef_endif_comment = 5 # number +mod_add_long_ifdef_else_comment = 5 # number +mod_move_case_break = true # false/true + +# +# Comment modifications +# +cmt_convert_tab_to_spaces = true # false/true +cmt_c_group = true # false/true +cmt_c_nl_start = true # false/true +cmt_c_nl_end = true # false/true +cmt_cpp_group = true # false/true +cmt_cpp_nl_end = true # false/true +cmt_indent_multi = true # false/true +cmt_star_cont = true # false/true + +# +# Preprocessor options +# +pp_indent = remove # ignore/add/remove/force +pp_space = add # ignore/add/remove/force +pp_space_count = 1 # number diff --git a/Foo/uncrustify_files.cfg b/Foo/uncrustify_files.cfg new file mode 100644 index 0000000..07e08a2 --- /dev/null +++ b/Foo/uncrustify_files.cfg @@ -0,0 +1,43 @@ +./AudioManagerUtilities/src/CAmCommonAPIWrapper.cpp +./AudioManagerUtilities/src/CAmLogWrapper.cpp +./AudioManagerUtilities/src/CAmLoggerFile.cpp +./AudioManagerUtilities/src/CAmLoggerStdOut.cpp +./AudioManagerUtilities/src/CAmSocketHandler.cpp +./AudioManagerUtilities/src/CAmLoggerDlt.cpp +./AudioManagerUtilities/src/CAmDbusWrapper.cpp +./AudioManagerUtilities/src/CAmCommandLineSingleton.cpp +./AudioManagerUtilities/src/CAmWatchdog.cpp +./AudioManagerCore/src/CAmRoutingSender.cpp +./AudioManagerCore/src/CAmCommandReceiver.cpp +./AudioManagerCore/src/CAmControlSender.cpp +./AudioManagerCore/src/CAmControlReceiver.cpp +./AudioManagerCore/src/CAmCommandSender.cpp +./AudioManagerCore/src/CAmRoutingReceiver.cpp +./AudioManagerCore/src/CAmRouter.cpp +./AudioManagerCore/src/CAmLog.cpp +./AudioManagerCore/src/CAmDatabaseHandlerMap.cpp +./AudioManagerDaemon/src/main.cpp +./AudioManagerUtilities/include/CAmCommonAPIWrapper.h +./AudioManagerUtilities/include/CAmLoggerDlt.h +./AudioManagerUtilities/include/CAmDbusWrapper.h +./AudioManagerUtilities/include/CAmTimeUtility.h +./AudioManagerUtilities/include/CAmSerializer.h +./AudioManagerUtilities/include/CAmLogWrapper.h +./AudioManagerUtilities/include/CAmWatchdog.h +./AudioManagerUtilities/include/TAmPluginTemplate.h +./AudioManagerUtilities/include/IAmLogger.h +./AudioManagerUtilities/include/CAmLoggerFile.h +./AudioManagerUtilities/include/CAmCommandLineSingleton.h +./AudioManagerUtilities/include/CAmLoggerStdOut.h +./AudioManagerUtilities/include/CAmSocketHandler.h +./AudioManagerCore/include/CAmLog.h +./AudioManagerCore/include/IAmDatabaseHandler.h +./AudioManagerCore/include/CAmRoutingSender.h +./AudioManagerCore/include/CAmControlSender.h +./AudioManagerCore/include/CAmControlReceiver.h +./AudioManagerCore/include/CAmRoutingReceiver.h +./AudioManagerCore/include/CAmGraph.h +./AudioManagerCore/include/CAmCommandSender.h +./AudioManagerCore/include/CAmDatabaseHandlerMap.h +./AudioManagerCore/include/CAmCommandReceiver.h +./AudioManagerCore/include/CAmRouter.h diff --git a/cmake/config.cmake.in b/cmake/audiomanagerconfig.h.in index 2d2d3df..4e6df3c 100644 --- a/cmake/config.cmake.in +++ b/cmake/audiomanagerconfig.h.in @@ -1,5 +1,5 @@ -#ifndef _CONFIG_H -#define _CONFIG_H +#ifndef _AUDIOMANAGER_CONFIG_H +#define _AUDIOMANAGER_CONFIG_H #cmakedefine DAEMONVERSION "@DAEMONVERSION@" #cmakedefine EXTRAVERSIONINFO "@EXTRAVERSIONINFO@" @@ -39,4 +39,4 @@ enum { DYNAMIC_ID_BOUNDARY = @DYNAMIC_ID_BOUNDARY@ }; -#endif /* _CONFIG_H */ +#endif /* _AUDIOMANAGER_CONFIG_H */ |