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

src/gui/eventlist.cpp fix timeshif_record timer handling

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 65a237c991
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-08-20 (Thu, 20 Aug 2015)


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

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2015-08-20 15:51:57 +02:00
parent 87cbe1b226
commit 71e8037a22
3 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/gui/eventlist.cpp
View File

@@ -705,10 +705,17 @@ CTimerd::CTimerEventTypes CEventList::isScheduled(t_channel_id channel_id, CChan
if(timer->channel_id == channel_id && (timer->eventType == CTimerd::TIMER_ZAPTO || timer->eventType == CTimerd::TIMER_RECORD)) {
if(timer->epgID == event->eventID) {
if(timer->epg_starttime == event->startTime) {
bool isTimeShiftTimer = false;
if( timer->eventType == CTimerd::TIMER_RECORD){
isTimeShiftTimer = CRecordManager::getInstance()->CheckRecordingId_if_Timeshift(timer->eventID);
}
if(tID)
*tID = timer->eventID;
if(isTimeShiftTimer)//skip TSHIFT RECORD
continue;
return timer->eventType;
}
}
}
}
}
@@ -786,14 +793,14 @@ void CEventList::paintItem(unsigned int pos, t_channel_id channel_idI)
// 2nd line
// set status icons
t_channel_id channel_tmp = m_showChannel ? evtlist[curpos].channelID : channel_idI;
CTimerd::CTimerEventTypes etype = isScheduled(channel_tmp, &evtlist[curpos]);
int timerID = -1;
CTimerd::CTimerEventTypes etype = isScheduled(channel_tmp, &evtlist[curpos],&timerID);
const char * icontype = etype == CTimerd::TIMER_ZAPTO ? NEUTRINO_ICON_ZAP : 0;
if(etype == CTimerd::TIMER_RECORD){
int rec_mode = CRecordManager::getInstance()->GetRecordMode(channel_tmp);
if (rec_mode == CRecordManager::RECMODE_TSHIFT)
icontype = NEUTRINO_ICON_REC;// NEUTRINO_ICON_RECORDING_EVENT_MARKER
}else{
if (timerID > 0 && CRecordManager::getInstance()->CheckRecordingId_if_Timeshift(timerID))
icontype = NEUTRINO_ICON_AUTO_SHIFT;
else
icontype = NEUTRINO_ICON_REC;// NEUTRINO_ICON_RECORDING_EVENT_MARKER
}
int iw = 0, ih;
if(icontype != 0) {