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

added noteq compare type for conditions

Browse Source
This commit is contained in:
louis 2016-07-22 15:36:25 +02:00
parent a79af20c34
commit 54c385ca11
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
coreengine/complextypes.c
View File

@ -177,7 +177,7 @@ bool cCondition::True(void) {
} }
} }
} }
else if (c->type == eCondType::lowerInt || c->type == eCondType::equalInt || c->type == eCondType::greaterInt) else if (c->type == eCondType::lowerInt || c->type == eCondType::equalInt || c->type == eCondType::notequalInt || c->type == eCondType::greaterInt)
{ {
if (c->tokenType == eCondTokenType::inttoken) { if (c->tokenType == eCondTokenType::inttoken) {
int tokenVal = tokenContainer->IntToken(c->tokenIndex); int tokenVal = tokenContainer->IntToken(c->tokenIndex);
@ -185,6 +185,8 @@ bool cCondition::True(void) {
condTrue = (tokenVal < c->compareValue) ? true : false; condTrue = (tokenVal < c->compareValue) ? true : false;
else if (c->type == eCondType::equalInt) else if (c->type == eCondType::equalInt)
condTrue = (tokenVal == c->compareValue) ? true : false; condTrue = (tokenVal == c->compareValue) ? true : false;
else if (c->type == eCondType::notequalInt)
condTrue = (tokenVal != c->compareValue) ? true : false;
else if (c->type == eCondType::greaterInt) else if (c->type == eCondType::greaterInt)
condTrue = (tokenVal > c->compareValue) ? true : false; condTrue = (tokenVal > c->compareValue) ? true : false;
} else if (c->tokenType == eCondTokenType::stringtoken) { } else if (c->tokenType == eCondTokenType::stringtoken) {
@ -195,6 +197,8 @@ bool cCondition::True(void) {
condTrue = (intVal < c->compareValue) ? true : false; condTrue = (intVal < c->compareValue) ? true : false;
else if (c->type == eCondType::equalInt) else if (c->type == eCondType::equalInt)
condTrue = (intVal == c->compareValue) ? true : false; condTrue = (intVal == c->compareValue) ? true : false;
else if (c->type == eCondType::notequalInt)
condTrue = (intVal != c->compareValue) ? true : false;
else if (c->type == eCondType::greaterInt) else if (c->type == eCondType::greaterInt)
condTrue = (intVal > c->compareValue) ? true : false; condTrue = (intVal > c->compareValue) ? true : false;
} }
@ -207,6 +211,8 @@ bool cCondition::True(void) {
condTrue = (intVal < c->compareValue) ? true : false; condTrue = (intVal < c->compareValue) ? true : false;
else if (c->type == eCondType::equalInt) else if (c->type == eCondType::equalInt)
condTrue = (intVal == c->compareValue) ? true : false; condTrue = (intVal == c->compareValue) ? true : false;
else if (c->type == eCondType::notequalInt)
condTrue = (intVal != c->compareValue) ? true : false;
else if (c->type == eCondType::greaterInt) else if (c->type == eCondType::greaterInt)
condTrue = (intVal > c->compareValue) ? true : false; condTrue = (intVal > c->compareValue) ? true : false;
} }
@ -308,6 +314,8 @@ void cCondition::Tokenize(void) {
type = eCondType::lowerInt; type = eCondType::lowerInt;
} else if (startswith(cond, "eq({") && endswith(cond, ")")) { } else if (startswith(cond, "eq({") && endswith(cond, ")")) {
type = eCondType::equalInt; type = eCondType::equalInt;
} else if (startswith(cond, "noteq({") && endswith(cond, ")")) {
type = eCondType::notequalInt;
} else if (startswith(cond, "gt({") && endswith(cond, ")")) { } else if (startswith(cond, "gt({") && endswith(cond, ")")) {
type = eCondType::greaterInt; type = eCondType::greaterInt;
} else if (startswith(cond, "isset{") && endswith(cond, "}")) { } else if (startswith(cond, "isset{") && endswith(cond, "}")) {
@ -349,6 +357,7 @@ void cCondition::PrepareTokens(void) {
break; break;
case eCondType::lowerInt: case eCondType::lowerInt:
case eCondType::equalInt: case eCondType::equalInt:
case eCondType::notequalInt:
case eCondType::greaterInt: case eCondType::greaterInt:
SetIntegerCond(c); SetIntegerCond(c);
break; break;
@ -409,6 +418,8 @@ void cCondition::SetIntegerCond(cCond *c) {
c->isTrue = true; c->isTrue = true;
else if (c->type == eCondType::equalInt && result == c->compareValue) else if (c->type == eCondType::equalInt && result == c->compareValue)
c->isTrue = true; c->isTrue = true;
else if (c->type == eCondType::notequalInt && result != c->compareValue)
c->isTrue = true;
else if (c->type == eCondType::greaterInt && result > c->compareValue) else if (c->type == eCondType::greaterInt && result > c->compareValue)
c->isTrue = true; c->isTrue = true;
return; return;

1
coreengine/complextypes.h
View File

@ -32,6 +32,7 @@ enum class eCondType {
negtoken, negtoken,
lowerInt, lowerInt,
equalInt, equalInt,
notequalInt,
greaterInt, greaterInt,
isset, isset,
empty, empty,