diff options
Diffstat (limited to 'status.h')
| -rw-r--r-- | status.h | 34 |
1 files changed, 15 insertions, 19 deletions
@@ -8,7 +8,6 @@ #include "common.h" #include <vdr/status.h> - class cText2SkinRender; class cText2SkinStatus: public cStatus { @@ -28,8 +27,7 @@ public: typedef std::string tRecordingInfo; typedef std::vector<tRecordingInfo> tRecordings; - struct tEvent : public cListObject - { + struct tEvent : public cListObject { time_t startTime; time_t stopTime; int channelNumber; @@ -37,7 +35,7 @@ public: int priority; bool isRecording; std::string title; - + tEvent(cTimer *timer) : startTime(timer->StartTime()), stopTime(timer->StopTime()), @@ -46,21 +44,21 @@ public: priority(timer->Priority()), isRecording(timer->Recording()), title(timer->File()) {} - - virtual int Compare(const cListObject &listObj) const - { + + virtual int Compare(const cListObject &listObj) const { tEvent *e = (tEvent *)&listObj; int r = startTime - e->startTime; - if (r == 0) r = e->priority - priority; + if (r == 0) + r = e->priority - priority; return r; } }; - + typedef std::vector<tEvent> tEvents; - + private: void UpdateEvents(void); - + cText2SkinRender *mRender; eReplayMode mReplayMode; bool mReplayIsLoop; @@ -75,17 +73,15 @@ private: int mTimerConflicts; protected: -#if VDRVERSNUM >= 10338 - virtual void Replaying(const cControl *Control, const char *Name, const char *FileName, bool On); - virtual void Recording(const cDevice *Device, const char *Name, const char *FileName, bool On); -#else - virtual void Replaying(const cControl *Control, const char *Name); - virtual void Recording(const cDevice *Device, const char *Name); -#endif + virtual void Replaying(const cControl *Control, const char *Name, + const char *FileName, bool On); + virtual void Recording(const cDevice *Device, const char *Name, + const char *FileName, bool On); virtual void OsdClear(void); + virtual void OsdCurrentItem(const char *Text); virtual void OsdItem(const char *Text, int Index); - + public: cText2SkinStatus(void); |