diff -crB --exclude .git --exclude .project vdr-plugin-text2skin.git/Docs/Reference.txt vdr-plugin-text2skin/Docs/Reference.txt *** vdr-plugin-text2skin.git/Docs/Reference.txt 2010-11-24 17:49:30.000000000 +0100 --- vdr-plugin-text2skin/Docs/Reference.txt 2010-11-24 17:56:28.000000000 +0100 *************** *** 610,615 **** --- 610,619 ---- | FreeDiskSpace | | Remaining free disk space in MB | | | Attribute: return as formatted time. ----------------------------------------------------------------------------- + | UsedDiskSpace | | Used disk space in MB + ----------------------------------------------------------------------------- + | TotalDiskSpace | | Total disk space in MB + ----------------------------------------------------------------------------- | CanScrollUp | | True, if scrollable text can be scrolled up ----------------------------------------------------------------------------- | CanScrollDown | | True, if scrollable text can be scrolled down *************** *** 1081,1087 **** ------ True, if the first parameter is less or equal than the second. ! gt({FreeDiskSpace},5000) 3.10 file --------- --- 1085,1091 ---- ------ True, if the first parameter is less or equal than the second. ! le({FreeDiskSpace},5000) 3.10 file --------- diff -crB --exclude .git --exclude .project vdr-plugin-text2skin.git/display.c vdr-plugin-text2skin/display.c *** vdr-plugin-text2skin.git/display.c 2010-11-24 17:55:28.000000000 +0100 --- vdr-plugin-text2skin/display.c 2010-11-24 17:55:17.000000000 +0100 *************** *** 242,247 **** --- 242,271 ---- } return false; + case tVideoSizeWidth: { + #if VDRVERSNUM >= 10707 + int width, height; + double aspect; + cDevice *dev = cDevice::PrimaryDevice(); + dev->GetVideoSize(width, height, aspect); + return (cxType)width; + #else + return 0; + #endif + } + + case tVideoSizeHeight: { + #if VDRVERSNUM >= 10707 + int width, height; + double aspect; + cDevice *dev = cDevice::PrimaryDevice(); + dev->GetVideoSize(width, height, aspect); + return (cxType)height; + #else + return 0; + #endif + } + case tHasTeletext: case tChannelHasTeletext: return mChannel != NULL && mChannel->Tpid() != 0; diff -crB --exclude .git --exclude .project vdr-plugin-text2skin.git/render.c vdr-plugin-text2skin/render.c *** vdr-plugin-text2skin.git/render.c 2010-11-24 17:49:30.000000000 +0100 --- vdr-plugin-text2skin/render.c 2010-11-24 17:59:40.000000000 +0100 *************** *** 819,824 **** --- 819,836 ---- : (cxType)FreeMB; } + case tUsedDiskSpace: { + int FreeMB, UsedMB; + VideoDiskSpace(&FreeMB, &UsedMB); + return (cxType)UsedMB; + } + + case tTotalDiskSpace: { + int FreeMB, UsedMB; + VideoDiskSpace(&FreeMB, &UsedMB); + return (cxType)FreeMB+UsedMB; + } + case tDateTime: return TimeType(time(NULL), Token.Attrib.Text); case tCanScrollUp: diff -crB --exclude .git --exclude .project vdr-plugin-text2skin.git/xml/string.c vdr-plugin-text2skin/xml/string.c *** vdr-plugin-text2skin.git/xml/string.c 2010-11-24 17:49:30.000000000 +0100 --- vdr-plugin-text2skin/xml/string.c 2010-11-24 18:01:57.000000000 +0100 *************** *** 2,8 **** #include "render.h" static const char *Tokens[__COUNT_TOKEN__] = { ! "DateTime", "FreeDiskSpace", "AudioTrack", "AudioChannel", // Channel Display "ChannelNumber", "ChannelName", "ChannelShortName", "ChannelBouquet", "ChannelPortal", --- 2,8 ---- #include "render.h" static const char *Tokens[__COUNT_TOKEN__] = { ! "DateTime", "FreeDiskSpace", "UsedDiskSpace", "TotalDiskSpace", "VideoSizeWidth", "VideoSizeHeight", "AudioTrack", "AudioChannel", // Channel Display "ChannelNumber", "ChannelName", "ChannelShortName", "ChannelBouquet", "ChannelPortal", diff -crB --exclude .git --exclude .project vdr-plugin-text2skin.git/xml/string.h vdr-plugin-text2skin/xml/string.h *** vdr-plugin-text2skin.git/xml/string.h 2010-11-24 17:49:30.000000000 +0100 --- vdr-plugin-text2skin/xml/string.h 2010-11-24 18:01:59.000000000 +0100 *************** *** 8,13 **** --- 8,17 ---- enum exToken { tDateTime, tFreeDiskSpace, + tUsedDiskSpace, + tTotalDiskSpace, + tVideoSizeWidth, + tVideoSizeHeight, tAudioTrack, tAudioChannel,