Added possibility to search for reruns in case of a timer conflict

1 files changed, 31 insertions, 5 deletions

diff --git a/recmenus.h b/recmenus.h
index def944d..5b7c485 100644
--- a/recmenus.h
+++ b/recmenus.h
@@ -51,16 +51,16 @@ public:
 // --- cRecMenuTimerConflicts  ---------------------------------------------------------

 class cRecMenuTimerConflicts: public cRecMenu {

 public:

-    cRecMenuTimerConflicts(std::vector<TVGuideTimerConflict> conflicts);    

+    cRecMenuTimerConflicts(cTVGuideTimerConflicts *conflicts);    

     virtual ~cRecMenuTimerConflicts(void) {};

 };

 

 // --- cRecMenuTimerConflict  ---------------------------------------------------------

 class cRecMenuTimerConflict: public cRecMenu {

 private:

-    TVGuideTimerConflict conflict;

+    cTVGuideTimerConflict *conflict;

 public:

-    cRecMenuTimerConflict(TVGuideTimerConflict conflict);

+    cRecMenuTimerConflict(cTVGuideTimerConflict *conflict);

     cRecMenuItem *GetMenuItem(int number);

     int GetTotalNumMenuItems(void);

     virtual ~cRecMenuTimerConflict(void) {};

@@ -73,6 +73,34 @@ public:
     virtual ~cRecMenuNoTimerConflict(void) {};

 };

 

+// --- cRecMenuRerunResults  ---------------------------------------------------------

+class cRecMenuRerunResults: public cRecMenu {

+private:

+    const cEvent **reruns;

+    int numReruns;

+public:

+    cRecMenuRerunResults(const cEvent *original, const cEvent **reruns, int numReruns);

+    cRecMenuItem *GetMenuItem(int number);

+    int GetTotalNumMenuItems(void);

+    virtual ~cRecMenuRerunResults(void) {

+        delete[] reruns;

+    };

+};

+

+// --- cRecMenuNoRerunsFound  ---------------------------------------------------------

+class cRecMenuNoRerunsFound: public cRecMenu {

+public:

+    cRecMenuNoRerunsFound(cString searchString);

+    virtual ~cRecMenuNoRerunsFound(void) {};

+};

+

+// --- cRecMenuConfirmRerunUsed  ---------------------------------------------------------

+class cRecMenuConfirmRerunUsed: public cRecMenu {

+public:

+    cRecMenuConfirmRerunUsed(const cEvent *original, const cEvent *replace);

+    virtual ~cRecMenuConfirmRerunUsed(void) {};

+};

+

 // --- cRecMenuEditTimer  ---------------------------------------------------------

 class cRecMenuEditTimer: public cRecMenu {

 public:

@@ -229,8 +257,6 @@ public:
     virtual ~cRecMenuSearchNothingFound(void) {};

 };

 

-

-

 // --- cRecMenuRecordingSearch  ---------------------------------------------------------

 class cRecMenuRecordingSearch: public cRecMenu {

 private: