From 0df0579cdd76d9aa97620581c43031da85ef0570 Mon Sep 17 00:00:00 2001 From: lado Date: Tue, 21 Jan 2014 23:59:11 +0100 Subject: VPS in Timer too --- vdr-vdrmanager/helpers.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'vdr-vdrmanager/helpers.cpp') diff --git a/vdr-vdrmanager/helpers.cpp b/vdr-vdrmanager/helpers.cpp index faef7ef..556814d 100644 --- a/vdr-vdrmanager/helpers.cpp +++ b/vdr-vdrmanager/helpers.cpp @@ -803,8 +803,8 @@ string cHelpers::ToText(cTimer * timer, set conflicts) { result += ":"; result += MapSpecialChars(timer->Aux() ? timer->Aux() : ""); const cEvent * event = timer->Event(); - dsyslog("[vdrmanager] timer's event is NULL. Try find it"); if (!event) { + dsyslog("[vdrmanager] timer's event is NULL. Try find it"); cChannel * channel = Channels.GetByChannelID( timer->Channel()->GetChannelID()); if (channel) { @@ -857,6 +857,12 @@ string cHelpers::ToText(cTimer * timer, set conflicts) { } } + result += ":"; + if (event && event->Vps()) { + snprintf(buf, sizeof(buf) - 1, "%lu", event->Vps()); + result += buf; + } + result += "\r\n"; return result; @@ -870,7 +876,6 @@ string cHelpers::ToText(const cEvent * event) { // search assigned timer //eTimerMatch TimerMatch = tmNone; - cTimer * eventTimer = Timers.GetMatch(event); // if(eventTimer){ // @@ -928,6 +933,8 @@ string cHelpers::ToText(const cEvent * event) { result += "\r\n"; + cTimer * eventTimer = Timers.GetMatch(event); + if (eventTimer) { result += ToText(eventTimer, set()); } -- cgit v1.2.3