diff options
Diffstat (limited to 'skinconfig.c')
| -rw-r--r-- | skinconfig.c | 52 |
1 files changed, 10 insertions, 42 deletions
diff --git a/skinconfig.c b/skinconfig.c index f5ada81..d9fee5d 100644 --- a/skinconfig.c +++ b/skinconfig.c @@ -55,13 +55,9 @@ typedef enum _eTokenId tokPrivateRecordingStart, tokIsRecording, - tokIsRecording1, - tokIsRecording2, - tokIsRecording3, tokRecordings, - tokRecording1, - tokRecording2, - tokRecording3, + tokArrayRecordings, + tokNumRecordings, tokPrivateRecordingEnd, // present event @@ -214,13 +210,9 @@ static const std::string Tokens[tokCountToken] = "privateRecordingStart", "IsRecording", - "IsRecording1", - "IsRecording2", - "IsRecording3", "Recordings", - "Recording1", - "Recording2", - "Recording3", + "ArrayRecordings", + "NumRecordings", "privateRecordingEnd", "privatePresentStart", @@ -481,47 +473,23 @@ GLCD::cType cGraphLCDSkinConfig::GetToken(const GLCD::tSkinToken & Token) return mState->IsRecording(Token.Attrib.Number, 0); return mState->IsRecording(-1, 0); } - case tokIsRecording1: - { - if (Token.Attrib.Type == GLCD::aNumber) - return mState->IsRecording(Token.Attrib.Number, 1); - return mState->IsRecording(-1, 1); - } - case tokIsRecording2: - { - if (Token.Attrib.Type == GLCD::aNumber) - return mState->IsRecording(Token.Attrib.Number, 2); - return mState->IsRecording(-1, 2); - } - case tokIsRecording3: - { - if (Token.Attrib.Type == GLCD::aNumber) - return mState->IsRecording(Token.Attrib.Number, 3); - return mState->IsRecording(-1, 3); - } case tokRecordings: { if (Token.Attrib.Type == GLCD::aNumber) return mState->Recordings(Token.Attrib.Number, 0); return mState->Recordings(-1, 0); } - case tokRecording1: - { - if (Token.Attrib.Type == GLCD::aNumber) - return mState->Recordings(Token.Attrib.Number, 1); - return mState->Recordings(-1, 1); - } - case tokRecording2: + case tokArrayRecordings: { if (Token.Attrib.Type == GLCD::aNumber) - return mState->Recordings(Token.Attrib.Number, 2); - return mState->Recordings(-1, 2); + return mState->Recordings(-1, Token.Attrib.Number); + return false; } - case tokRecording3: + case tokNumRecordings: { if (Token.Attrib.Type == GLCD::aNumber) - return mState->Recordings(Token.Attrib.Number, 3); - return mState->Recordings(-1, 3); + return mState->NumRecordings(Token.Attrib.Number); + return mState->NumRecordings(-1); } default: break; |