followscreenings: port code from martiis-neutrino-mp

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

View File

@@ -97,7 +97,6 @@ class CTimerList : public CMenuTarget, public CListHelpers
static std::string convertChannelId2String(const t_channel_id id); // UTF-8
};
bool askUserOnTimerConflict(time_t announceTime, time_t stopTime);
bool askUserOnTimerConflict(time_t announceTime, time_t stopTime, t_channel_id channel_id = 0);
#endif