- adzap: cleanup from unused variables

This commit is contained in:
svenhoefer
2016-02-28 21:54:57 +01:00
parent 4b104f0509
commit bd84273c39
2 changed files with 3 additions and 13 deletions

View File

@@ -59,21 +59,15 @@ CAdZapMenu *CAdZapMenu::getInstance()
CAdZapMenu::CAdZapMenu() CAdZapMenu::CAdZapMenu()
{ {
frameBuffer = CFrameBuffer::getInstance(); frameBuffer = CFrameBuffer::getInstance();
width = w_max(40, 10); width = 40;
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;
sem_init(&sem, 0, 0); sem_init(&sem, 0, 0);
pthread_t thr; pthread_t thr;
if (pthread_create(&thr, 0, CAdZapMenu::Run, this)) 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 else
pthread_detach(thr); pthread_detach(thr);
channelId = -1; channelId = -1;
armed = false; armed = false;
monitor = false; monitor = false;

View File

@@ -35,11 +35,7 @@ class CAdZapMenu: public CMenuTarget
{ {
private: private:
CFrameBuffer * frameBuffer; CFrameBuffer * frameBuffer;
int x;
int y;
int width; int width;
int height;
int hheight, mheight; // head/menu font height
bool running; bool running;
bool armed; bool armed;
bool alerted; bool alerted;