summaryrefslogtreecommitdiff
path: root/vdr-vdrmanager/helpers.cpp
diff options
context:
space:
mode:
authorlado <herrlado@gmail.com>2014-01-21 23:59:11 +0100
committerlado <herrlado@gmail.com>2014-01-22 01:40:12 +0100
commit0df0579cdd76d9aa97620581c43031da85ef0570 (patch)
tree940a9be298ce98ebe902391192fd5d27b4def003 /vdr-vdrmanager/helpers.cpp
parent8ffa53b6eb634defd45a8af9aa11e5687f689fce (diff)
downloadvdr-manager-0df0579cdd76d9aa97620581c43031da85ef0570.tar.gz
vdr-manager-0df0579cdd76d9aa97620581c43031da85ef0570.tar.bz2
VPS in Timer too
Diffstat (limited to 'vdr-vdrmanager/helpers.cpp')
-rw-r--r--vdr-vdrmanager/helpers.cpp11
1 files changed, 9 insertions, 2 deletions
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<string> 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<string> 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<string>());
}