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

fixed issue with lastrecordings viewelement

Browse Source
This commit is contained in:
louis 2016-02-06 17:20:34 +01:00
parent 26f029ee76
commit 8016aa5c8f
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
coreengine/viewelementsdisplaymenu.c
View File

@ -492,6 +492,7 @@ void cVeDmCurrentschedule::ParseFromChannel(const cChannel *channel) {
if (!event) if (!event)
return; return;
tokenContainer->Clear();
tokenContainer->AddIntToken((int)eDMCurrentscheduleIT::islivetv, 1); tokenContainer->AddIntToken((int)eDMCurrentscheduleIT::islivetv, 1);
tokenContainer->AddStringToken((int)eDMCurrentscheduleST::title, event->Title()); tokenContainer->AddStringToken((int)eDMCurrentscheduleST::title, event->Title());
tokenContainer->AddStringToken((int)eDMCurrentscheduleST::subtitle, event->ShortText()); tokenContainer->AddStringToken((int)eDMCurrentscheduleST::subtitle, event->ShortText());
@ -506,6 +507,7 @@ void cVeDmCurrentschedule::ParseFromChannel(const cChannel *channel) {
} }
void cVeDmCurrentschedule::ParseFromRecording(const cRecording *recording) { void cVeDmCurrentschedule::ParseFromRecording(const cRecording *recording) {
tokenContainer->Clear();
tokenContainer->AddIntToken((int)eDMCurrentscheduleIT::islivetv, 0); tokenContainer->AddIntToken((int)eDMCurrentscheduleIT::islivetv, 0);
string recFullName = recording->Name() ? recording->Name() : ""; string recFullName = recording->Name() ? recording->Name() : "";
string recName = ""; string recName = "";
@ -627,6 +629,7 @@ bool cVeDmSystemload::Parse(bool forced) {
loadHandDec = 0; loadHandDec = 0;
loadHandValue = loadHand / 100 * 100 + loadHandDec; loadHandValue = loadHand / 100 * 100 + loadHandDec;
} }
tokenContainer->Clear();
tokenContainer->AddStringToken((int)eDMSystemloadST::load, *cString::sprintf("%.2f", systemLoad)); tokenContainer->AddStringToken((int)eDMSystemloadST::load, *cString::sprintf("%.2f", systemLoad));
tokenContainer->AddIntToken((int)eDMSystemloadIT::loadhand, loadHandValue); tokenContainer->AddIntToken((int)eDMSystemloadIT::loadhand, loadHandValue);
SetDirty(); SetDirty();
@ -670,6 +673,7 @@ bool cVeDmSystemmemory::Parse(bool forced) {
return false; return false;
} }
lastMemUsage = usedMemMB; lastMemUsage = usedMemMB;
tokenContainer->Clear();
tokenContainer->AddIntToken((int)eDMSystemmemoryIT::totalmem, totalMemMB); tokenContainer->AddIntToken((int)eDMSystemmemoryIT::totalmem, totalMemMB);
tokenContainer->AddIntToken((int)eDMSystemmemoryIT::usedmem, usedMemMB); tokenContainer->AddIntToken((int)eDMSystemmemoryIT::usedmem, usedMemMB);
if (totalMemMB > 0) if (totalMemMB > 0)
@ -737,6 +741,7 @@ bool cVeDmTemperatures::Parse(bool forced) {
lastCpuTemp = cpu; lastCpuTemp = cpu;
lastGpuTemp = gpu; lastGpuTemp = gpu;
tokenContainer->Clear();
tokenContainer->AddIntToken((int)eDMTemperaturesIT::cputemp, cpu); tokenContainer->AddIntToken((int)eDMTemperaturesIT::cputemp, cpu);
tokenContainer->AddIntToken((int)eDMTemperaturesIT::gputemp, gpu); tokenContainer->AddIntToken((int)eDMTemperaturesIT::gputemp, gpu);
SetDirty(); SetDirty();
@ -793,6 +798,7 @@ bool cVeDmVdrstatistics::Parse(bool forced) {
lastVdrCPU = vdrCPU; lastVdrCPU = vdrCPU;
lastVdrMEM = vdrMEM; lastVdrMEM = vdrMEM;
tokenContainer->Clear();
tokenContainer->AddStringToken((int)eDMVdrstatisticsST::vdrcpu, vdrCPU.c_str()); tokenContainer->AddStringToken((int)eDMVdrstatisticsST::vdrcpu, vdrCPU.c_str());
tokenContainer->AddStringToken((int)eDMVdrstatisticsST::vdrmem, vdrMEM.c_str()); tokenContainer->AddStringToken((int)eDMVdrstatisticsST::vdrmem, vdrMEM.c_str());
SetDirty(); SetDirty();
@ -828,6 +834,7 @@ bool cVeDmLastrecordings::Parse(bool forced) {
if (!cViewElement::Parse(forced)) if (!cViewElement::Parse(forced))
return false; return false;
tokenContainer->Clear();
cGlobalSortedTimers SortedTimers;// local and remote timers cGlobalSortedTimers SortedTimers;// local and remote timers
int numTimers = SortedTimers.Size(); int numTimers = SortedTimers.Size();
//set number of timers so that it is possible to adapt this viewelement accordingly //set number of timers so that it is possible to adapt this viewelement accordingly