From a96ef369124640874361cf108c47d3e5705df5cc Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Fri, 5 Feb 2021 06:15:18 +0100 Subject: remove leftover from replaced IsRecordingX --- skinconfig.c | 4 ++-- state.c | 20 +------------------- state.h | 2 +- 3 files changed, 4 insertions(+), 22 deletions(-) diff --git a/skinconfig.c b/skinconfig.c index c0bb222..b6a27ef 100644 --- a/skinconfig.c +++ b/skinconfig.c @@ -470,8 +470,8 @@ GLCD::cType cGraphLCDSkinConfig::GetToken(const GLCD::tSkinToken & Token) case tokIsRecording: { if (Token.Attrib.Type == GLCD::aNumber) - return mState->IsRecording(Token.Attrib.Number, 0); - return mState->IsRecording(-1, 0); + return mState->IsRecording(Token.Attrib.Number); + return mState->IsRecording(-1); } case tokRecordings: { diff --git a/state.c b/state.c index 6045a03..b6cc093 100644 --- a/state.c +++ b/state.c @@ -872,24 +872,15 @@ tReplayState cGraphLCDState::GetReplayState() return ret; } -bool cGraphLCDState::IsRecording(int CardNumber, int selector) +bool cGraphLCDState::IsRecording(int CardNumber) { bool ret = false; std::vector ::iterator it; - int count = 0; mutex.Lock(); - // dsyslog("%s/%s: called CardNumber=%d selector=%d mRecordings.size=%lu", PLUGIN_NAME_I18N, __FUNCTION__, CardNumber, selector, mRecordings.size()); if (CardNumber == -1 && mRecordings.size() > 0) { - if (selector > 0) { - if (mRecordings.size() >= (long unsigned int) selector) { - // dsyslog("%s/%s: selector hit CardNumber=%d selector=%d mRecordings.size=%lu", PLUGIN_NAME_I18N, __FUNCTION__, CardNumber, selector, mRecordings.size()); - ret = true; - } - } else { ret = true; - } } else { @@ -898,17 +889,8 @@ bool cGraphLCDState::IsRecording(int CardNumber, int selector) { if (it->deviceNumber == CardNumber) { - count++; - if (selector > 0) { - if (count == selector) { - // dsyslog("%s/%s: selector hit CardNumber=%d selector=%d count=%d", PLUGIN_NAME_I18N, __FUNCTION__, CardNumber, selector, count); - ret = true; - break; - } - } else { ret = true; break; - } } it++; } diff --git a/state.h b/state.h index 0198029..4c74ee3 100644 --- a/state.h +++ b/state.h @@ -158,7 +158,7 @@ public: tEvent GetPresentEvent(); tEvent GetFollowingEvent(); tReplayState GetReplayState(); - bool IsRecording(int CardNumber, int selector); + bool IsRecording(int CardNumber); std::string Recordings(int CardNumber, int selector); int NumRecordings(int CardNumber); tOsdState GetOsdState(); -- cgit v1.2.3