mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 08:21:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: e893472e77
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-05 (Sat, 05 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-11-05 21:11:37 +01:00
parent fa63ad16f7 0e3c24452f
commit 11b0ea0b84
3 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
data/cables.xml
View File

@@ -220,11 +220,10 @@
<transponder frequency="698000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
</cable>
<cable name="Unitymedia" satfeed="true" flags="9">
<transponder frequency="113000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="114000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="121000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="129000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="130000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="114000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="122000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="130000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="138000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="146000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="154000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="162000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
@@ -245,32 +244,27 @@
<transponder frequency="450000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="458000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="466000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="474000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="482000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="490000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="498000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="522000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="530000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="538000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="546000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="554000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="562000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="570000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="610000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="682000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="690000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="698000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="706000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="730000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="738000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="746000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="610000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="746000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="754000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="762000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="770000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="778000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="786000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="794000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="802000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="802000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="810000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="818000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="826000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="834000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="842000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
<transponder frequency="850000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
<transponder frequency="858000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
</cable>
<cable name="Kabel BW" satfeed="true" flags="9">
<transponder frequency="114000" symbol_rate="6900000" fec_inner="0" modulation="5"/>

8
src/gui/components/cc_item_infobox.cpp
View File

@@ -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);

13
src/timerd/timermanager.cpp
View File

@@ -1318,10 +1318,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;
@@ -1335,8 +1344,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;
}