[vdr] [PATCH] dxr3 plugin for vdr 1.3.18

[Luca Olivetti <luca@ventoso.org>]

These are the changes I made to the dxr3 plugin from 1.3.17 to make it 
work under 1.3.18. The original plugin is dxr3-0.2.3-pre2 with *all* 
previous modifications applied.

Bye
--
- Yo también quiero una Europa libre de Patentes de Software  -
- I want a Software Patents Free Europe too! And you?         -
---------------------------------------------------------------
  EuropeSwPatentFree - http://EuropeSwPatentFree.hispalinux.es
diff --unified --recursive --exclude='*.o' --exclude='*.so' vdr-1.3.17/PLUGINS/src/dxr3/dxr3device.c vdr-1.3.18/PLUGINS/src/dxr3/dxr3device.c
--- vdr-1.3.17/PLUGINS/src/dxr3/dxr3device.c	2004-07-28 18:06:53.000000000 +0200
+++ vdr-1.3.18/PLUGINS/src/dxr3/dxr3device.c	2005-01-09 17:56:51.580371613 +0100
@@ -311,9 +311,10 @@
 
 // ==================================
 // plays additional audio streams, like Dolby Digital
-void cDxr3Device::PlayAudio(const uchar *Data, int Length)
+int cDxr3Device::PlayAudio(const uchar *Data, int Length)
 {
     int retLength = 0;
+    int origLength = Length;
     
 	#if VDRVERSNUM < 10307
     if (!m_AC3Present) 
@@ -328,7 +329,7 @@
 		m_DemuxDevice.GetTrickState() == DXR3_FREEZE) || cDxr3Interface::Instance().IsExternalReleased()) 
 	{
         //usleep(1000000);
-        return;
+        return 0;
     }
 
     if (m_strBuf.length()) 
@@ -354,6 +355,7 @@
             m_strBuf.append((const char*)(Data + retLength), Length);
         }
     }
+    return origLength;
 }
 
 // addition functions
Sólo en vdr-1.3.18/PLUGINS/src/dxr3: dxr3device.c~
diff --unified --recursive --exclude='*.o' --exclude='*.so' vdr-1.3.17/PLUGINS/src/dxr3/dxr3device.h vdr-1.3.18/PLUGINS/src/dxr3/dxr3device.h
--- vdr-1.3.17/PLUGINS/src/dxr3/dxr3device.h	2004-07-22 01:39:55.000000000 +0200
+++ vdr-1.3.18/PLUGINS/src/dxr3/dxr3device.h	2005-01-09 17:10:30.131491252 +0100
@@ -32,7 +32,7 @@
 	virtual void StillPicture(const uchar *Data, int Length);
 	virtual bool Poll(cPoller &Poller, int TimeoutMs = 0);
 	virtual int PlayVideo(const uchar *Data, int Length);
-	virtual void PlayAudio(const uchar *Data, int Length);
+	virtual int PlayAudio(const uchar *Data, int Length);
 
 	// addition functions
 	virtual bool GrabImage(const char *FileName, bool Jpeg = true, int Quality = -1, int SizeX = -1, int SizeY = -1);
diff --unified --recursive --exclude='*.o' --exclude='*.so' vdr-1.3.17/PLUGINS/src/dxr3/dxr3spudecoder.c vdr-1.3.18/PLUGINS/src/dxr3/dxr3spudecoder.c
--- vdr-1.3.17/PLUGINS/src/dxr3/dxr3spudecoder.c	2004-06-24 22:07:38.000000000 +0200
+++ vdr-1.3.18/PLUGINS/src/dxr3/dxr3spudecoder.c	2005-01-09 17:09:06.529109637 +0100
@@ -275,7 +275,7 @@
 }
 
 // ==================================
-void cDxr3SpuDecoder::processSPU(uint32_t pts, uint8_t * buf)
+void cDxr3SpuDecoder::processSPU(uint32_t pts, uint8_t * buf, bool AllowedShow)
 {
     setTime(pts);
 
diff --unified --recursive --exclude='*.o' --exclude='*.so' vdr-1.3.17/PLUGINS/src/dxr3/dxr3spudecoder.h vdr-1.3.18/PLUGINS/src/dxr3/dxr3spudecoder.h
--- vdr-1.3.17/PLUGINS/src/dxr3/dxr3spudecoder.h	2004-06-24 21:59:26.000000000 +0200
+++ vdr-1.3.18/PLUGINS/src/dxr3/dxr3spudecoder.h	2005-01-09 17:07:13.336795289 +0100
@@ -81,7 +81,7 @@
     void setHighlight(uint16_t sx, uint16_t sy, uint16_t ex, uint16_t ey, uint32_t palette);
     void clearHighlight();
     void Empty();
-    void processSPU(uint32_t pts, uint8_t * buf);
+    void processSPU(uint32_t pts, uint8_t * buf, bool AllowedShow = true);
 
 	#if VDRVERSNUM >= 10311
     void Hide();

Attachment: signature.asc
Description: OpenPGP digital signature