From 15a345b48459f55495ae78b4952e0771a426ab36 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 4 Nov 2016 16:46:47 +0100 Subject: [PATCH 1/3] cablex.xml: update Unitymedia; thx to klauser Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/bf987b74781d97db34448cd60556e50827ec20da Author: vanhofen Date: 2016-11-04 (Fri, 04 Nov 2016) Origin message was: ------------------ - cablex.xml: update Unitymedia; thx to klauser ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- data/cables.xml | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/data/cables.xml b/data/cables.xml index debbe767f..4970d600c 100644 --- a/data/cables.xml +++ b/data/cables.xml @@ -220,11 +220,10 @@ - - - - - + + + + @@ -245,32 +244,27 @@ + + + + - - - - - - - - - - - - - - + + - + + + + From c782bff2b40f65a8b527585708e2e88faeb032df Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Fri, 4 Nov 2016 23:56:29 +0100 Subject: [PATCH 2/3] CComponentsInfoBox: fix missing calculation of image position with parent Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/90a693a1ec9f588d7d42362e4b393574e2682a13 Author: Thilo Graf Date: 2016-11-04 (Fri, 04 Nov 2016) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/components/cc_item_infobox.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/gui/components/cc_item_infobox.cpp b/src/gui/components/cc_item_infobox.cpp index 4d3f785e9..a2a6b6cbb 100644 --- a/src/gui/components/cc_item_infobox.cpp +++ b/src/gui/components/cc_item_infobox.cpp @@ -105,8 +105,12 @@ void CComponentsInfoBox::paintPicture() if (pic_name.empty()) return; + //NOTE: real values are reqiured, if we paint this item within a form as embedded cc-item + int x_pic = (cc_parent ? cc_xr : x) + fr_thickness; + int y_pic = (cc_parent ? cc_yr : y) + fr_thickness; + //init pic object and set icon paint position - pic = new CComponentsPicture(x+fr_thickness+x_offset, y+fr_thickness, 0, min(48, height-2*fr_thickness), pic_name); //NOTE: icons do not scale! + pic = new CComponentsPicture(x_pic+x_offset, y_pic, 0, min(48, height-2*fr_thickness), pic_name); //NOTE: icons do not scale! pic->setColorBody(col_body); @@ -115,7 +119,7 @@ void CComponentsInfoBox::paintPicture() pic->doPaintBg(false); //fit icon into frame - pic->setYPos(y+(height/2-pic->getHeight()/2)); + pic->setYPos(y_pic+(height/2-pic->getHeight()/2)); //paint, but set visibility mode pic->allowPaint(cc_allow_paint); From 0e3c24452fe2b27100ab6d48e27f2f76510a40cb Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 5 Nov 2016 21:07:12 +0100 Subject: [PATCH 3/3] timermanager: try to fix successive timers Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/7c74d0bc3b7bb4a5940f2cb3351604982fc4ce75 Author: vanhofen Date: 2016-11-05 (Sat, 05 Nov 2016) Origin message was: ------------------ - timermanager: try to fix successive timers ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/timerd/timermanager.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/timerd/timermanager.cpp b/src/timerd/timermanager.cpp index d9a54e36a..cfb509c8e 100644 --- a/src/timerd/timermanager.cpp +++ b/src/timerd/timermanager.cpp @@ -1306,10 +1306,19 @@ bool CTimerEvent_Record::adjustToCurrentEPG() CEitManager::getInstance()->getEventsServiceKey(eventInfo.channel_id, evtlist); time_t now = time(NULL); + time_t compare; + + int pre, post; + CTimerManager::getInstance()->getRecordingSafety(pre, post); + CChannelEventList::iterator first = evtlist.end(); for (CChannelEventList::iterator e = evtlist.begin(); e != evtlist.end(); ++e) { - if (e->startTime < now) + compare = e->startTime; + if (!pre) + compare += e->duration; + + if (compare <= now) continue; if (first == evtlist.end() || first->startTime > e->startTime) first = e; @@ -1323,8 +1332,6 @@ bool CTimerEvent_Record::adjustToCurrentEPG() time_t _alarmTime = first->startTime; time_t _stopTime = first->startTime + first->duration; if (recordingSafety) { - int pre, post; - CTimerManager::getInstance()->getRecordingSafety(pre, post); _alarmTime -= pre; _stopTime += post; }