[vdr] [PATCH] vdr-xine 0.7.6: vdr 1.3.42 compatibility

Darren Salt linux at youmustbejoking.demon.co.uk
Sun Feb 5 19:50:13 CET 2006


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?

-- 
| Darren Salt | d youmustbejoking,demon,co,uk | nr. Ashington,
| Debian,     | s zap,tartarus,org            | Northumberland
| RISC OS     | @                             | Toon Army
|   <URL:http://www.youmustbejoking.demon.co.uk/progs.packages.html>

Make three consecutive correct guesses and you will be considered an expert.
-------------- next part --------------
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


More information about the vdr mailing list