From 662dd62488f6f842fe5d940e986f798abe1c7691 Mon Sep 17 00:00:00 2001 From: Andreas Brugger Date: Sat, 19 Nov 2005 12:00:00 +0100 Subject: 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 --- status.h | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'status.h') 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 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 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); -- cgit v1.2.3 From bb39010021b5fd8a1046200839c678afc76227d5 Mon Sep 17 00:00:00 2001 From: Andreas Brugger Date: Sun, 11 Dec 2005 12:00:00 +0100 Subject: 2005-12-11: Version 1.1-cvs_ext-0.3 (vdr-text2skin-1.1-cvs_ext-0.3.diff) - added recording-tokens: RecordingLength, RecordingCuttedLength --- status.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'status.h') diff --git a/status.h b/status.h index 92c06de..7527aaa 100644 --- a/status.h +++ b/status.h @@ -5,8 +5,14 @@ #ifndef VDR_TEXT2SKIN_STATUS_H #define VDR_TEXT2SKIN_STATUS_H +#ifndef __STL_CONFIG_H +#define __STL_CONFIG_H +#endif + #include "common.h" #include +#include +#include class cText2SkinRender; -- cgit v1.2.3 From eb6eaf285edd82c212810f066313f93dc4a8a129 Mon Sep 17 00:00:00 2001 From: Andreas Brugger Date: Sat, 7 Jan 2006 12:00:00 +0100 Subject: 2006-01-07: Version 1.1-cvs_ext-0.5 (vdr-text2skin-1.1-cvs_ext-0.5.diff) - modifications to compile with vdr-versions >= 1.3.18 - added tokens: OsdWidth, OsdHeight - activating the token ReplayVideoAR --- status.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'status.h') diff --git a/status.h b/status.h index 7527aaa..a39d680 100644 --- a/status.h +++ b/status.h @@ -5,14 +5,11 @@ #ifndef VDR_TEXT2SKIN_STATUS_H #define VDR_TEXT2SKIN_STATUS_H -#ifndef __STL_CONFIG_H -#define __STL_CONFIG_H -#endif - -#include "common.h" -#include #include #include +#include "common.h" +#include + class cText2SkinRender; -- cgit v1.2.3 From c1bf83aec2961a4e84dbc1c36042bd985f044a91 Mon Sep 17 00:00:00 2001 From: Andreas Brugger Date: Sat, 4 Feb 2006 11:49:02 +0100 Subject: 2006-02-04: Version 1.1-cvs_ext-0.7 (vdr-text2skin-1.1-cvs_ext-0.7.diff) - changed the routines to determine the next timers - added the possibility to have a scrollbar in every menu - not fully implemented yet (to position in menu-lists is not necessarily correct, if there are more items with the same osd-text) --- status.h | 43 ++++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-) (limited to 'status.h') diff --git a/status.h b/status.h index 2047595..8bd0f96 100644 --- a/status.h +++ b/status.h @@ -5,8 +5,6 @@ #ifndef VDR_TEXT2SKIN_STATUS_H #define VDR_TEXT2SKIN_STATUS_H -#include -#include #include "common.h" #include @@ -30,22 +28,32 @@ public: typedef std::string tRecordingInfo; typedef std::vector tRecordings; - struct tEvent + struct tEvent : public cListObject { - std::string title; - bool isRecording; - std::string channelName; - int channelNumber; - time_t startTime; - time_t stopTime; - int priority; + time_t startTime; + time_t stopTime; + int channelNumber; + std::string channelName; + int priority; + bool isRecording; + std::string title; - bool tEvent::operator< (const tEvent &b) const + tEvent(cTimer *timer) : + startTime(timer->StartTime()), + stopTime(timer->StopTime()), + channelNumber(timer->Channel()->Number()), + channelName(timer->Channel()->Name()), + priority(timer->Priority()), + isRecording(timer->Recording()), + title(timer->File()) {} + + virtual int Compare(const cListObject &listObj) const { - int r = startTime - b.startTime; - r = r == 0 ? b.priority - priority : r; - return r > 0 ? true : false; - }; + tEvent *e = (tEvent *)&listObj; + int r = startTime - e->startTime; + if (r == 0) r = e->priority - priority; + return r; + } }; typedef std::vector tEvents; @@ -58,8 +66,8 @@ private: bool mReplayIsLoop; bool mReplayIsShuffle; tRecordings mRecordings; - tEvents mEvents; const cRecording *mReplay; + cList mEvents; cMutex mRecordingsLock; uint mCurrentRecording; uint mNextRecording; @@ -76,7 +84,8 @@ protected: #endif virtual void OsdClear(void); virtual void OsdCurrentItem(const char *Text); - + virtual void OsdItem(const char *Text, int Index); + public: cText2SkinStatus(void); -- cgit v1.2.3 From 74a5cc8e14900d48386e33cb576f154a6dd7e557 Mon Sep 17 00:00:00 2001 From: Andreas Brugger Date: Sun, 19 Nov 2006 16:58:14 +0100 Subject: 2006-11-19: Version 1.1-cvs_ext-0.9 (vdr-text2skin-1.1-cvs_ext-0.9.diff) - added a test-feature to search for reruns of a program and add the information to the extended epg-info (trigger DEVELOPMENT_FEATURES). This uses a service-interface of the epgsearch-plugin "Epgsearch-searchresults-v1.0" - the timer-conflicts are now checked with epgsearch (service-interface "Epgsearch-lastconflictinfo-v1.0", as it works more reliable and is supported by the plugin author - the extended epg-info and the recording-info are extended by AUX-Infos (configurable) there is also an option to strip known tags - the tab-widths are scaled for taking into account that different TT-Fonts have a different width than the default font from VDR - added tokens for signal-info: FrontendSTR, FrontendSNR, FrontendHasLock, FrontendHasSignal - changed token TimerConflict to TimerConflicts - added token PresentEventID for EPG-images - added tokens for recordings: RecordingFilename, RecordingPriority, RecordingLifetime - removed Text2skin.diff from the rotor-plugin --- status.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'status.h') diff --git a/status.h b/status.h index 8bd0f96..2481a1a 100644 --- a/status.h +++ b/status.h @@ -72,7 +72,7 @@ private: uint mCurrentRecording; uint mNextRecording; int mLastLanguage; - bool mTimerConflict; + int mTimerConflicts; protected: #if VDRVERSNUM >= 10338 -- cgit v1.2.3