@@ -560,7 +560,7 @@ cString cPluginEpgsearch::SVDRPCommand(const char *Command, const char *Option,
strftime(bufStart, sizeof(bufStart), "%H%M", localtime_r(&start, &tm_r));
strftime(bufEnd, sizeof(bufEnd), "%H%M", localtime_r(&stop, &tm_r));
- int timerMatch;
+ eTimerMatch timerMatch;
bool hasTimer = false;
if (Timers.GetMatch(pEvent, &timerMatch))
hasTimer = (timerMatch == tmFull);
@@ -49,7 +49,7 @@ string cMailTimerNotification::Format(const string& templ) const
const cEvent* pEvent = GetEvent();
if (!pEvent) return "";
- int TimerMatch = tmNone;
+ eTimerMatch TimerMatch = tmNone;
cTimer* pTimer = Timers.GetMatch(pEvent, &TimerMatch);
if (!pTimer) return "";
@@ -121,7 +121,7 @@ eOSState cMenuSearchCommands::Record(void)
{
if (!event) return osContinue;
- int timerMatch = tmNone;
+ eTimerMatch timerMatch = tmNone;
cTimer* timer = Timers.GetMatch(event, &timerMatch);
if (timerMatch == tmFull)
{
@@ -95,7 +95,7 @@ void cMenuEventSearch::Set()
cEventObj* eventObjPrev = GetPrev(event);
cEventObj* eventObjNext = GetNext(event);
- int timerMatch = tmNone;
+ eTimerMatch timerMatch = tmNone;
Timers.GetMatch(event, &timerMatch);
const char* szRed = trVDR("Button$Record");
if (timerMatch == tmFull)
@@ -184,7 +184,7 @@ eOSState cMenuSearchMain::Record(void)
if (item) {
if (item->timerMatch == tmFull)
{
- int tm = tmNone;
+ eTimerMatch tm = tmNone;
cTimer *timer = Timers.GetMatch(item->event, &tm);
if (timer)
{
@@ -77,7 +77,7 @@ bool cMenuSearchResultsItem::Update(bool Force)
bool result = false;
- int OldTimerMatch = timerMatch;
+ eTimerMatch OldTimerMatch = timerMatch;
bool OldInSwitchList = inSwitchList;
bool hasMatch = false;
cTimer* timer = NULL;
@@ -176,7 +176,7 @@ cMenuSearchResultsItem::cMenuSearchResultsItem(cRecording *Recording)
previewTimer = false;
episodeOnly = false;
menuTemplate = NULL;
- timerMatch = 0;
+ timerMatch = tmNone;
inSwitchList = false;
event = NULL;
search = NULL;
@@ -228,7 +228,7 @@ eOSState cMenuSearchResults::Record(void)
if (item) {
if (item->timerMatch == tmFull)
{
- int tm = tmNone;
+ eTimerMatch tm = tmNone;
cTimer *timer = Timers.GetMatch(item->event, &tm);
if (timer)
{
@@ -50,7 +50,7 @@ class cMenuSearchResultsItem : public cOsdItem {
bool episodeOnly;
cMenuTemplate* menuTemplate;
public:
- int timerMatch;
+ eTimerMatch timerMatch;
bool inSwitchList;
const cEvent *event;
const cSearchExt* search;
@@ -77,7 +77,7 @@ bool cMenuMyScheduleItem::Update(bool Force)
bool result = false;
- int OldTimerMatch = timerMatch;
+ eTimerMatch OldTimerMatch = timerMatch;
bool OldInSwitchList = inSwitchList;
bool hasMatch = false;
cTimer* timer = NULL;
@@ -520,7 +520,7 @@ eOSState cMenuWhatsOnSearch::Record(void)
{
if (item->timerMatch == tmFull)
{
- int tm = tmNone;
+ eTimerMatch tm = tmNone;
cTimer *timer = Timers.GetMatch(item->event, &tm);
if (timer)
{
@@ -35,7 +35,7 @@ public:
const cEvent *event;
cChannel *channel;
showMode mode;
- int timerMatch;
+ eTimerMatch timerMatch;
bool inSwitchList;
cMenuTemplate* menuTemplate;
@@ -143,7 +143,7 @@ std::list<std::string> cEpgsearchServiceHandler::TranslateResults(cSearchResults
strftime(bufStart, sizeof(bufStart), "%H%M", localtime_r(&start, &tm_r));
strftime(bufEnd, sizeof(bufEnd), "%H%M", localtime_r(&stop, &tm_r));
- int timerMatch;
+ eTimerMatch timerMatch;
bool hasTimer = false;
if (Timers.GetMatch(pEvent, &timerMatch))
hasTimer = (timerMatch == tmFull);