X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Futil%2Fbuffer.h;h=ded4001dac43586d92fac960938de629195f6b65;hb=25701fa60407a0fc0bc1dfcd4049fc01ad9e4fd1;hp=d49de62554ea7ea8305c1c810ce2809d8f2228eb;hpb=262f3b0529397d1c76ede935b8ef572b013e90d3;p=deb_libcec.git diff --git a/src/lib/util/buffer.h b/src/lib/util/buffer.h index d49de62..ded4001 100644 --- a/src/lib/util/buffer.h +++ b/src/lib/util/buffer.h @@ -44,7 +44,17 @@ namespace CEC { 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();