From f7997f67e03387d3b44dc8c1ffe609b427b378c8 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 28 Feb 2016 01:21:36 +0100 Subject: [PATCH] adzap: re-format code Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/40840cef367e21945e4ded8cb80ac652d7c35d08 Author: vanhofen Date: 2016-02-28 (Sun, 28 Feb 2016) Origin message was: ------------------ - adzap: re-format code --- src/gui/adzap.cpp | 423 +++++++++++++++++++++++----------------------- src/gui/adzap.h | 43 ++--- 2 files changed, 229 insertions(+), 237 deletions(-) diff --git a/src/gui/adzap.cpp b/src/gui/adzap.cpp index 424f0120d..ae275500c 100644 --- a/src/gui/adzap.cpp +++ b/src/gui/adzap.cpp @@ -1,32 +1,26 @@ /* - * adzap.cpp - * - * (C)2012-2013 by martii - * - * License: GPL - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ + adzap.cpp -/* - * AS SOME FOLKS DON'T SEEM TO UNDERSTAND THE GPL: YOU ARE FREE TO USE - * THIS CODE FOR YOUR OWN LITTLE STB IMAGE. BUT IF YOU ARE DISTRIBUTING - * THAT IMAGE, YOU ARE BOUND TO THE GPL, AND YOU HAVE TO DISTRIBUTE THE - * SOURCE CODE, TOO. IF YOU DON'T: A) YOU ACKNOWLEDGE THAT YOU'RE AN - * ABSOLUTE JERK, AND B) YOU'RE NOT PERMITTED TO USE THIS CODE. AT ALL. - */ + (C) 2012-2013 by martii + (C) 2016 Sven Hoefer (svenhoefer) + + License: GPL + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ #ifdef HAVE_CONFIG_H #include @@ -50,242 +44,239 @@ static CAdZapMenu *azm = NULL; CAdZapMenu *CAdZapMenu::getInstance() { - if (!azm) - azm = new CAdZapMenu(); - return azm; + if (!azm) + azm = new CAdZapMenu(); + return azm; } 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; + 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; + 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; - if (pthread_create(&thr, 0, CAdZapMenu::Run, this)) + pthread_t thr; + if (pthread_create(&thr, 0, CAdZapMenu::Run, this)) fprintf(stderr, "ERROR: pthread_create(CAdZapMenu::CAdZapMenu)\n"); - else + else pthread_detach(thr); - channelId = -1; - armed = false; - monitor = false; - alerted = false; + channelId = -1; + armed = false; + monitor = false; + alerted = false; } static bool sortByDateTime(const CChannelEvent & a, const CChannelEvent & b) { - return a.startTime < b.startTime; + return a.startTime < b.startTime; } void CAdZapMenu::Update() { - clock_gettime(CLOCK_REALTIME, &zapBackTime); - zapBackTime.tv_sec += g_settings.adzap_zapBackPeriod - ZAPBACK_ALERT_PERIOD; - sem_post(&sem); + clock_gettime(CLOCK_REALTIME, &zapBackTime); + zapBackTime.tv_sec += g_settings.adzap_zapBackPeriod - ZAPBACK_ALERT_PERIOD; + sem_post(&sem); } void *CAdZapMenu::Run(void *arg) { - CAdZapMenu *me = (CAdZapMenu *) arg; - me->Run(); - pthread_exit(NULL); + CAdZapMenu *me = (CAdZapMenu *) arg; + me->Run(); + pthread_exit(NULL); } void CAdZapMenu::Run() { - set_threadname("CAdZapMenu::Run"); - while (true) { - CChannelList *channelList = NULL; - t_channel_id curChannelId = -1; + set_threadname("CAdZapMenu::Run"); + while (true) + { + CChannelList *channelList = NULL; + t_channel_id curChannelId = -1; - if (monitor) { - struct timespec ts; - clock_gettime(CLOCK_REALTIME, &ts); - ts.tv_sec += 1; + if (monitor) + { + struct timespec ts; + clock_gettime(CLOCK_REALTIME, &ts); + ts.tv_sec += 1; - sem_timedwait(&sem, &ts); + sem_timedwait(&sem, &ts); - if (monitor && (monitorLifeTime.tv_sec > ts.tv_sec)) { - channelList = CNeutrinoApp::getInstance()->channelList; - curChannelId = - channelList ? channelList->getActiveChannel_ChannelID() - : -1; - if (!armed && (channelId != curChannelId)) { - armed = true; - clock_gettime(CLOCK_REALTIME, &zapBackTime); - zapBackTime.tv_sec += - g_settings.adzap_zapBackPeriod - - ZAPBACK_ALERT_PERIOD; - alerted = false; - } else if (channelId == curChannelId) { - armed = false; - alerted = false; + if (monitor && (monitorLifeTime.tv_sec > ts.tv_sec)) + { + channelList = CNeutrinoApp::getInstance()->channelList; + curChannelId = channelList ? channelList->getActiveChannel_ChannelID() : -1; + if (!armed && (channelId != curChannelId)) + { + armed = true; + clock_gettime(CLOCK_REALTIME, &zapBackTime); + zapBackTime.tv_sec += g_settings.adzap_zapBackPeriod - ZAPBACK_ALERT_PERIOD; + alerted = false; + } + else if (channelId == curChannelId) + { + armed = false; + alerted = false; + } + } + else + { + monitor = false; + armed = false; + alerted = false; + } } - } else { - monitor = false; - armed = false; - alerted = false; - } - } else if (armed) - sem_timedwait(&sem, &zapBackTime); - else - sem_wait(&sem); + else if (armed) + sem_timedwait(&sem, &zapBackTime); + else + sem_wait(&sem); - if (armed) { - struct timespec ts; - clock_gettime(CLOCK_REALTIME, &ts); - if (ts.tv_sec >= zapBackTime.tv_sec) { - if (!channelList) { - channelList = CNeutrinoApp::getInstance()->channelList; - curChannelId = - channelList ? - channelList->getActiveChannel_ChannelID() : -1; + if (armed) + { + struct timespec ts; + clock_gettime(CLOCK_REALTIME, &ts); + if (ts.tv_sec >= zapBackTime.tv_sec) + { + if (!channelList) + { + channelList = CNeutrinoApp::getInstance()->channelList; + curChannelId = channelList ? channelList->getActiveChannel_ChannelID() : -1; + } + if (!alerted) + { + if (channelId != curChannelId) + { + std::string name = g_Locale->getText(LOCALE_ADZAP_ANNOUNCE); + name += "\n" + channelName; + ShowHint(LOCALE_ADZAP, name.c_str()); + } + alerted = true; + zapBackTime.tv_sec += ZAPBACK_ALERT_PERIOD; + } + else + { + alerted = false; + if (channelList) + channelList->zapTo_ChannelID(channelId); + armed = false; + } + } } - if (!alerted) { - if (channelId != curChannelId) { - std::string name = - g_Locale->getText(LOCALE_ADZAP_ANNOUNCE); - name += "\n" + channelName; - ShowHint(LOCALE_ADZAP, name.c_str()); - } - alerted = true; - zapBackTime.tv_sec += ZAPBACK_ALERT_PERIOD; - } else { - alerted = false; - if (channelList) - channelList->zapTo_ChannelID(channelId); - armed = false; - } - } } - } } int CAdZapMenu::exec(CMenuTarget *parent, const std::string & actionKey) { - int res = menu_return::RETURN_EXIT_ALL; + int res = menu_return::RETURN_EXIT_ALL; - if (actionKey == "enable") { - if (!monitor) - armed = true; - alerted = false; - Update(); - return res; - } - if (actionKey == "disable") { - armed = false; - monitor = false; - alerted = false; - Update(); - return res; - } - if (actionKey == "monitor") { - armed = false; - monitor = true; - alerted = false; - Update(); - return res; - } - - if (actionKey == "adzap") { - if (armed || monitor) { - armed = false; - monitor = false; - alerted = false; - Update(); - ShowHint(LOCALE_ADZAP, LOCALE_ADZAP_CANCEL, 450, 1); - return res; + if (actionKey == "enable") + { + if (!monitor) + armed = true; + alerted = false; + Update(); + return res; + } + if (actionKey == "disable") + { + armed = false; + monitor = false; + alerted = false; + Update(); + return res; + } + if (actionKey == "monitor") + { + armed = false; + monitor = true; + alerted = false; + Update(); + return res; + } + if (actionKey == "adzap") + { + if (armed || monitor) { + armed = false; + monitor = false; + alerted = false; + Update(); + ShowHint(LOCALE_ADZAP, LOCALE_ADZAP_CANCEL, 450, 1); + return res; + } + } + if (actionKey.length() == 1) + { + g_settings.adzap_zapBackPeriod = actionKey[0] - '0'; + for (int shortcut = 1; shortcut < 10; shortcut++) + forwarders[shortcut - 1]->setMarked(shortcut == g_settings.adzap_zapBackPeriod); + g_settings.adzap_zapBackPeriod *= 60; + return menu_return::RETURN_REPAINT; } - } - if (actionKey.length() == 1) { - g_settings.adzap_zapBackPeriod = actionKey[0] - '0'; - for (int shortcut = 1; shortcut < 10; shortcut++) - forwarders[shortcut - 1]->setMarked(shortcut == g_settings.adzap_zapBackPeriod); - g_settings.adzap_zapBackPeriod *= 60; - return menu_return::RETURN_REPAINT; - } - if (parent) - parent->hide(); + if (parent) + parent->hide(); - Settings(); + Settings(); - return res; + return res; } void CAdZapMenu::Settings() { - CChannelList *channelList = CNeutrinoApp::getInstance()->channelList; - channelId = - channelList ? channelList->getActiveChannel_ChannelID() : -1; - channelName = channelList->getActiveChannelName(); + CChannelList *channelList = CNeutrinoApp::getInstance()->channelList; + channelId = channelList ? channelList->getActiveChannel_ChannelID() : -1; + channelName = channelList->getActiveChannelName(); - CMenuWidget *menu = new CMenuWidget(LOCALE_ADZAP, "settings", width); - menu->addItem(new - CMenuSeparator(CMenuSeparator::LINE | - CMenuSeparator::STRING, - LOCALE_ADZAP_SWITCHBACK)); - neutrino_locale_t minute = LOCALE_ADZAP_MINUTE; - for (int shortcut = 1; shortcut < 10; shortcut++) { - char actionKey[2]; - actionKey[0] = '0' + shortcut; - actionKey[1] = 0; - bool selected = g_settings.adzap_zapBackPeriod == 60 * shortcut; - forwarders[shortcut - 1] = - new CMenuForwarder(minute, true, NULL, this, actionKey, - CRCInput::convertDigitToKey(shortcut)); - forwarders[shortcut - 1]->setMarked(selected); - menu->addItem(forwarders[shortcut - 1], selected); - minute = LOCALE_ADZAP_MINUTES; - } - - menu->addItem(GenericMenuSeparatorLine); - - menu->addItem(new - CMenuForwarder(LOCALE_ADZAP_DISABLE, true, NULL, this, - "disable", CRCInput::RC_red, - NEUTRINO_ICON_BUTTON_RED)); - menu->addItem(new - CMenuForwarder(LOCALE_ADZAP_ENABLE, true, NULL, this, - "enable", CRCInput::RC_green, - NEUTRINO_ICON_BUTTON_GREEN)); - - CChannelEventList evtlist; - CEitManager::getInstance()->getEventsServiceKey(channelId & - 0xFFFFFFFFFFFFULL, - evtlist); - monitorLifeTime.tv_sec = 0; - if (!evtlist.empty()) { - sort(evtlist.begin(), evtlist.end(), sortByDateTime); - CChannelEventList::iterator eli; - struct timespec ts; - clock_gettime(CLOCK_REALTIME, &ts); - for (eli = evtlist.begin(); eli != evtlist.end(); ++eli) { - if ((u_int) eli->startTime + (u_int) eli->duration > - (u_int) ts.tv_sec) { - monitorLifeTime.tv_sec = (uint) eli->startTime + eli->duration; - Update(); - break; - } + CMenuWidget *menu = new CMenuWidget(LOCALE_ADZAP, "settings", width); + menu->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_ADZAP_SWITCHBACK)); + neutrino_locale_t minute = LOCALE_ADZAP_MINUTE; + for (int shortcut = 1; shortcut < 10; shortcut++) { + char actionKey[2]; + actionKey[0] = '0' + shortcut; + actionKey[1] = 0; + bool selected = g_settings.adzap_zapBackPeriod == 60 * shortcut; + forwarders[shortcut - 1] = new CMenuForwarder(minute, true, NULL, this, actionKey, CRCInput::convertDigitToKey(shortcut)); + forwarders[shortcut - 1]->setMarked(selected); + menu->addItem(forwarders[shortcut - 1], selected); + minute = LOCALE_ADZAP_MINUTES; } - } - menu->addItem(new - CMenuForwarder(LOCALE_ADZAP_MONITOR, - monitorLifeTime.tv_sec, NULL, this, - "monitor", CRCInput::RC_blue, - NEUTRINO_ICON_BUTTON_BLUE)); + menu->addItem(GenericMenuSeparatorLine); - monitor = false; - menu->exec(NULL, ""); - menu->hide(); - delete menu; - Update(); + menu->addItem(new CMenuForwarder(LOCALE_ADZAP_DISABLE, true, NULL, this, "disable", CRCInput::RC_red)); + menu->addItem(new CMenuForwarder(LOCALE_ADZAP_ENABLE, true, NULL, this, "enable", CRCInput::RC_green)); + + CChannelEventList evtlist; + CEitManager::getInstance()->getEventsServiceKey(channelId & 0xFFFFFFFFFFFFULL, evtlist); + monitorLifeTime.tv_sec = 0; + if (!evtlist.empty()) + { + sort(evtlist.begin(), evtlist.end(), sortByDateTime); + CChannelEventList::iterator eli; + struct timespec ts; + clock_gettime(CLOCK_REALTIME, &ts); + for (eli = evtlist.begin(); eli != evtlist.end(); ++eli) + { + if ((u_int) eli->startTime + (u_int) eli->duration > (u_int) ts.tv_sec) + { + monitorLifeTime.tv_sec = (uint) eli->startTime + eli->duration; + Update(); + break; + } + } + } + + menu->addItem(new CMenuForwarder(LOCALE_ADZAP_MONITOR, monitorLifeTime.tv_sec, NULL, this, "monitor", CRCInput::RC_blue)); + + monitor = false; + menu->exec(NULL, ""); + menu->hide(); + delete menu; + Update(); } diff --git a/src/gui/adzap.h b/src/gui/adzap.h index 6be3dd433..0dc6bbd62 100644 --- a/src/gui/adzap.h +++ b/src/gui/adzap.h @@ -1,25 +1,26 @@ /* - * adzap.h - * - * (C)2012 by martii - * - * License: GPL - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ + adzap.h + (C) 2012-2013 by martii + (C) 2016 Sven Hoefer (svenhoefer) + + License: GPL + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ #ifndef __adzap__ #define __adzap__ @@ -58,4 +59,4 @@ class CAdZapMenu: public CMenuTarget static CAdZapMenu *getInstance(); int exec(CMenuTarget * parent, const std::string & actionKey); }; -#endif // __adzap__ +#endif // __adzap__