diff options
| author | kamel5 <vdr.kamel5 (at) gmx (dot) net> | 2021-01-21 11:56:01 +0100 |
|---|---|---|
| committer | kamel5 <vdr.kamel5 (at) gmx (dot) net> | 2021-01-21 11:56:01 +0100 |
| commit | a4d51d31de2f032b4edac60c5edaeac3c021448e (patch) | |
| tree | 1409c39d3645fabfb3328f5e0084e97921a05140 /coreengine/viewelementsdisplaychannel.c | |
| parent | ddf861d6f630dd4db3e69395a68ad89af776e47f (diff) | |
| parent | 66f090afdbc21750dfcfce73578b0f49d5980437 (diff) | |
| download | vdr-plugin-skindesigner-a4d51d31de2f032b4edac60c5edaeac3c021448e.tar.gz vdr-plugin-skindesigner-a4d51d31de2f032b4edac60c5edaeac3c021448e.tar.bz2 | |
Merge branch 'pbiering/skindesigner-add-isUHD-to-screenresolution'
Diffstat (limited to 'coreengine/viewelementsdisplaychannel.c')
| -rw-r--r-- | coreengine/viewelementsdisplaychannel.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/coreengine/viewelementsdisplaychannel.c b/coreengine/viewelementsdisplaychannel.c index 7f2d4fa..4b71970 100644 --- a/coreengine/viewelementsdisplaychannel.c +++ b/coreengine/viewelementsdisplaychannel.c @@ -453,6 +453,7 @@ void cVeDcScreenResolution::SetTokenContainer(void) { tokenContainer->DefineIntToken("{screenwidth}", (int)eDCScreenResolutionIT::screenwidth); tokenContainer->DefineIntToken("{screenheight}", (int)eDCScreenResolutionIT::screenheight); tokenContainer->DefineIntToken("{isHD}", (int)eDCScreenResolutionIT::isHD); + tokenContainer->DefineIntToken("{isUHD}", (int)eDCScreenResolutionIT::isUHD); tokenContainer->DefineIntToken("{isWideScreen}", (int)eDCScreenResolutionIT::isWideScreen); InheritTokenContainer(); } @@ -478,7 +479,8 @@ bool cVeDcScreenResolution::Parse(bool forced) { SetDirty(); bool isHD = false; - string resName = GetScreenResolutionString(screenWidth, screenHeight, &isHD); + bool isUHD = false; + string resName = GetScreenResolutionString(screenWidth, screenHeight, &isHD, &isUHD); bool isWideScreen = false; string aspectName = GetScreenAspectString(aspect, &isWideScreen); @@ -487,6 +489,7 @@ bool cVeDcScreenResolution::Parse(bool forced) { tokenContainer->AddIntToken((int)eDCScreenResolutionIT::screenwidth, screenWidth); tokenContainer->AddIntToken((int)eDCScreenResolutionIT::screenheight, screenHeight); tokenContainer->AddIntToken((int)eDCScreenResolutionIT::isHD, isHD); + tokenContainer->AddIntToken((int)eDCScreenResolutionIT::isUHD, isUHD); tokenContainer->AddIntToken((int)eDCScreenResolutionIT::isWideScreen, isWideScreen); tokenContainer->AddStringToken((int)eDCScreenResolutionST::resolution, resName.c_str()); tokenContainer->AddStringToken((int)eDCScreenResolutionST::aspect, aspectName.c_str()); |