From 66f090afdbc21750dfcfce73578b0f49d5980437 Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Thu, 21 Jan 2021 07:49:35 +0100 Subject: add isUHD to screenresolution change mechanism to detect video type using screen height instead of guessing height from width --- coreengine/viewelementsdisplaychannel.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'coreengine/viewelementsdisplaychannel.c') 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()); -- cgit v1.2.3