From c80bd754ac12026a71793f26822c936b58cfd603 Mon Sep 17 00:00:00 2001 From: kamel5 Date: Wed, 15 Jul 2020 18:29:29 +0200 Subject: Fixed a error with timerstart in cRecMenuItemTimelineHeader --- definitions.h | 2 -- recmenu.c | 4 +--- recmenuitem.c | 8 ++++---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/definitions.h b/definitions.h index d4cfff7..06518e3 100644 --- a/definitions.h +++ b/definitions.h @@ -492,8 +492,6 @@ enum class eRecMenuIT { timerset, channeltransponder, timelinetimer, - timerstart, - timerwidth, favorite, count }; diff --git a/recmenu.c b/recmenu.c index 8f23bc9..d2e5352 100644 --- a/recmenu.c +++ b/recmenu.c @@ -196,8 +196,6 @@ void cRecMenu::DefineTokens(eViewGridsRecMenu vg, skindesignerapi::cTokenContain tk->DefineIntToken("{timerset}", (int)eRecMenuIT::timerset); tk->DefineIntToken("{channeltransponder}", (int)eRecMenuIT::channeltransponder); tk->DefineIntToken("{timelinetimer}", (int)eRecMenuIT::timelinetimer); - tk->DefineIntToken("{timerstart}", (int)eRecMenuIT::timerstart); - tk->DefineIntToken("{timerwidth}", (int)eRecMenuIT::timerwidth); tk->DefineIntToken("{favorite}", (int)eRecMenuIT::favorite); tk->DefineStringToken("{line1}", (int)eRecMenuST::line1); tk->DefineStringToken("{line2}", (int)eRecMenuST::line2); @@ -620,4 +618,4 @@ void cRecMenu::DrawFooter(void) { active = footer; recMenuGrid->SetCurrent(footer->Id(), true); } -} \ No newline at end of file +} diff --git a/recmenuitem.c b/recmenuitem.c index 493016e..438386d 100644 --- a/recmenuitem.c +++ b/recmenuitem.c @@ -1519,10 +1519,10 @@ void cRecMenuItemTimelineTimer::SetTokens(skindesignerapi::cViewGrid *menu) { if (timerStop > secsPerDay) timerStop = secsPerDay; - int percentStart = ((double)timerStart / (double)secsPerDay) * 1000; - int percentWidth = ((double)(timerStop - timerStart) / (double)secsPerDay) * 1000; - menu->AddIntToken((int)eRecMenuIT::timerstart, percentStart); - menu->AddIntToken((int)eRecMenuIT::timerwidth, percentWidth); + int timerStartPercent = ((double)timerStart / (double)secsPerDay) * 1000; + int timerWidthPercent = ((double)(timerStop - timerStart) / (double)secsPerDay) * 1000; + menu->AddIntToken((int)eRecMenuIT::timerstartpercent, timerStartPercent); + menu->AddIntToken((int)eRecMenuIT::timerwidthpercent, timerWidthPercent); } const cTimer *cRecMenuItemTimelineTimer::GetTimer(void) { -- cgit v1.2.3