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

Ask user for storing overlapping CI timer from epg

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7543aa602c
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-07-10 (Sun, 10 Jul 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
FlatTV
2016-07-10 21:44:30 +02:00
parent 35b94ecc0a
commit 8c47e9a1fd
10 changed files with 50 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/timerlist.cpp
View File

@@ -737,6 +737,7 @@ void CTimerList::paintItem(int pos)
case CTimerd::TIMER_RECORD :
{
zAddData = convertChannelId2String(timer.channel_id); // UTF-8
zAddData += timer.channel_ci?"(CI)":""; //NI
if (timer.apids != TIMERD_APIDS_CONF)
{
std::string sep = "";
@@ -1263,7 +1264,11 @@ int CTimerList::newTimer()
bool askUserOnTimerConflict(time_t announceTime, time_t stopTime, t_channel_id channel_id)
{
if (CFEManager::getInstance()->getEnabledCount() == 1) {
//NI
CZapitChannel * channel = CServiceManager::getInstance()->FindChannel(channel_id);
bool useCI = channel->bUseCI;
if (CFEManager::getInstance()->getEnabledCount() == 1 || /*NI*/useCI) {
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);
@@ -1272,7 +1277,10 @@ bool askUserOnTimerConflict(time_t announceTime, time_t stopTime, t_channel_id c
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)))
//NI if ((i->eventType != CTimerd::TIMER_RECORD || !SAME_TRANSPONDER(channel_id, i->channel_id)))
if ((i->eventType != CTimerd::TIMER_RECORD ||
(!SAME_TRANSPONDER(channel_id, i->channel_id) && !useCI) ||
(useCI && i->channel_ci)))
break;
if (i == overlappingTimers.end())
return true; // yes, add timer
@@ -1283,6 +1291,10 @@ bool askUserOnTimerConflict(time_t announceTime, time_t stopTime, t_channel_id c
for (CTimerd::TimerList::iterator it = overlappingTimers.begin();
it != overlappingTimers.end(); ++it)
{
//NI
if(useCI && !it->channel_ci)
continue;
timerbuf += CTimerList::convertTimerType2String(it->eventType);
timerbuf += " (";
timerbuf += CTimerList::convertChannelId2String(it->channel_id); // UTF-8