vdr-prefermenu and vdr 1.7.21
Commit Message
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.
Comments
Hi,
I tried to compil vdr-prefermenu-0.6.6 ant theses patches under vdr-2.0.3.
Unfortunately, compilation failed. Is there any more recent patch, or could
you help me to fix ?
*** Plugin prefermenu:
WARNING: plugin prefermenu is using an old Makefile!
g++ -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses -fPIC
-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-D_LARGEFILE64_SOURCE -I/usr/include/linux/dvb -c
-DPLUGIN_NAME_I18N='"prefermenu"' -D_GNU_SOURCE
-I/usr/local/src/vdr-2.0.3/include prefermenu.c
In file included from prefermenu.c:14:0:
i18n.h:14:14: error: ?tI18nPhrase? does not name a type
prefermenu.c: In member function ?virtual bool cPluginPrefermenu::Start()?:
prefermenu.c:52:16: error: ?Phrases? was not declared in this scope
prefermenu.c:52:23: error: ?RegisterI18n? was not declared in this scope
make[1]: *** [prefermenu.o] Erreur 1
Thank you.
Karim
-----Message d'origine-----
De : vdr-bounces@linuxtv.org [mailto:vdr-bounces@linuxtv.org] De la part de
Matti Lehtimäki
Envoyé : mercredi 7 décembre 2011 17:01
À : vdr@linuxtv.org
Objet : Re: [vdr] vdr-prefermenu and vdr 1.7.21
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.
--
Matti Lehtimäki
#! /bin/sh /usr/share/dpatch/dpatch-run
## 90_prefermenu-0.6.6-1.5.3+SetAreas-bugfix.dpatch by Thomas Günther <tom@toms-cafe.de>
## 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@
===================================================================
@@ -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;
}
===================================================================
@@ -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
===================================================================
@@ -4,8 +4,6 @@
#include <vdr/plugin.h>
static const int BORDERSIZE = 2;
-static const cFont *font = cFont::GetFont(fontOsd);
-static const int LINEHEIGHT = font->Height();
class cPreferOsd : public cOsdObject {