mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

src/gui/eventlist.cpp fix timeshif_record timer handling

Browse Source
This commit is contained in:
Jacek Jendrzej
2015-08-20 15:51:57 +02:00
parent abea6d83d6
commit 65a237c991
3 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/driver/record.cpp
View File

@@ -858,6 +858,17 @@ CRecordInstance * CRecordManager::FindTimeshift()
return NULL; return NULL;
} }
bool CRecordManager::CheckRecordingId_if_Timeshift(int recid)
{
if(recid > 0){
CRecordInstance * inst = FindInstanceID(recid);
if(inst){
return inst->Timeshift();
}
}
return false;
}
MI_MOVIE_INFO * CRecordManager::GetMovieInfo(t_channel_id channel_id, bool timeshift) MI_MOVIE_INFO * CRecordManager::GetMovieInfo(t_channel_id channel_id, bool timeshift)
{ {
//FIXME copy MI_MOVIE_INFO ? //FIXME copy MI_MOVIE_INFO ?

1
src/driver/record.h
View File

@@ -195,6 +195,7 @@ class CRecordManager : public CMenuTarget /*, public CChangeObserver*/
bool StartAutoRecord(); bool StartAutoRecord();
bool StopAutoRecord(bool lock = true); bool StopAutoRecord(bool lock = true);
void StopAutoTimer(); void StopAutoTimer();
bool CheckRecordingId_if_Timeshift(int recid);
MI_MOVIE_INFO * GetMovieInfo(const t_channel_id channel_id, bool timeshift = true); MI_MOVIE_INFO * GetMovieInfo(const t_channel_id channel_id, bool timeshift = true);
const std::string GetFileName(const t_channel_id channel_id, bool timeshift = true); const std::string GetFileName(const t_channel_id channel_id, bool timeshift = true);

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