summaryrefslogtreecommitdiff
path: root/dxr3device.c
diff options
context:
space:
mode:
authorscop <scop>2006-04-18 21:33:18 +0000
committerscop <scop>2006-04-18 21:33:18 +0000
commit9cde1b0fdd1a9e0607dcdd3367c324fd2d5b8d68 (patch)
treede0096c64729f3ee0e8106bdc47d532439c03d8d /dxr3device.c
parent93ed3dd4f77d9e0448d4dd0060584ca9cdcf496a (diff)
downloadvdr-plugin-dxr3-9cde1b0fdd1a9e0607dcdd3367c324fd2d5b8d68.tar.gz
vdr-plugin-dxr3-9cde1b0fdd1a9e0607dcdd3367c324fd2d5b8d68.tar.bz2
Clean up pre-VDR-1.3.47 compat stuff.
Diffstat (limited to 'dxr3device.c')
-rw-r--r--dxr3device.c20
1 files changed, 0 insertions, 20 deletions
diff --git a/dxr3device.c b/dxr3device.c
index 394c11b..daacdc3 100644
--- a/dxr3device.c
+++ b/dxr3device.c
@@ -217,11 +217,7 @@ bool cDxr3Device::Poll(cPoller &Poller, int TimeoutMs)
m_DemuxDevice.GetTrickState() == DXR3_FREEZE) ||
cDxr3Interface::Instance().IsExternalReleased())
{
-#if VDRVERSNUM >= 10314
cCondWait::SleepMs(TimeoutMs);
-#else
- usleep(TimeoutMs * 1000);
-#endif
return false;
}
return m_DemuxDevice.Poll(TimeoutMs); // Poller.Poll(TimeoutMs);
@@ -281,20 +277,10 @@ int cDxr3Device::PlayVideo(const uchar *Data, int Length)
// ==================================
// plays additional audio streams, like Dolby Digital
-#if VDRVERSNUM >= 10318
-#if VDRVERSNUM >= 10342
int cDxr3Device::PlayAudio(const uchar *Data, int Length, uchar Id)
-#else
-int cDxr3Device::PlayAudio(const uchar *Data, int Length)
-#endif
-#else
-void cDxr3Device::PlayAudio(const uchar *Data, int Length)
-#endif
{
int retLength = 0;
-#if VDRVERSNUM >= 10318
int origLength = Length;
-#endif
m_AC3Present = true;
@@ -303,11 +289,7 @@ void cDxr3Device::PlayAudio(const uchar *Data, int Length)
cDxr3Interface::Instance().IsExternalReleased())
{
//usleep(1000000);
-#if VDRVERSNUM >= 10318
return 0;
-#else
- return;
-#endif
}
if (m_strBuf.length())
@@ -340,9 +322,7 @@ void cDxr3Device::PlayAudio(const uchar *Data, int Length)
m_strBuf.append((const char*)(Data + retLength), Length);
}
-#if VDRVERSNUM >= 10318
return origLength;
-#endif
}
// addition functions