X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Futil%2Fbuffer.h;h=ded4001dac43586d92fac960938de629195f6b65;hb=eafd9beda6b5e5aafaccd7a0e3de65c632d494e0;hp=f284131d2ca1c511ea4932be199603e2435b5dad;hpb=b9187cc6999276ce37a5c9852655fd558ea76b8e;p=deb_libcec.git diff --git a/src/lib/util/buffer.h b/src/lib/util/buffer.h index f284131..ded4001 100644 --- a/src/lib/util/buffer.h +++ b/src/lib/util/buffer.h @@ -40,11 +40,21 @@ namespace CEC struct CecBuffer { public: - CecBuffer(int iMaxSize = 100) + CecBuffer(unsigned int iMaxSize = 100) { m_maxSize = iMaxSize; } - virtual ~CecBuffer(void) {} + + virtual ~CecBuffer(void) + { + Clear(); + } + + void Clear(void) + { + while (!m_buffer.empty()) + m_buffer.pop(); + } int Size(void) const { return m_buffer.size(); } @@ -62,7 +72,7 @@ namespace CEC { bool bReturn(false); CLockObject lock(&m_mutex); - if (m_buffer.size() > 0) + if (!m_buffer.empty()) { entry = m_buffer.front(); m_buffer.pop(); @@ -72,7 +82,7 @@ namespace CEC } private: - int m_maxSize; + unsigned int m_maxSize; std::queue<_BType> m_buffer; CMutex m_mutex; };