1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
|
diff -Naur epgsearch-1.0.0.orig/epgsearchsvdrp.c epgsearch-1.0.0/epgsearchsvdrp.c
--- epgsearch-1.0.0.orig/epgsearchsvdrp.c 2012-12-15 11:42:41.000000000 +0100
+++ epgsearch-1.0.0/epgsearchsvdrp.c 2012-12-15 11:44:38.000000000 +0100
@@ -564,7 +564,7 @@
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);
diff -Naur epgsearch-1.0.0.orig/mail.c epgsearch-1.0.0/mail.c
--- epgsearch-1.0.0.orig/mail.c 2012-12-15 11:42:41.000000000 +0100
+++ epgsearch-1.0.0/mail.c 2012-12-15 11:45:02.000000000 +0100
@@ -49,7 +49,7 @@
const cEvent* pEvent = GetEvent();
if (!pEvent) return "";
- int TimerMatch = tmNone;
+ eTimerMatch TimerMatch = tmNone;
cTimer* pTimer = Timers.GetMatch(pEvent, &TimerMatch);
if (!pTimer) return "";
diff -Naur epgsearch-1.0.0.orig/menu_commands.c epgsearch-1.0.0/menu_commands.c
--- epgsearch-1.0.0.orig/menu_commands.c 2012-12-15 11:42:41.000000000 +0100
+++ epgsearch-1.0.0/menu_commands.c 2012-12-15 11:45:40.000000000 +0100
@@ -121,7 +121,7 @@
{
if (!event) return osContinue;
- int timerMatch = tmNone;
+ eTimerMatch timerMatch = tmNone;
cTimer* timer = Timers.GetMatch(event, &timerMatch);
if (timerMatch == tmFull)
{
diff -Naur epgsearch-1.0.0.orig/menu_event.c epgsearch-1.0.0/menu_event.c
--- epgsearch-1.0.0.orig/menu_event.c 2012-12-15 11:42:41.000000000 +0100
+++ epgsearch-1.0.0/menu_event.c 2012-12-15 11:46:17.000000000 +0100
@@ -92,7 +92,7 @@
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)
diff -Naur epgsearch-1.0.0.orig/menu_main.c epgsearch-1.0.0/menu_main.c
--- epgsearch-1.0.0.orig/menu_main.c 2012-12-15 11:42:41.000000000 +0100
+++ epgsearch-1.0.0/menu_main.c 2012-12-15 11:47:08.000000000 +0100
@@ -181,7 +181,7 @@
if (item) {
if (item->timerMatch == tmFull)
{
- int tm = tmNone;
+ eTimerMatch tm = tmNone;
cTimer *timer = Timers.GetMatch(item->event, &tm);
if (timer)
{
diff -Naur epgsearch-1.0.0.orig/menu_searchresults.c epgsearch-1.0.0/menu_searchresults.c
--- epgsearch-1.0.0.orig/menu_searchresults.c 2012-12-15 11:42:41.000000000 +0100
+++ epgsearch-1.0.0/menu_searchresults.c 2012-12-15 11:51:12.000000000 +0100
@@ -217,7 +217,7 @@
if (item) {
if (item->timerMatch == tmFull)
{
- int tm = tmNone;
+ eTimerMatch tm = tmNone;
cTimer *timer = Timers.GetMatch(item->event, &tm);
if (timer)
{
diff -Naur epgsearch-1.0.0.orig/menu_searchresults.h epgsearch-1.0.0/menu_searchresults.h
--- epgsearch-1.0.0.orig/menu_searchresults.h 2012-12-15 11:42:41.000000000 +0100
+++ epgsearch-1.0.0/menu_searchresults.h 2012-12-15 11:51:57.000000000 +0100
@@ -50,7 +50,7 @@
bool episodeOnly;
cMenuTemplate* menuTemplate;
public:
- int timerMatch;
+ eTimerMatch timerMatch;
bool inSwitchList;
const cEvent *event;
const cSearchExt* search;
diff -Naur epgsearch-1.0.0.orig/menu_whatson.c epgsearch-1.0.0/menu_whatson.c
--- epgsearch-1.0.0.orig/menu_whatson.c 2012-12-15 11:42:41.000000000 +0100
+++ epgsearch-1.0.0/menu_whatson.c 2012-12-15 11:52:37.000000000 +0100
@@ -527,7 +527,7 @@
{
if (item->timerMatch == tmFull)
{
- int tm = tmNone;
+ eTimerMatch tm = tmNone;
cTimer *timer = Timers.GetMatch(item->event, &tm);
if (timer)
{
diff -Naur epgsearch-1.0.0.orig/menu_whatson.h epgsearch-1.0.0/menu_whatson.h
--- epgsearch-1.0.0.orig/menu_whatson.h 2012-12-15 11:42:41.000000000 +0100
+++ epgsearch-1.0.0/menu_whatson.h 2012-12-15 11:53:09.000000000 +0100
@@ -35,7 +35,7 @@
const cEvent *event;
cChannel *channel;
showMode mode;
- int timerMatch;
+ eTimerMatch timerMatch;
bool inSwitchList;
cMenuTemplate* menuTemplate;
diff -Naur epgsearch-1.0.0.orig/services.c epgsearch-1.0.0/services.c
--- epgsearch-1.0.0.orig/services.c 2012-12-15 11:42:41.000000000 +0100
+++ epgsearch-1.0.0/services.c 2012-12-15 11:53:34.000000000 +0100
@@ -143,7 +143,7 @@
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);
|
