From bd84273c39cb4e26c727bb6ac6d54aa71741b958 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Sun, 28 Feb 2016 21:54:57 +0100 Subject: [PATCH] - adzap: cleanup from unused variables --- src/gui/adzap.cpp | 12 +++--------- src/gui/adzap.h | 4 ---- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/gui/adzap.cpp b/src/gui/adzap.cpp index e5a69c628..3e87a697d 100644 --- a/src/gui/adzap.cpp +++ b/src/gui/adzap.cpp @@ -59,21 +59,15 @@ CAdZapMenu *CAdZapMenu::getInstance() CAdZapMenu::CAdZapMenu() { frameBuffer = CFrameBuffer::getInstance(); - width = w_max(40, 10); - hheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight(); - mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight(); - height = hheight + 13 * mheight + 10; - - x = (((g_settings.screen_EndX - g_settings.screen_StartX) - width) / 2) + g_settings.screen_StartX; - y = (((g_settings.screen_EndY - g_settings.screen_StartY) - height) / 2) + g_settings.screen_StartY; + width = 40; sem_init(&sem, 0, 0); pthread_t thr; if (pthread_create(&thr, 0, CAdZapMenu::Run, this)) - fprintf(stderr, "ERROR: pthread_create(CAdZapMenu::CAdZapMenu)\n"); + fprintf(stderr, "ERROR: pthread_create(CAdZapMenu::CAdZapMenu)\n"); else - pthread_detach(thr); + pthread_detach(thr); channelId = -1; armed = false; monitor = false; diff --git a/src/gui/adzap.h b/src/gui/adzap.h index 0dc6bbd62..842769ae8 100644 --- a/src/gui/adzap.h +++ b/src/gui/adzap.h @@ -35,11 +35,7 @@ class CAdZapMenu: public CMenuTarget { private: CFrameBuffer * frameBuffer; - int x; - int y; int width; - int height; - int hheight, mheight; // head/menu font height bool running; bool armed; bool alerted;