diff options
Diffstat (limited to 'AudioManagerDaemon/src/CAmSocketHandler.cpp')
| -rw-r--r-- | AudioManagerDaemon/src/CAmSocketHandler.cpp | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/AudioManagerDaemon/src/CAmSocketHandler.cpp b/AudioManagerDaemon/src/CAmSocketHandler.cpp index f7c4ace..19d61c0 100644 --- a/AudioManagerDaemon/src/CAmSocketHandler.cpp +++ b/AudioManagerDaemon/src/CAmSocketHandler.cpp @@ -34,9 +34,9 @@ namespace am { -CAmSocketHandler* CAmSocketHandler::mInstance=NULL; - CAmSocketHandler::CAmSocketHandler() : + receiverCallbackT(this, &CAmSocketHandler::receiverCallback),// + checkerCallbackT(this, &CAmSocketHandler::checkerCallback),// mPipe(), mListPoll(), // mListTimer(), // @@ -44,12 +44,9 @@ CAmSocketHandler::CAmSocketHandler() : mLastInsertedHandle(0), // mLastInsertedPollHandle(0), // mRecreatePollfds(true), // - mStartTime(), // - receiverCallbackT(this, &CAmSocketHandler::receiverCallback),// - checkerCallbackT(this, &CAmSocketHandler::checkerCallback)// + mStartTime() // { gDispatchDone = 1; - mInstance=this; if (pipe(mPipe) == -1) { @@ -527,14 +524,6 @@ void CAmSocketHandler::exit_mainloop() write(mPipe[1], &p, sizeof(p)); } -void CAmSocketHandler::static_exit_mainloop() -{ - if (mInstance!=0) - { - mInstance->exit_mainloop(); - } -} - /** * is used to set the pointer for the ppoll command * @param buffertime |