summaryrefslogtreecommitdiff
path: root/recmenuitem.h
diff options
context:
space:
mode:
Diffstat (limited to 'recmenuitem.h')
-rw-r--r--recmenuitem.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/recmenuitem.h b/recmenuitem.h
index 99022d5..8d8ad95 100644
--- a/recmenuitem.h
+++ b/recmenuitem.h
@@ -18,6 +18,7 @@ enum eRecMenuState {
rmsIgnoreTimerConflict,
rmsDeleteTimerConflictMenu,
rmsEditTimerConflictMenu,
+ rmsSearchRerunsTimerConflictMenu,
rmsSaveTimerConflictMenu,
rmsTimerConflictShowInfo,
rmsDeleteTimer,
@@ -51,6 +52,8 @@ enum eRecMenuState {
rmsRecordingSearchResult,
rmsTimerConflict,
rmsTimerConflicts,
+ rmsTimerConflictIgnoreReruns,
+ rmsTimerConflictRecordRerun,
rmsDisabled,
};
@@ -331,6 +334,7 @@ private:
const cTimer *timer;
eRecMenuState action2;
eRecMenuState action3;
+ eRecMenuState action4;
int iconActive;
cPixmap *pixmapIcons;
cPixmap *pixmapStatus;
@@ -345,6 +349,7 @@ public:
eRecMenuState action1,
eRecMenuState action2,
eRecMenuState action3,
+ eRecMenuState action4,
time_t conflictStart,
time_t conflictStop,
time_t overlapStart,