summaryrefslogtreecommitdiff
path: root/dxr3device.c
diff options
context:
space:
mode:
Diffstat (limited to 'dxr3device.c')
-rw-r--r--dxr3device.c26
1 files changed, 21 insertions, 5 deletions
diff --git a/dxr3device.c b/dxr3device.c
index 37e578a..3ec322a 100644
--- a/dxr3device.c
+++ b/dxr3device.c
@@ -337,16 +337,23 @@ int cDxr3Device::PlayVideo(const uchar *Data, int Length)
// ==================================
// plays additional audio streams, like Dolby Digital
-void cDxr3Device::PlayAudio(const uchar *Data, int Length)
+#if VDRVERSNUM >= 10318
+ int cDxr3Device::PlayAudio(const uchar *Data, int Length)
+#else
+ void cDxr3Device::PlayAudio(const uchar *Data, int Length)
+#endif
{
int retLength = 0;
-
- #if VDRVERSNUM < 10307
+#if VDRVERSNUM >= 10318
+ int origLength = Length;
+#endif
+
+#if VDRVERSNUM < 10307
if (!m_AC3Present)
{
Interface->Write(Interface->Width() / 2, 0, "AC3", clrRed);
}
- #endif
+#endif
m_AC3Present = true;
@@ -354,7 +361,12 @@ void cDxr3Device::PlayAudio(const uchar *Data, int Length)
m_DemuxDevice.GetTrickState() == DXR3_FREEZE) || cDxr3Interface::Instance().IsExternalReleased())
{
//usleep(1000000);
- return;
+
+#if VDRVERSNUM >= 10318
+ return 0;
+#else
+ return;
+#endif
}
if (m_strBuf.length())
@@ -380,6 +392,10 @@ void cDxr3Device::PlayAudio(const uchar *Data, int Length)
m_strBuf.append((const char*)(Data + retLength), Length);
}
}
+
+#if VDRVERSNUM >= 10318
+ return origLength;
+#endif
}
// addition functions