diff options
Diffstat (limited to 'AudioManagerCore/src')
| -rw-r--r-- | AudioManagerCore/src/CAmCommandReceiver.cpp | 40 | ||||
| -rw-r--r-- | AudioManagerCore/src/CAmCommandSender.cpp | 6 | ||||
| -rw-r--r-- | AudioManagerCore/src/CAmControlReceiver.cpp | 10 | ||||
| -rw-r--r-- | AudioManagerCore/src/CAmControlSender.cpp | 22 | ||||
| -rw-r--r-- | AudioManagerCore/src/CAmDatabaseHandlerMap.cpp | 16 | ||||
| -rw-r--r-- | AudioManagerCore/src/CAmLog.cpp | 4 | ||||
| -rw-r--r-- | AudioManagerCore/src/CAmRouter.cpp | 2 | ||||
| -rw-r--r-- | AudioManagerCore/src/CAmRoutingReceiver.cpp | 46 | ||||
| -rw-r--r-- | AudioManagerCore/src/CAmRoutingSender.cpp | 18 |
9 files changed, 82 insertions, 82 deletions
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); |