From 5bb69c2a347901c7d9a4c1756c1bcf9ca652e43d Mon Sep 17 00:00:00 2001 From: louis Date: Wed, 29 Jul 2015 22:44:55 +0200 Subject: added {watched} and {percentseen} to displaymenurecordings current view --- views/displaymenuitemcurrentview.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) (limited to 'views') diff --git a/views/displaymenuitemcurrentview.c b/views/displaymenuitemcurrentview.c index 357543e..1b8d09e 100644 --- a/views/displaymenuitemcurrentview.c +++ b/views/displaymenuitemcurrentview.c @@ -512,10 +512,34 @@ bool cDisplayMenuItemCurrentRecordingView::Render(void) { stringTokens.insert(pair("name", buffer.c_str())); intTokens.insert(pair("new", usedRecording->IsNew())); + int percSeen = 0; +#if APIVERSNUM < 20108 + percSeen = -1; +#else + percSeen = 0; + int framesSeen = usedRecording->GetResume(); + int framesTotal = usedRecording->NumFrames(); + if (framesTotal > 0) { + percSeen = (double)framesSeen / (double)framesTotal * 100; + } +#endif + intTokens.insert(pair("percentseen", percSeen)); intTokens.insert(pair("newrecordingsfolder", newRecs)); intTokens.insert(pair("numrecordingsfolder", total)); intTokens.insert(pair("cutted", usedRecording->IsEdited())); - + int recDuration = usedRecording->LengthInSeconds(); + bool watched = false; + if (usedRecording->IsEdited()) { + if (percSeen >= 85) + watched = true; + } else { + int watchedLimit = recDuration * 85 / 100 - (Setup.MarginStop + 5)*60; + int watchedTime = percSeen * recDuration / 100; + if (watchedLimit > 0 && watchedTime > 0 && (watchedTime > watchedLimit)) + watched = true; + } + intTokens.insert(pair("watched", watched)); + SetScraperPoster(NULL, usedRecording); @@ -578,7 +602,6 @@ bool cDisplayMenuItemCurrentRecordingView::Render(void) { intTokens.insert(pair("month", sStartTime->tm_mon+1)); int duration = event->Duration() / 60; - int recDuration = usedRecording->LengthInSeconds(); recDuration = (recDuration>0)?(recDuration / 60):0; stringTokens.insert(pair("date", recDate.c_str())); stringTokens.insert(pair("time", recTime.c_str())); -- cgit v1.2.3