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

eventlist: use real channel-id in webtv-mode to set timers

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9b78404d19
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-10-09 (Fri, 09 Oct 2015)

Origin message was:
------------------
- eventlist: use real channel-id in webtv-mode to set timers

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2015-10-09 19:00:03 +02:00
parent a09c224222
commit 3c26eb47ce
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/eventlist.cpp
View File

@@ -482,9 +482,10 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna
else else
recDir = ""; recDir = "";
} }
t_channel_id used_id = IS_WEBTV(channel_id) ? channel_id : evtlist[selected].channelID;
if (!recDir.empty()) //add/remove recording timer events and check/warn for conflicts if (!recDir.empty()) //add/remove recording timer events and check/warn for conflicts
{ {
if (g_Timerd->addRecordTimerEvent(evtlist[selected].channelID , if (g_Timerd->addRecordTimerEvent(used_id,
evtlist[selected].startTime, evtlist[selected].startTime,
evtlist[selected].startTime + evtlist[selected].duration, evtlist[selected].startTime + evtlist[selected].duration,
evtlist[selected].eventID, evtlist[selected].startTime, evtlist[selected].eventID, evtlist[selected].startTime,
@@ -493,7 +494,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna
{ {
if(askUserOnTimerConflict(evtlist[selected].startTime - (ANNOUNCETIME + 120), evtlist[selected].startTime + evtlist[selected].duration)) //check for timer conflict if(askUserOnTimerConflict(evtlist[selected].startTime - (ANNOUNCETIME + 120), evtlist[selected].startTime + evtlist[selected].duration)) //check for timer conflict
{ {
g_Timerd->addRecordTimerEvent(evtlist[selected].channelID , g_Timerd->addRecordTimerEvent(used_id,
evtlist[selected].startTime, evtlist[selected].startTime,
evtlist[selected].startTime + evtlist[selected].duration, evtlist[selected].startTime + evtlist[selected].duration,
evtlist[selected].eventID, evtlist[selected].startTime, evtlist[selected].eventID, evtlist[selected].startTime,
@@ -513,8 +514,8 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna
} }
timerlist.clear(); timerlist.clear();
g_Timerd->getTimerList (timerlist); g_Timerd->getTimerList (timerlist);
paint(evtlist[selected].channelID ); paint(used_id);
showFunctionBar(true, evtlist[selected].channelID ); showFunctionBar(true, used_id);
} }
} }
else if ( msg == (neutrino_msg_t) g_settings.key_channelList_addremind )//add/remove zapto timer event else if ( msg == (neutrino_msg_t) g_settings.key_channelList_addremind )//add/remove zapto timer event
@@ -530,7 +531,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna
continue; continue;
} }
g_Timerd->addZaptoTimerEvent(evtlist[selected].channelID , g_Timerd->addZaptoTimerEvent(IS_WEBTV(channel_id) ? channel_id : evtlist[selected].channelID,
evtlist[selected].startTime - (g_settings.zapto_pre_time * 60), evtlist[selected].startTime - (g_settings.zapto_pre_time * 60),
evtlist[selected].startTime - ANNOUNCETIME - (g_settings.zapto_pre_time * 60), 0, evtlist[selected].startTime - ANNOUNCETIME - (g_settings.zapto_pre_time * 60), 0,
evtlist[selected].eventID, evtlist[selected].startTime, 0); evtlist[selected].eventID, evtlist[selected].startTime, 0);