Added display of Timer Conflicts with epgsearch in Main Menu

1 files changed, 4 insertions, 0 deletions

diff --git a/timers.h b/timers.h
index 197722f..423b4f8 100644
--- a/timers.h
+++ b/timers.h
@@ -7,6 +7,8 @@ class cNopacityTimer : public cListObject {
         cPixmap *pixmap;

         cPixmap *pixmapLogo;

         const cTimer *timer;

+        int numConflicts;

+        bool isTimerConflict;

         const cFont *font;

         const cFont *fontLarge;

         int width;

@@ -17,10 +19,12 @@ class cNopacityTimer : public cListObject {
         void DrawLogo(void);

     public:

         cNopacityTimer(cOsd *osd, const cTimer *timer, const cFont *font, const cFont *fontLarge);

+        cNopacityTimer(cOsd *osd, int numConflicts, const cFont *font, const cFont *fontLarge);

         virtual ~cNopacityTimer(void);

         void SetGeometry(int width, int y);

         void CreateDate(void);

         void CreateShowName(void);

+        void CreateConflictText(void);

         void CalculateHeight(int space);

         void CreatePixmaps(int x);

         void SetAlpha(int alpha);