From patchwork Wed Dec 7 16:01:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Matti_Lehtim=C3=A4ki?= X-Patchwork-Id: 12910 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1RYJwD-0007hQ-Kh for vdr@linuxtv.org; Wed, 07 Dec 2011 17:02:06 +0100 X-tubIT-Incoming-IP: 209.85.214.54 Received: from mail-bw0-f54.google.com ([209.85.214.54]) by mail.tu-berlin.de (exim-4.75/mailfrontend-4) with esmtps [TLSv1:RC4-SHA:128] for id 1RYJwD-0003Dt-BE; Wed, 07 Dec 2011 17:01:41 +0100 Received: by bkbzv15 with SMTP id zv15so474196bkb.41 for ; Wed, 07 Dec 2011 08:01:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:subject:references :in-reply-to:content-type; bh=D8iSyoS+LTOiG75ByBN1S+02KD15Bu6lx1zg9q+vJAA=; b=yEMSc+HGALFItjBMts2bKm7rztmPndfx6DFnwcZJ14rbna00lGoJthnepQF/MHfn6q pcoFZboxDBnifEZdCHijoHEFmCjkycS7LomnB5QzOgqjIxG3KljaitixbGSxkKhuhI9k opcxGnzfdZfIjIIj0Sa+KN1hfpsMZvHt6qzFA= Received: by 10.180.101.132 with SMTP id fg4mr24708988wib.26.1323273692929; Wed, 07 Dec 2011 08:01:32 -0800 (PST) Received: from [192.168.1.102] (dsl-hkibrasgw2-fe2bde00-176.dhcp.inet.fi. [80.222.43.176]) by mx.google.com with ESMTPS id fk3sm3569580wbb.10.2011.12.07.08.01.15 (version=SSLv3 cipher=OTHER); Wed, 07 Dec 2011 08:01:19 -0800 (PST) Message-ID: <4EDF8DC0.2070708@gmail.com> Date: Wed, 07 Dec 2011 18:01:04 +0200 From: =?ISO-8859-1?Q?Matti_Lehtim=E4ki?= User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.24) Gecko/20111120 Icedove/3.1.16 MIME-Version: 1.0 To: vdr@linuxtv.org References: <4EDF4771.90207@embl.de> In-Reply-To: <4EDF4771.90207@embl.de> X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2011.12.7.155415 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MIME_TEXT_ONLY_MP_MIXED 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_5000_5999 0, BODY_SIZE_7000_LESS 0, NO_URI_FOUND 0, WEBMAIL_SOURCE 0, __BAT_BOUNDARY 0, __BOUNCE_CHALLENGE_SUBJ 0, __BOUNCE_NDR_SUBJ_EXEMPT 0, __CT 0, __CTYPE_HAS_BOUNDARY 0, __CTYPE_MULTIPART 0, __CTYPE_MULTIPART_MIXED 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_MSGID 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MOZILLA_MSGID 0, __PHISH_SPEAR_STRUCTURE_1 0, __RDNS_GMAIL 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __USER_AGENT 0' X-LSpam-Score: -6.9 (------) X-LSpam-Report: No, score=-6.9 required=5.0 tests=BAYES_00=-1.9, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_HI=-5, T_DKIM_INVALID=0.01 autolearn=ham Subject: Re: [vdr] vdr-prefermenu and vdr 1.7.21 X-BeenThere: vdr@linuxtv.org X-Mailman-Version: 2.1.13 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: Wed, 07 Dec 2011 16:02:06 -0000 Status: O X-Status: X-Keywords: X-UID: 25443 On 12/07/2011 01:01 PM, Arturo Martinez wrote: > Is there a patch for vdr-prefermenu to work with vdr 1.7.21 ? If you prefer the small OSD of original prefermenu-plugin then there are 3 patches in debian unstable so it works also with new versions of vdr (I tested it with 1.7.22). The patches are attached. #! /bin/sh /usr/share/dpatch/dpatch-run ## 90_prefermenu-0.6.6-1.5.3+SetAreas-bugfix.dpatch by Thomas Günther ## http://toms-cafe.de/vdr/download/prefermenu-0.6.6-1.5.3+SetAreas-bugfix.diff ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Changes for VDR >= 1.5.3. @DPATCH@ Index: vdr-plugin-prefermenu-0.6.6/prefermenu.c =================================================================== --- vdr-plugin-prefermenu-0.6.6.orig/prefermenu.c 2005-01-11 20:09:40.000000000 +0100 +++ vdr-plugin-prefermenu-0.6.6/prefermenu.c 2011-04-09 13:51:46.000000000 +0200 @@ -75,6 +75,7 @@ } // Clean up the file with current VDR channels.conf PreferedChannelsList.Save(); + const int LINEHEIGHT = cFont::GetFont(fontOsd)->Height(); config.height= (config.lines * (LINEHEIGHT+BORDERSIZE+2))+BORDERSIZE; return new cPreferOsd; } Index: vdr-plugin-prefermenu-0.6.6/preferosd.c =================================================================== --- vdr-plugin-prefermenu-0.6.6.orig/preferosd.c 2006-05-06 15:19:28.000000000 +0200 +++ vdr-plugin-prefermenu-0.6.6/preferosd.c 2011-04-09 13:51:46.000000000 +0200 @@ -60,7 +60,8 @@ } osd=cOsdProvider::NewOsd(config.originx, config.originy); if (osd) { - tArea Area = { 0, 0, config.width+LINEHEIGHT, config.height-1, 4}; + const int LINEHEIGHT = cFont::GetFont(fontOsd)->Height(); + tArea Area = { 0, 0, ((config.width+LINEHEIGHT) & ~0x01) - 1, config.height-1, 4}; osd->SetAreas(&Area, 1); DrawPreferMenu(0,0); DisplayPreferMenu(); @@ -168,6 +169,7 @@ { if (current > 1) { current -= 1; + const int LINEHEIGHT = cFont::GetFont(fontOsd)->Height(); DrawPreferMenu(-LINEHEIGHT,1); DisplayPreferMenu(); //DrawPreferMneu(-10,1); @@ -181,6 +183,7 @@ { if (current < number) { current += 1; + const int LINEHEIGHT = cFont::GetFont(fontOsd)->Height(); DrawPreferMenu(+LINEHEIGHT,-1); DisplayPreferMenu(); //DrawPreferMenu(+10,-1); @@ -315,6 +318,8 @@ void cPreferOsd::DrawPreferMenu(int delta, int highlight) { + const cFont *font = cFont::GetFont(fontOsd); + const int LINEHEIGHT = font->Height(); int middle = int(config.height/2) + config.height%2; @@ -390,6 +395,8 @@ void cPreferOsd::DrawChannelsNames(int delta) { + const cFont *font = cFont::GetFont(fontOsd); + const int LINEHEIGHT = font->Height(); // XXX The margin is hardcoded for now // TODO: make it more flexible Index: vdr-plugin-prefermenu-0.6.6/preferosd.h =================================================================== --- vdr-plugin-prefermenu-0.6.6.orig/preferosd.h 2006-05-04 21:59:17.000000000 +0200 +++ vdr-plugin-prefermenu-0.6.6/preferosd.h 2011-04-09 13:51:46.000000000 +0200 @@ -4,8 +4,6 @@ #include static const int BORDERSIZE = 2; -static const cFont *font = cFont::GetFont(fontOsd); -static const int LINEHEIGHT = font->Height(); class cPreferOsd : public cOsdObject {