summaryrefslogtreecommitdiff
path: root/AudioManagerCore
diff options
context:
space:
mode:
Diffstat (limited to 'AudioManagerCore')
-rw-r--r--AudioManagerCore/include/CAmDatabaseHandlerMap.h140
-rw-r--r--AudioManagerCore/include/CAmLog.h2
-rw-r--r--AudioManagerCore/include/CAmRouter.h13
-rw-r--r--AudioManagerCore/src/CAmCommandReceiver.cpp40
-rw-r--r--AudioManagerCore/src/CAmCommandSender.cpp6
-rw-r--r--AudioManagerCore/src/CAmControlReceiver.cpp10
-rw-r--r--AudioManagerCore/src/CAmControlSender.cpp22
-rw-r--r--AudioManagerCore/src/CAmDatabaseHandlerMap.cpp16
-rw-r--r--AudioManagerCore/src/CAmLog.cpp4
-rw-r--r--AudioManagerCore/src/CAmRouter.cpp2
-rw-r--r--AudioManagerCore/src/CAmRoutingReceiver.cpp46
-rw-r--r--AudioManagerCore/src/CAmRoutingSender.cpp18
12 files changed, 137 insertions, 182 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);
View Lorry Controller Status