From patchwork Sun Feb 5 18:50:13 2006 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Darren Salt X-Patchwork-Id: 12197 Received: from anchor-post-32.mail.demon.net ([194.217.242.90]) by www.linuxtv.org with esmtp (Exim 4.50) id 1F5p1n-0004ll-3K for vdr@linuxtv.org; Sun, 05 Feb 2006 19:54:27 +0100 Received: from youmustbejoking.demon.co.uk ([212.228.127.8] helo=pentagram.youmustbejoking.demon.co.uk) by anchor-post-32.mail.demon.net with esmtp (Exim 4.42) id 1F5p1l-000IMp-7M for vdr@linuxtv.org; Sun, 05 Feb 2006 18:54:26 +0000 Received: from [192.168.0.2] (helo=riscpc) by pentagram.youmustbejoking.demon.co.uk with esmtp (Exim 4.50) id 1F5p1j-000855-Tu for vdr@linuxtv.org; Sun, 05 Feb 2006 18:54:23 +0000 Date: Sun, 05 Feb 2006 18:50:13 +0000 From: Darren Salt To: vdr@linuxtv.org Message-ID: <4DF48DE39B%linux@youmustbejoking.demon.co.uk> User-Agent: Messenger-Pro/3.40 (MsgServe/3.20) (RISC-OS/4.02) POPstar/2.06+cvs X-Editor: Zap 1.47 (17 Oct 2005) [TEST], ZapEmail 0.28.3 (25 Mar 2005) (32) X-SDate: Sun, 4541 Sep 1993 18:50:13 +0000 X-Message-Flag: Outlook Express is broken. Upgrade to mail(1). MIME-Version: 1.0 X-SA-Exim-Connect-IP: 192.168.0.2 X-SA-Exim-Mail-From: linux@youmustbejoking.demon.co.uk X-SA-Exim-Scanned: No (on pentagram.youmustbejoking.demon.co.uk); SAEximRunCond expanded to false Subject: [vdr] [PATCH] vdr-xine 0.7.6: vdr 1.3.42 compatibility X-BeenThere: vdr@linuxtv.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: VDR Mailing List List-Id: VDR Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Feb 2006 18:54:27 -0000 Status: O X-Status: X-Keywords: X-UID: 7706 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? 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