diff options
| author | Christian Gmeiner <christian.gmeiner@gmail.com> | 2009-02-19 14:09:17 +0100 |
|---|---|---|
| committer | Christian Gmeiner <christian.gmeiner@gmail.com> | 2009-02-19 14:09:17 +0100 |
| commit | b74b93b0d95ef21c4bccbbc8ef53322b4b1565a5 (patch) | |
| tree | f910bc266b19055394ad05ba58b49be4bc3eacae | |
| parent | 9f9db2b92fb3a36db4b21e2b07bb6029d9adc4dc (diff) | |
| download | vdr-plugin-dxr3-b74b93b0d95ef21c4bccbbc8ef53322b4b1565a5.tar.gz vdr-plugin-dxr3-b74b93b0d95ef21c4bccbbc8ef53322b4b1565a5.tar.bz2 | |
simplify cDxr3SyncBuffer::Pop
| -rw-r--r-- | dxr3syncbuffer.c | 24 | ||||
| -rw-r--r-- | dxr3syncbuffer.h | 1 |
2 files changed, 7 insertions, 18 deletions
diff --git a/dxr3syncbuffer.c b/dxr3syncbuffer.c index 95a9bd8..95fdbd2 100644 --- a/dxr3syncbuffer.c +++ b/dxr3syncbuffer.c @@ -290,23 +290,13 @@ cFixedLengthFrame* cDxr3SyncBuffer::Push(const uint8_t* pStart, int length, uint // ================================== void cDxr3SyncBuffer::Pop(void) { - if (m_count) - { - uint32_t nextPts = 0; - uint32_t tmpBuffer = m_next; - for (int i = 0; i < m_count && nextPts == 0; ++i) - { - if (tmpBuffer) tmpBuffer = --tmpBuffer ? tmpBuffer : (Size() - 1); - nextPts = m_pBuffer[tmpBuffer].GetPts(); - } - - m_next++; - m_count--; - m_next %= Size(); - if (m_next == m_nextFree) - { - m_next = m_nextFree = m_count = 0; - } + if (m_count) { + m_next++; + m_count--; + m_next %= Size(); + if (m_next == m_nextFree) { + m_next = m_nextFree = m_count = 0; + } } EnablePut(); } diff --git a/dxr3syncbuffer.h b/dxr3syncbuffer.h index 91fdb48..1ed7a83 100644 --- a/dxr3syncbuffer.h +++ b/dxr3syncbuffer.h @@ -27,7 +27,6 @@ #include <vdr/ringbuffer.h> #include "dxr3interface.h" #include "dxr3generaldefines.h" -#include "dxr3nextpts.h" #include "Uncopyable.h" // ================================== |