From 0f2aa1f8884edab5d061bd9a5e17e9d2c5c603d0 Mon Sep 17 00:00:00 2001
From: zwer <zwer@1f4bef6d-8e0a-0410-8695-e467da8aaccf>
Date: Tue, 28 Feb 2006 20:52:10 +0000
Subject: 2006-02-27: - fixed version conflict on cStreamDevice::PlayAudio

git-svn-id: svn://svn.berlios.de/ffnetdev/trunk@13 1f4bef6d-8e0a-0410-8695-e467da8aaccf
---
 CHANGELOG      | 5 ++++-
 streamdevice.c | 4 ++++
 streamdevice.h | 4 ++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 2fe8914..ee32705 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -31,4 +31,7 @@ Changelog
     - added "auto change primary DVB" feature (enable/deisable in plugin settings)
     - fixed buffer overflow bug
     - fixed several other bugs
-    - tested with vdr-1.3.43
\ No newline at end of file
+    - tested with vdr-1.3.43
+    
+  2006-02-27:
+    - fixed version conflict on cStreamDevice::PlayAudio
\ No newline at end of file
diff --git a/streamdevice.c b/streamdevice.c
index f44385e..354bad5 100644
--- a/streamdevice.c
+++ b/streamdevice.c
@@ -112,7 +112,11 @@ bool cStreamDevice::Poll(cPoller &Poller, int TimeoutMs)
 }
 /* ----------------------------------------------------------------------------
  */
+#if VDRVERSNUM < 10342
+int cStreamDevice::PlayAudio(const uchar *Data, int Length)
+#else
 int cStreamDevice::PlayAudio(const uchar *Data, int Length, uchar Id)
+#endif
 {
    if (cTSWorker::HaveStreamClient()) 
    {
diff --git a/streamdevice.h b/streamdevice.h
index fb21c83..9bb2ff3 100644
--- a/streamdevice.h
+++ b/streamdevice.h
@@ -34,7 +34,11 @@ public:
   virtual void StillPicture(const uchar *Data, int Length);
   virtual bool Poll(cPoller &Poller, int TimeoutMs = 0);
   virtual int PlayVideo(const uchar *Data, int Length);
+#if VDRVERSNUM < 10342   
+  virtual int PlayAudio(const uchar *Data, int Length);
+#else
   virtual int PlayAudio(const uchar *Data, int Length, uchar Id);
+#endif  
   virtual int ProvidesCa(const cChannel *Channel) const;
   virtual void MakePrimaryDevice(bool On);
   uchar *Get(int &Count) { return m_Remux->Get(Count); }
-- 
cgit v1.2.3