2005-11-19: Version 1.1-cvs_ext-0.2 (vdr-text2skin-1.1-cvs_ext-0.2.diff)

- removed the previously introduced tokens NextTimerName, NextTimerStart,
  NextTimerChannel, CurrentRecordingsCount and added tokens for the next
  3 timers: CurrentEventsTitle[123], CurrentEventsStartDateTime[123],
  CurrentEventsStopDateTime[123], CurrentEventsChannelNumber[123],
  CurrentEventsChannelName[123], CurrentEventsIsRecording[123]
- added audio- and video-tokens:
  PresentLanguageCode, PresentLanguageDescription, PresentVideoAR and
  implemented the missing code for the Language-token
- added tokens for replay:
  ReplayName, ReplayDateTime, ReplayShortText, ReplayDescription,
  ReplayLanguageCode, ReplayLanguageDescription, ReplayVideoAR
  (not activated yet)
- additional recording-tokens:
  RecordingVideoAR, RecordingSize
- added a reset for scrolling text (configurable)
- included Text2skin.diff from the rotor-plugin

1 files changed, 26 insertions, 0 deletions

diff --git a/status.h b/status.h
index 0aacd70..92c06de 100644
--- a/status.h
+++ b/status.h
@@ -27,21 +27,47 @@ public:
 	typedef std::string tRecordingInfo;
 	typedef std::vector<tRecordingInfo> tRecordings;
 
+	struct tEvent
+	{
+		std::string    title;
+		bool           isRecording;
+		std::string    channelName;
+		int            channelNumber;
+		time_t         startTime;
+		time_t         stopTime;
+		int            priority;
+		
+		bool tEvent::operator< (const tEvent &b) const
+		{
+			int r = startTime - b.startTime;
+			r = r == 0 ? b.priority - priority : r;
+			return r > 0 ? true : false;
+		};
+	};
+	
+	typedef std::vector<tEvent> tEvents;
+	
 private:
+	void UpdateEvents(void);
+	
 	cText2SkinRender *mRender;
 	eReplayMode       mReplayMode;
 	bool              mReplayIsLoop;
 	bool              mReplayIsShuffle;
 	tRecordings       mRecordings;
+	tEvents           mEvents;
+	const cRecording *mReplay;
 	cMutex            mRecordingsLock;
 	uint              mCurrentRecording;
 	uint              mNextRecording;
 	int               mLastLanguage;
+	bool              mTimerConflict;
 
 protected:
 	virtual void Replaying(const cControl *Control, const char *Name);
 	virtual void Recording(const cDevice *Device, const char *Name);
 	virtual void OsdClear(void);
+	virtual void OsdCurrentItem(const char *Text);
 
 public:
 	cText2SkinStatus(void);