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

followscreenings: port code from martiis-neutrino-mp

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 61105699d4
Author: martii <m4rtii@gmx.de>
Date: 2016-07-01 (Fri, 01 Jul 2016)

Origin message was:
------------------
- followscreenings: port code from martiis-neutrino-mp

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

------------------
This commit was generated by Migit
This commit is contained in:
martii
2016-07-01 15:26:06 +02:00
committed by vanhofen
parent 92a65923bf
commit 8da554c0fa
13 changed files with 320 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/gui/timerlist.cpp
View File

@@ -1261,13 +1261,23 @@ int CTimerList::newTimer()
return ret;
}
bool askUserOnTimerConflict(time_t announceTime, time_t stopTime)
bool askUserOnTimerConflict(time_t announceTime, time_t stopTime, t_channel_id channel_id)
{
if (CFEManager::getInstance()->getEnabledCount() == 1) {
CTimerdClient Timer;
CTimerd::TimerList overlappingTimers = Timer.getOverlappingTimers(announceTime,stopTime);
//printf("[CTimerdClient] attention\n%d\t%d\t%d conflicts with:\n",timerNew.announceTime,timerNew.alarmTime,timerNew.stopTime);
// Don't ask if there are overlapping timers on the same transponder.
if (channel_id) {
CTimerd::TimerList::iterator i;
for (i = overlappingTimers.begin(); i != overlappingTimers.end(); i++)
if ((i->eventType != CTimerd::TIMER_RECORD || !SAME_TRANSPONDER(channel_id, i->channel_id)))
break;
if (i == overlappingTimers.end())
return true; // yes, add timer
}
std::string timerbuf = g_Locale->getText(LOCALE_TIMERLIST_OVERLAPPING_TIMER);
timerbuf += "\n";
for (CTimerd::TimerList::iterator it = overlappingTimers.begin();
@@ -1290,20 +1300,13 @@ bool askUserOnTimerConflict(time_t announceTime, time_t stopTime)
timerbuf += it->epgTitle;
}
}
timerbuf += ")";
timerbuf += "):\n";
timerbuf += ":\n";
char at[25] = {0};
struct tm *annTime = localtime(&(it->announceTime));
strftime(at,20,"%d.%m. %H:%M",annTime);
timerbuf += at;
timerbuf += " - ";
timerbuf += strftime("%d.%m. %H:%M\n",annTime);
char st[25] = {0};
struct tm *sTime = localtime(&(it->stopTime));
strftime(st,20,"%d.%m. %H:%M",sTime);
timerbuf += st;
timerbuf += "\n";
timerbuf += strftime("%d.%m. %H:%M\n",sTime);
//printf("%d\t%d\t%d\n",it->announceTime,it->alarmTime,it->stopTime);
}
//printf("message:\n%s\n",timerbuf.c_str());