VDR-1.3.24: OSD speedup

Message ID 42924474.9020701@syphir.sytes.net
State New
Headers

Commit Message

C.Y.M May 23, 2005, 9 p.m. UTC
  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,
  

Comments

C.Y.M May 23, 2005, 10:14 p.m. UTC | #1
C.Y.M wrote:
> 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:
> 

Ah, the reason for the "bool wrapped = false;" line is from another patch called
"natural_menu_cursor".  So, if you dont have the natural_menu_cursor patch, then
the patch that is in text2skin cvs should be fine without any modifications.

Regards,
  

Patch

--- 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 {