X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FCECParser.cpp;h=7a6d871700a7d701ec0eccf572a9c62d3e883afa;hb=5f39c4d854ec7441761bc6db870b6bbc73016309;hp=1eaa1f5bb9d3d8f7012cdecb0e18f3950f9cb7e1;hpb=3fcd38dcd9f704c307da815f39c23f3e0581ef3e;p=deb_libcec.git diff --git a/src/lib/CECParser.cpp b/src/lib/CECParser.cpp index 1eaa1f5..7a6d871 100644 --- a/src/lib/CECParser.cpp +++ b/src/lib/CECParser.cpp @@ -66,7 +66,7 @@ CCECParser::CCECParser(const char *strDeviceName, cec_logical_address iLogicalAd CCECParser::~CCECParser(void) { - Close(0); + Close(); m_communication->Close(); delete m_communication; } @@ -110,22 +110,10 @@ bool CCECParser::Open(const char *strPort, int iTimeoutMs /* = 10000 */) return false; } -bool CCECParser::Close(int iTimeoutMs /* = 2000 */) +void CCECParser::Close(void) { m_bRunning = false; - bool bExit(false); - if (iTimeoutMs > 0) - { - bExit = m_exitCondition.Wait(&m_mutex, iTimeoutMs); - m_mutex.Unlock(); - } - else - { - pthread_join(m_thread, NULL); - bExit = true; - } - - return bExit; + pthread_join(m_thread, NULL); } void *CCECParser::ThreadHandler(CCECParser *parser)