diff mbox

vdr-xine 0.7.6: vdr 1.3.42 compatibility

Message ID 4DF48DE39B%linux@youmustbejoking.demon.co.uk
State New
Headers

Commit Message

Darren Salt Feb. 5, 2006, 6:50 p.m. UTC 
  Due to an ABI change in cDevice, the video will be frozen. The attached patch
fixes this.

BTW, Reinhard: any idea how long before the next vdr-xine release?

Comments

Grégoire Favre Feb. 5, 2006, 7:11 p.m. UTC | #1 
On Sun, Feb 05, 2006 at 06:50:13PM +0000, Darren Salt wrote:

> Due to an ABI change in cDevice, the video will be frozen. The attached patch
> fixes this.

Thank you very much for fixing my favorite plugin so fast !!!
Reinhard Nissl Feb. 6, 2006, 12:12 a.m. UTC | #2 
Hi,

Darren Salt wrote:

> BTW, Reinhard: any idea how long before the next vdr-xine release?

Well, it works already with 1.3.42, but some changes still need some 
fine tuning. Expect a release during the week or possibly next weekend.

Bye.
Olaf Titz Feb. 6, 2006, 6:52 p.m. UTC | #3 
> +# ifdef VDRVERSNUM >= 10342

This surely has to be #if not #ifdef.

Olaf
diff mbox

Patch

diff -urNad vdr-plugin-xine-0.7.6~/xineDevice.c vdr-plugin-xine-0.7.6/xineDevice.c
--- vdr-plugin-xine-0.7.6~/xineDevice.c	2006-02-05 18:45:42.000000000 +0000
+++ vdr-plugin-xine-0.7.6/xineDevice.c	2006-02-05 18:47:39.239533509 +0000
@@ -2137,8 +2137,12 @@ 
     
 fprintf(stderr, "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n");    
   }
-  
+
+# ifdef VDRVERSNUM >= 10342
+  int cXineDevice::PlayAudio(const uchar *Data, int Length, uchar Id)
+# else
   int cXineDevice::PlayAudio(const uchar *Data, int Length)
+# endif
   {
 //    fprintf(stderr, " 0x%02x ", Data[ 3 ]);
     return PlayAudioCommon(Data, Length);
diff -urNad vdr-plugin-xine-0.7.6~/xineDevice.h vdr-plugin-xine-0.7.6/xineDevice.h
--- vdr-plugin-xine-0.7.6~/xineDevice.h	2006-02-05 18:45:42.000000000 +0000
+++ vdr-plugin-xine-0.7.6/xineDevice.h	2006-02-05 18:47:21.920679191 +0000
@@ -80,7 +80,11 @@ 
     virtual int GetAudioChannelDevice(void);
     virtual void SetAudioChannelDevice(int AudioChannel);
     virtual void SetDigitalAudioDevice(bool On);
+# if VDRVERSNUM >= 10342
+    virtual int PlayAudio(const uchar *Data, int Length, uchar Id);
+# else
     virtual int PlayAudio(const uchar *Data, int Length);
+# endif
 #else
     virtual void PlayAudio(const uchar *Data, int Length);
 #endif