diff options
| author | christian linke <christian.linke@bmw.de> | 2012-12-17 16:15:11 +0100 |
|---|---|---|
| committer | christian linke <christian.linke@bmw.de> | 2012-12-17 16:15:11 +0100 |
| commit | 54c5e965fe8f9a53a78834028fd65c792493da2b (patch) | |
| tree | 560d7b1209e6a8d4798de9568e4b4a947c2ab42a /AudioManagerDaemon/src/CAmSocketHandler.cpp | |
| parent | 215e8a72dc81e8a86dd5b3a8ca40fd2c7c6a0b9c (diff) | |
| download | audiomanager-54c5e965fe8f9a53a78834028fd65c792493da2b.tar.gz | |
* added new interfaces & nsm support + nsm tests + fixed some unit tests + fixed rundown
Signed-off-by: christian linke <christian.linke@bmw.de>
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 |