summaryrefslogtreecommitdiff
path: root/displaychannel.c
diff options
context:
space:
mode:
Diffstat (limited to 'displaychannel.c')
-rw-r--r--displaychannel.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/displaychannel.c b/displaychannel.c
index 2f2dafb..a0c51a9 100644
--- a/displaychannel.c
+++ b/displaychannel.c
@@ -101,10 +101,10 @@ cLCARSNGDisplayChannel::cLCARSNGDisplayChannel(bool WithInfo):cThread("LCARS Dis
xs = 0;
- dsyslog ("%s %s %d Lineheight %i\n", __FILE__, __func__, __LINE__, lineHeight);
- dsyslog ("%s %s %d Iconheight %i\n", __FILE__, __func__, __LINE__, iconHeight);
- dsyslog ("%s %s %d Ellipse AU %ix%i\n", __FILE__, __func__, __LINE__, (xc01 - 1 - xc00), (yc12 - 1 - yc08));
- dsyslog ("%s %s %d Ellipse AO %ix%i\n", __FILE__, __func__, __LINE__, (xc01 - 1 - xc00), (yc00m - 1 - yc0B));
+// dsyslog ("%s %s %d Lineheight %i\n", __FILE__, __func__, __LINE__, lineHeight);
+// dsyslog ("%s %s %d Iconheight %i\n", __FILE__, __func__, __LINE__, iconHeight);
+// dsyslog ("%s %s %d Ellipse AU %ix%i\n", __FILE__, __func__, __LINE__, (xc01 - 1 - xc00), (yc12 - 1 - yc08));
+// dsyslog ("%s %s %d Ellipse AO %ix%i\n", __FILE__, __func__, __LINE__, (xc01 - 1 - xc00), (yc00m - 1 - yc0B));
int y1 = withInfo ? yc12 : yc02;
int y0 = cOsd::OsdTop() + (Setup.ChannelInfoPos ? 0 : cOsd::OsdHeight() - y1);
@@ -168,10 +168,11 @@ cLCARSNGDisplayChannel::cLCARSNGDisplayChannel(bool WithInfo):cThread("LCARS Dis
cLCARSNGDisplayChannel::~cLCARSNGDisplayChannel()
{
- Cancel(-1);
+// Cancel(3);
delete tallFont;
delete tinyFont;
delete osd;
+ Cancel(3);
cDevice::PrimaryDevice()->ScaleVideo(cRect::Null);
}