summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkamel5 <vdr.kamel5 (at) gmx (dot) net>2019-07-18 17:13:58 +0200
committerkamel5 <vdr.kamel5 (at) gmx (dot) net>2019-07-19 11:38:07 +0200
commitb17fd9b7aa5aef6327b67c9caedf858a6cf859f2 (patch)
treea831adbc8dccc9131dbf68c50e16a71551733678
parentfb165b2b431fa14c45ba19c869ff4a387339da48 (diff)
downloadvdr-plugin-tvguide-b17fd9b7aa5aef6327b67c9caedf858a6cf859f2.tar.gz
vdr-plugin-tvguide-b17fd9b7aa5aef6327b67c9caedf858a6cf859f2.tar.bz2
Rework cRecMenuItemDay
-rw-r--r--recmenuitem.c3
-rw-r--r--recmenuitem.h1
-rw-r--r--recmenus.c4
3 files changed, 3 insertions, 5 deletions
diff --git a/recmenuitem.c b/recmenuitem.c
index ab0a10a..41d5237 100644
--- a/recmenuitem.c
+++ b/recmenuitem.c
@@ -1448,13 +1448,12 @@ eRecMenuState cRecMenuItemTime::ProcessKey(eKeys Key) {
// --- cRecMenuItemDay -------------------------------------------------------
cRecMenuItemDay::cRecMenuItemDay(cString text,
- time_t initialVal,
bool active,
time_t *callback,
eRecMenuState action) {
selectable = true;
this->text = text;
- this->currentVal = cTimer::SetTime(initialVal, 0);
+ this->currentVal = cTimer::SetTime(*callback, 0);
this->active = active;
this->callback = callback;
this->action = action;
diff --git a/recmenuitem.h b/recmenuitem.h
index 2300e26..436d35f 100644
--- a/recmenuitem.h
+++ b/recmenuitem.h
@@ -393,7 +393,6 @@ private:
void DrawValue(void);
public:
cRecMenuItemDay(cString text,
- time_t initialVal,
bool active = false,
time_t *callback = NULL,
eRecMenuState action = rmsNotConsumed);
diff --git a/recmenus.c b/recmenus.c
index 239df79..9456adf 100644
--- a/recmenus.c
+++ b/recmenus.c
@@ -447,7 +447,7 @@ cRecMenuEditTimer::cRecMenuEditTimer(const cTimer *timer, eRecMenuState nextStat
AddMenuItemInitial(new cRecMenuItemBool(tr("Timer Active"), true, &timerActive));
AddMenuItemInitial(new cRecMenuItemInt(tr("Priority"), 0, MAXPRIORITY, false, &prio));
AddMenuItemInitial(new cRecMenuItemInt(tr("Lifetime"), 0, MAXLIFETIME, false, &lifetime));
- AddMenuItemInitial(new cRecMenuItemDay(tr("Day"), day, false, &day));
+ AddMenuItemInitial(new cRecMenuItemDay(tr("Day"), false, &day));
AddMenuItemInitial(new cRecMenuItemTime(tr("Timer start time"), false, &start));
AddMenuItemInitial(new cRecMenuItemTime(tr("Timer stop time"), false, &stop));
cString fileInfo = cString::sprintf("%s:\n%s", tr("Timer File"), timer->File());
@@ -527,7 +527,7 @@ cRecMenuSeriesTimer::cRecMenuSeriesTimer(const cChannel *initialChannel, const c
AddMenuItem(new cRecMenuItemTime(tr("Series Timer start time"), false, &start));
AddMenuItem(new cRecMenuItemTime(tr("Series Timer stop time"), false, &stop));
AddMenuItem(new cRecMenuItemDayChooser(tr("Days to record"), dayOfWeek, false, &dayOfWeek));
- AddMenuItem(new cRecMenuItemDay(tr("Day to start"), tstart, false, &tstart));
+ AddMenuItem(new cRecMenuItemDay(tr("Day to start"), false, &tstart));
AddMenuItem(new cRecMenuItemInt(tr("Priority"), 0, MAXPRIORITY, false, &priority));
AddMenuItem(new cRecMenuItemInt(tr("Lifetime"), 0, MAXLIFETIME, false, &lifetime));