summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraustriancoder <austriancoder>2004-10-17 20:55:34 +0000
committeraustriancoder <austriancoder>2004-10-17 20:55:34 +0000
commit8c7ff288fc2ab28b668dc51509d96e7162be1ea3 (patch)
treee30848fefa992ae9583b95b64b3e0c1d3ee98be6
parent7803028fd2667dd317c6048523e570b020a8b76e (diff)
downloadvdr-plugin-dxr3-8c7ff288fc2ab28b668dc51509d96e7162be1ea3.tar.gz
vdr-plugin-dxr3-8c7ff288fc2ab28b668dc51509d96e7162be1ea3.tar.bz2
addes support for vdr-1.3.13
-rw-r--r--HISTORY3
-rw-r--r--dxr3syncbuffer.c56
2 files changed, 44 insertions, 15 deletions
diff --git a/HISTORY b/HISTORY
index 365e184..a74ac86 100644
--- a/HISTORY
+++ b/HISTORY
@@ -267,4 +267,5 @@ NOTE: I havent found time to include all of the languages, will be done in pre2
- fixed #includes
moved #include "dxr3osd.h" from dxr3interface.h to dxr3interface.c
removed not needed #includes
-- fixed bug #1022810: Osd gets pink \ No newline at end of file
+- fixed bug #1022810: Osd gets pink
+- added support for vdr-1.3.13 \ No newline at end of file
diff --git a/dxr3syncbuffer.c b/dxr3syncbuffer.c
index e7128ef..7bf6932 100644
--- a/dxr3syncbuffer.c
+++ b/dxr3syncbuffer.c
@@ -144,9 +144,13 @@ cDxr3SyncBuffer::~cDxr3SyncBuffer()
int cDxr3SyncBuffer::Available(void)
{
int ret = 0;
- Lock();
+#if VDRVERSNUM < 10313
+ Lock();
+#endif
ret = m_count;
- Unlock();
+#if VDRVERSNUM < 10313
+ Unlock();
+#endif
return ret;
}
@@ -204,7 +208,9 @@ cFixedLengthFrame* cDxr3SyncBuffer::Push(const uint8_t* pStart, int length, uint
WaitForPut();
}
- Lock();
+ #if VDRVERSNUM < 10313
+ Lock();
+ #endif
if (pts == m_lastPts)
{
pts = 0;
@@ -248,7 +254,9 @@ cFixedLengthFrame* cDxr3SyncBuffer::Push(const uint8_t* pStart, int length, uint
m_bWaitPts = false;
}
}
- Unlock();
+ #if VDRVERSNUM < 10313
+ Unlock();
+ #endif
break;
}
@@ -258,7 +266,9 @@ cFixedLengthFrame* cDxr3SyncBuffer::Push(const uint8_t* pStart, int length, uint
// ==================================
void cDxr3SyncBuffer::Pop(void)
{
- Lock();
+#if VDRVERSNUM < 10313
+ Lock();
+#endif
if (m_count)
{
uint32_t nextPts = 0;
@@ -282,7 +292,9 @@ void cDxr3SyncBuffer::Pop(void)
}
}
EnablePut();
- Unlock();
+#if VDRVERSNUM < 10313
+ Unlock();
+#endif
}
// ==================================
@@ -299,12 +311,16 @@ cFixedLengthFrame* cDxr3SyncBuffer::Get(void)
WaitForGet();
}
- Lock();
+ #if VDRVERSNUM < 10313
+ Lock();
+ #endif
if (m_nextFree != m_next)
{
pRet = &m_pBuffer[m_next];
}
- Unlock();
+ #if VDRVERSNUM < 10313
+ Unlock();
+ #endif
}
else
{
@@ -317,7 +333,9 @@ cFixedLengthFrame* cDxr3SyncBuffer::Get(void)
// ==================================
void cDxr3SyncBuffer::Clear(void)
{
- Lock();
+#if VDRVERSNUM < 10313
+ Lock();
+#endif
m_next = 0;
m_nextFree = 0;
m_count = 0;
@@ -332,7 +350,9 @@ void cDxr3SyncBuffer::Clear(void)
}
cFixedLengthFrame::Clear();
cDxr3NextPts::Instance().Clear();
- Unlock();
+#if VDRVERSNUM < 10313
+ Unlock();
+#endif
}
// ==================================
@@ -342,9 +362,13 @@ void cDxr3SyncBuffer::WaitForSysClock(uint32_t pts, uint32_t delta)
m_waitDelta = delta;
if (!m_bPutBlock)
{
- Lock();
+ #if VDRVERSNUM < 10313
+ Lock();
+ #endif
m_bWaitPts = true;
- Unlock();
+ #if VDRVERSNUM < 10313
+ Unlock();
+ #endif
m_bGetBlock = true;
ReceiverStopped();
WaitForGet();
@@ -384,7 +408,9 @@ void cDxr3SyncBuffer::Start(void)
// ==================================
void cDxr3SyncBuffer::WakeUp(void)
{
- Lock();
+#if VDRVERSNUM < 10313
+ Lock();
+#endif
if (m_bStartReceiver == true)
{
if (!m_bWaitPts)
@@ -401,7 +427,9 @@ void cDxr3SyncBuffer::WakeUp(void)
}
}
}
- Unlock();
+#if VDRVERSNUM < 10313
+ Unlock();
+#endif
}
// ==================================