From patchwork Mon May 23 21:00:36 2005
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: "C.Y.M" <syphyr@gmail.com>
X-Patchwork-Id: 11890
Received: from wproxy.gmail.com ([64.233.184.203])
	by www.linuxtv.org with esmtp (Exim 4.34) id 1DaK3x-0004NP-Kn
	for vdr@linuxtv.org; Mon, 23 May 2005 23:02:13 +0200
Received: by wproxy.gmail.com with SMTP id 67so2260674wri
	for <vdr@linuxtv.org>; Mon, 23 May 2005 14:01:39 -0700 (PDT)
DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com;
	h=received:message-id:disposition-notification-to:date:reply-to:organization:user-agent:x-accept-language:mime-version:to:subject:references:in-reply-to:x-enigmail-version:x-enigmail-supports:content-type:from;
	b=nab1ABl++7+WvVrXPSG0RJIjF615x9DvtyDuP41K/Whr+qJE3amRZfF0f5UI5kwsTb8DpQJ2TNJgx24kATsECPlXtl02VjBdz7MxOL6iN2dDHGIyfcaHur4/TDdC9gj2dfiEYHa/mTIB3vdFo282/ipNfSJoD+yTPRjZwGysTug=
Received: by 10.54.21.39 with SMTP id 39mr4179727wru;
	Mon, 23 May 2005 14:01:39 -0700 (PDT)
Received: from nofear.bounceme.net ([4.245.118.89])
	by mx.gmail.com with ESMTP id 11sm75798wrl.2005.05.23.14.01.15;
	Mon, 23 May 2005 14:01:39 -0700 (PDT)
Received: from [10.1.1.66] (hades [10.1.1.66])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(Client did not present a certificate)
	by nofear.bounceme.net (Postfix) with ESMTP id 377BF73534
	for <vdr@linuxtv.org>; Mon, 23 May 2005 14:00:28 -0700 (PDT)
Message-ID: <42924474.9020701@syphir.sytes.net>
Date: Mon, 23 May 2005 14:00:36 -0700
Organization: CooLNeT
User-Agent: Mozilla Thunderbird 1.0 (Windows/20041206)
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Vdr <vdr@linuxtv.org>
Subject: Re: [vdr] VDR-1.3.24: OSD speedup
References: <4290DCD5.3080006@gmx.de>
	<005701c55f09$b698d1a0$1400a8c0@dabberle.de>
	<4290EF39.9060806@syphir.sytes.net> <429228CB.9060501@gmail.com>
In-Reply-To: <429228CB.9060501@gmail.com>
X-Enigmail-Version: 0.90.2.0
X-Enigmail-Supports: pgp-inline, pgp-mime
From: "C.Y.M" <syphyr@gmail.com>
X-BeenThere: vdr@linuxtv.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: syphir@syphir.sytes.net, Klaus Schmidinger's VDR <vdr@linuxtv.org>
List-Id: Klaus Schmidinger's VDR <vdr.linuxtv.org>
List-Unsubscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=unsubscribe>
List-Archive: <http://www.linuxtv.org/pipermail/vdr>
List-Post: <mailto:vdr@linuxtv.org>
List-Help: <mailto:vdr-request@linuxtv.org?subject=help>
List-Subscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=subscribe>
X-List-Received-Date: Mon, 23 May 2005 21:02:13 -0000
Status: O
X-Status: 
X-Keywords: 
X-UID: 2438

Anssi Hannula wrote:
> C.Y.M wrote:
> 
>>
>> This patch also conflicts with the osdbase-maxitems.diff (used with the
>> text2skin plugin).
>>
> 
> Hmm, what patch is that? Haven't heard of it.
> 

When using text2skin, the words "Stop Recording" at the bottom of the menu are
not displayed or cut off unless this patch is applied. The following patch is
included with text2skin: vdr-1.3.17-osdbase-maxitems.diff

But, I had to make some changed to the patch for it to apply to 1.3.24.  Here is
what I'm using:

Regards,

--- vdr-1.3.24/osdbase.c.orig	2005-05-23 13:43:32.000000000 -0700
+++ vdr-1.3.24/osdbase.c	2005-05-23 13:52:38.000000000 -0700
@@ -182,6 +182,7 @@
      subMenu->Display();
      return;
      }
+  displayMenuItems = displayMenu->MaxItems();
   displayMenu->SetMessage(mtStatus, NULL);
   displayMenu->Clear();
   cStatus::MsgOsdClear();
@@ -261,7 +262,8 @@
   int last = Count() - 1;
   int lastOnScreen = first + displayMenuItems - 1;
   bool wrapped = false;
-
+  displayMenuItems = displayMenu->MaxItems();
+  
   // Search the next selectable item
   int tmpCurrent = current;
   do {