mirror of
https://projects.vdr-developer.org/git/vdr-plugin-skindesigner.git
synced 2023-10-19 15:58:31 +00:00
add isUHD to screenresolution
change mechanism to detect video type using screen height instead of guessing height from width
This commit is contained in:
@@ -490,6 +490,7 @@ enum class eDCScreenResolutionIT {
|
||||
screenwidth = 0,
|
||||
screenheight,
|
||||
isHD,
|
||||
isUHD,
|
||||
isWideScreen,
|
||||
count
|
||||
};
|
||||
@@ -1483,6 +1484,7 @@ enum class eDRRecInfoIT {
|
||||
screenwidth = 0,
|
||||
screenheight,
|
||||
isHD,
|
||||
isUHD,
|
||||
isWideScreen,
|
||||
count
|
||||
};
|
||||
|
@@ -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());
|
||||
|
@@ -78,6 +78,7 @@ void cVeDrRecInfo::SetTokenContainer(void) {
|
||||
tokenContainer->DefineIntToken("{screenwidth}", (int)eDRRecInfoIT::screenwidth);
|
||||
tokenContainer->DefineIntToken("{screenheight}", (int)eDRRecInfoIT::screenheight);
|
||||
tokenContainer->DefineIntToken("{isHD}", (int)eDRRecInfoIT::isHD);
|
||||
tokenContainer->DefineIntToken("{isUHD}", (int)eDRRecInfoIT::isUHD);
|
||||
tokenContainer->DefineIntToken("{isWideScreen}", (int)eDRRecInfoIT::isWideScreen);
|
||||
InheritTokenContainer();
|
||||
}
|
||||
@@ -97,7 +98,8 @@ bool cVeDrRecInfo::Parse(bool force) {
|
||||
double aspect = 0;
|
||||
cDevice::PrimaryDevice()->GetVideoSize(screenWidth, screenHeight, aspect);
|
||||
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);
|
||||
|
||||
@@ -105,6 +107,7 @@ bool cVeDrRecInfo::Parse(bool force) {
|
||||
tokenContainer->AddIntToken((int)eDRRecInfoIT::screenwidth, screenWidth);
|
||||
tokenContainer->AddIntToken((int)eDRRecInfoIT::screenheight, screenHeight);
|
||||
tokenContainer->AddIntToken((int)eDRRecInfoIT::isHD, isHD);
|
||||
tokenContainer->AddIntToken((int)eDRRecInfoIT::isUHD, isUHD);
|
||||
tokenContainer->AddIntToken((int)eDRRecInfoIT::isWideScreen, isWideScreen);
|
||||
tokenContainer->AddStringToken((int)eDRRecInfoST::resolution, resName.c_str());
|
||||
tokenContainer->AddStringToken((int)eDRRecInfoST::aspect, aspectName.c_str());
|
||||
|
Reference in New Issue
Block a user