From 846c0c554ec1a6ef2b8616a1c66ad52646e65a99 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Mon, 12 Dec 2016 17:20:48 +0100 Subject: [PATCH 1/4] fix next epginfo and sat/freq info for webtv Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/af9c9140139e526bbfa038f8402b5b427ad62a45 Author: Jacek Jendrzej Date: 2016-12-12 (Mon, 12 Dec 2016) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/channellist.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 679686f4e..81dfbb169 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -1520,24 +1520,23 @@ void CChannelList::paintDetails(int index) int ypos = y + height + OFFSET_INTER; int ypos_a = ypos + OFFSET_INNER_SMALL; - CChannelEvent *p_event = NULL; - - //colored_events init - bool colored_event_C = (g_settings.theme.colored_events_channellist == 1); - bool colored_event_N = (g_settings.theme.colored_events_channellist == 2); - frameBuffer->paintBoxRel(x, ypos, full_width, info_height, COL_MENUCONTENTDARK_PLUS_0, RADIUS_LARGE); frameBuffer->paintBoxFrame(x, ypos, full_width, info_height, 2, COL_FRAME_PLUS_0, RADIUS_LARGE); if ((*chanlist).empty()) return; + //colored_events init + bool colored_event_C = (g_settings.theme.colored_events_channellist == 1); + bool colored_event_N = (g_settings.theme.colored_events_channellist == 2); + + CChannelEvent *p_event = NULL; if (displayNext) p_event = &(*chanlist)[index]->nextEvent; else p_event = &(*chanlist)[index]->currentEvent; - if (/* !IS_WEBTV((*chanlist)[index]->getChannelID()) && */ !p_event->description.empty()) { + if (/* !IS_WEBTV((*chanlist)[index]->getChannelID()) && */ p_event && !p_event->description.empty()) { char cNoch[50] = {0}; // UTF-8 char cSeit[50] = {0}; // UTF-8 @@ -1604,7 +1603,7 @@ void CChannelList::paintDetails(int index) else if (IS_WEBTV((*chanlist)[index]->getChannelID())) { g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ 10, ypos_a + fheight, full_width - 30, (*chanlist)[index]->getDesc(), colored_event_C ? COL_COLORED_EVENTS_TEXT : COL_MENUCONTENTDARK_TEXT, 0, true); } - if (IS_WEBTV((*chanlist)[index]->getChannelID())) { + if (g_settings.channellist_foot == 0 && IS_WEBTV((*chanlist)[index]->getChannelID())) { g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ 10, ypos_a + 2*fheight + fdescrheight, full_width - 30, (*chanlist)[index]->getUrl(), COL_MENUCONTENTDARK_TEXT, 0, true); } else if(g_settings.channellist_foot == 0) { transponder t; @@ -1621,7 +1620,7 @@ void CChannelList::paintDetails(int index) else if( !displayNext && g_settings.channellist_foot == 1) { // next Event CSectionsdClient::CurrentNextInfo CurrentNext; - CEitManager::getInstance()->getCurrentNextServiceKey((*chanlist)[index]->getChannelID(), CurrentNext); + CEitManager::getInstance()->getCurrentNextServiceKey((*chanlist)[index]->getEpgID(), CurrentNext); if (!CurrentNext.next_name.empty()) { char buf[128] = {0}; char cFrom[50] = {0}; // UTF-8 From 489893a81008fcfae6604a7871f5b62431638ada Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Fri, 9 Dec 2016 20:11:45 +0100 Subject: [PATCH 2/4] CNeutrinoApp: use default timeout from settings Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/8eae5c5d0938df6bdadffb4939fadeee46358fdc Author: Thilo Graf Date: 2016-12-09 (Fri, 09 Dec 2016) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/neutrino.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index ca1769fa4..8f185ce20 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -3517,7 +3517,7 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode) if(CRecordManager::getInstance()->RecordingStatus() || cYTCache::getInstance()->isActive()) { do_shutdown = (ShowMsg(LOCALE_MESSAGEBOX_INFO, LOCALE_SHUTDOWN_RECORDING_QUERY, CMsgBox::mbrNo, - CMsgBox::mbYes | CMsgBox::mbNo, NULL, 450, 30, true) == CMsgBox::mbrYes); + CMsgBox::mbYes | CMsgBox::mbNo, NULL, 450, DEFAULT_TIMEOUT, true) == CMsgBox::mbrYes); } if(do_shutdown) { From 410921eb9ed65f8f1bbbe422aadbc852c7fef62b Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Fri, 9 Dec 2016 20:12:05 +0100 Subject: [PATCH 3/4] CRecordManager: use default timeout from settings Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/b273334f46a73a1f955261069fe0d5d6c82a3284 Author: Thilo Graf Date: 2016-12-09 (Fri, 09 Dec 2016) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/driver/record.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/driver/record.cpp b/src/driver/record.cpp index ec33188dd..b9ee29bca 100644 --- a/src/driver/record.cpp +++ b/src/driver/record.cpp @@ -1418,7 +1418,7 @@ int CRecordManager::exec(CMenuTarget* parent, const std::string & actionKey ) inst->GetRecordString(title, duration); title += duration; tostart = (ShowMsg(LOCALE_RECORDING_IS_RUNNING, title.c_str(), - CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbNo, NULL, 450, 30) == CMsgBox::mbrYes); + CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbNo, NULL, 450, DEFAULT_TIMEOUT) == CMsgBox::mbrYes); } if (tostart) { CRecordManager::getInstance()->Record(live_channel_id); From 4d855a2a4257b7b8a6f6c3b22a9d1c05e05ef0bd Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Mon, 12 Dec 2016 21:35:18 +0100 Subject: [PATCH 4/4] CHintBox: fix timeout comparsion default timeout was not defined Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/bd75701fc39b13be9c5b1b27b1cc31b9df4bd6ce Author: Thilo Graf Date: 2016-12-12 (Mon, 12 Dec 2016) ------------------ This commit was generated by Migit --- src/gui/widget/hintbox.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/widget/hintbox.cpp b/src/gui/widget/hintbox.cpp index 52728f3c1..2439f57ed 100644 --- a/src/gui/widget/hintbox.cpp +++ b/src/gui/widget/hintbox.cpp @@ -197,7 +197,7 @@ int CHintBox::exec() neutrino_msg_data_t data; int res = messages_return::none; - if (timeout == NO_TIMEOUT || timeout == 0) + if (timeout == NO_TIMEOUT || timeout == DEFAULT_TIMEOUT) timeout = HINTBOX_DEFAULT_TIMEOUT; uint64_t timeoutEnd = CRCInput::calcTimeoutEnd( timeout );