frodovdr/vdr-plugin-skindesigner
1
0
Fork 0
mirror of https://projects.vdr-developer.org/git/vdr-plugin-skindesigner.git synced 2023-10-19 15:58:31 +00:00
Code Issues Releases Wiki Activity

changed handling of channel logos, width and height are now mandatory

Browse Source
This commit is contained in:
louis
2014-11-21 19:19:59 +01:00
parent e7abb8557e
commit a34a824527
21 changed files with 26 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libtemplate/templatefunction.c
View File

@@ -305,24 +305,6 @@ bool cTemplateFunction::ReCalculateParameters(void) {
void cTemplateFunction::CompleteParameters(void) {
switch (type) {
case ftDrawImage: {
//Calculate img size
if ((GetNumericParameter(ptImageType) == itChannelLogo)||(GetNumericParameter(ptImageType) == itSepLogo)) {
int logoWidthOrig = config.logoWidth;
int logoHeightOrig = config.logoHeight;
int logoWidth = GetNumericParameter(ptWidth);
int logoHeight = GetNumericParameter(ptHeight);
if (logoWidth <= 0 && logoHeight <= 0)
break;
if (logoWidth <= 0 && logoHeightOrig > 0) {
logoWidth = logoHeight * logoWidthOrig / logoHeightOrig;
numericParameters.erase(ptWidth);
numericParameters.insert(pair<eParamType,int>(ptWidth, logoWidth));
} else if (logoHeight <= 0 && logoWidthOrig > 0) {
logoHeight = logoWidth * logoHeightOrig / logoWidthOrig;
numericParameters.erase(ptHeight);
numericParameters.insert(pair<eParamType,int>(ptHeight, logoHeight));
}
}
CalculateAlign(GetNumericParameter(ptWidth), GetNumericParameter(ptHeight));
if (imgPath.size() == 0) {
imgPath = GetParameter(ptPath);