From patchwork Sat Jan 21 11:52:40 2006 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaroslaw Swierczynski X-Patchwork-Id: 12173 Received: from uproxy.gmail.com ([66.249.92.196]) by www.linuxtv.org with esmtp (Exim 4.50) id 1F0HIR-0004mE-IV for vdr@linuxtv.org; Sat, 21 Jan 2006 12:52:43 +0100 Received: by uproxy.gmail.com with SMTP id e2so669697ugf for ; Sat, 21 Jan 2006 03:52:40 -0800 (PST) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:references; b=BRXP2ER5Fdr5riYuOgm9u1cgbrYC9GblDTw94LKv0nX/Y9k8g2YOevplcv2WdUJNrXDQbCQYhlb60ITmwPpmvgBgwZKxzLCXvu8SIUOMxEV2NIOxgPbI9wGeKmbXm/y4NZyGhJIuAIMtS3swGbWeZ7E/T8kj96mST3vl4oyJ0is= Received: by 10.48.239.5 with SMTP id m5mr211181nfh; Sat, 21 Jan 2006 03:52:40 -0800 (PST) Received: by 10.49.93.15 with HTTP; Sat, 21 Jan 2006 03:52:40 -0800 (PST) Message-ID: Date: Sat, 21 Jan 2006 12:52:40 +0100 From: Jaroslaw Swierczynski To: VDR Mailing List Subject: Re: [vdr] xine plugin In-Reply-To: <43D14358.7010609@gmx.de> MIME-Version: 1.0 References: <43CF143C.7060509@clix.pt> <43D14358.7010609@gmx.de> 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: Sat, 21 Jan 2006 11:52:44 -0000 Status: O X-Status: X-Keywords: X-UID: 7349 Here are patches from vdr-xine 0.7.6 that I modified to apply to xine-lib and xine-ui snapshots from January 5th. They work fine. Btw, why the Xine developers haven't applied those patches yet? --- Jaroslaw Swierczynski www.archlinux.org | www.juvepoland.com diff -ruN xine-ui-0.99.4.orig/src/fb/actions.c xine-ui-0.99.4/src/fb/actions.c --- xine-ui-0.99.4.orig/src/fb/actions.c 2004-08-11 13:45:37.000000000 +0200 +++ xine-ui-0.99.4/src/fb/actions.c 2006-01-02 20:32:42.000000000 +0100 @@ -275,6 +275,8 @@ "VDRVolumeMinus", ACTID_EVENT_VDR_VOLMINUS }, { "VDR Audio Mute", "VDRMute", ACTID_EVENT_VDR_MUTE }, + { "VDR Audio menu", + "VDRAudio", ACTID_EVENT_VDR_AUDIO }, #endif { 0, 0, 0 } diff -ruN xine-ui-0.99.4.orig/src/fb/actions.h xine-ui-0.99.4/src/fb/actions.h --- xine-ui-0.99.4.orig/src/fb/actions.h 2004-08-11 13:45:38.000000000 +0200 +++ xine-ui-0.99.4/src/fb/actions.h 2006-01-02 20:33:20.000000000 +0100 @@ -188,7 +188,8 @@ ACTID_EVENT_VDR_USER9 = XINE_EVENT_VDR_USER9 | ACTID_IS_INPUT_EVENT, ACTID_EVENT_VDR_VOLPLUS = XINE_EVENT_VDR_VOLPLUS | ACTID_IS_INPUT_EVENT, ACTID_EVENT_VDR_VOLMINUS = XINE_EVENT_VDR_VOLMINUS | ACTID_IS_INPUT_EVENT, - ACTID_EVENT_VDR_MUTE = XINE_EVENT_VDR_MUTE | ACTID_IS_INPUT_EVENT + ACTID_EVENT_VDR_MUTE = XINE_EVENT_VDR_MUTE | ACTID_IS_INPUT_EVENT, + ACTID_EVENT_VDR_AUDIO = XINE_EVENT_VDR_AUDIO | ACTID_IS_INPUT_EVENT #endif /* diff -ruN xine-ui-0.99.4.orig/src/xitk/kbindings.c xine-ui-0.99.4/src/xitk/kbindings.c --- xine-ui-0.99.4.orig/src/xitk/kbindings.c 2005-07-16 21:05:31.000000000 +0200 +++ xine-ui-0.99.4/src/xitk/kbindings.c 2006-01-02 20:34:03.000000000 +0100 @@ -511,6 +511,8 @@ "VDRVolumeMinus", ACTID_EVENT_VDR_VOLMINUS , "VOID", KEYMOD_NOMOD , 0 , 0}, { "VDR Audio Mute", "VDRMute", ACTID_EVENT_VDR_MUTE , "VOID", KEYMOD_NOMOD , 0 , 0}, + { "VDR Audio menu", + "VDRAudio", ACTID_EVENT_VDR_AUDIO , "VOID", KEYMOD_NOMOD , 0 , 0}, #endif { 0, 0, 0, 0, 0 , 0 , 0} diff -ruN xine-ui-0.99.4.orig/src/xitk/kbindings.h xine-ui-0.99.4/src/xitk/kbindings.h --- xine-ui-0.99.4.orig/src/xitk/kbindings.h 2005-07-16 21:05:31.000000000 +0200 +++ xine-ui-0.99.4/src/xitk/kbindings.h 2006-01-02 20:34:28.000000000 +0100 @@ -209,7 +209,8 @@ ACTID_EVENT_VDR_USER9 = XINE_EVENT_VDR_USER9 | ACTID_IS_INPUT_EVENT, ACTID_EVENT_VDR_VOLPLUS = XINE_EVENT_VDR_VOLPLUS | ACTID_IS_INPUT_EVENT, ACTID_EVENT_VDR_VOLMINUS = XINE_EVENT_VDR_VOLMINUS | ACTID_IS_INPUT_EVENT, - ACTID_EVENT_VDR_MUTE = XINE_EVENT_VDR_MUTE | ACTID_IS_INPUT_EVENT + ACTID_EVENT_VDR_MUTE = XINE_EVENT_VDR_MUTE | ACTID_IS_INPUT_EVENT, + ACTID_EVENT_VDR_AUDIO = XINE_EVENT_VDR_AUDIO | ACTID_IS_INPUT_EVENT #endif /*