diff options
| author | lado <herrlado@gmail.com> | 2014-01-21 23:59:11 +0100 |
|---|---|---|
| committer | lado <herrlado@gmail.com> | 2014-01-22 01:40:12 +0100 |
| commit | 0df0579cdd76d9aa97620581c43031da85ef0570 (patch) | |
| tree | 940a9be298ce98ebe902391192fd5d27b4def003 /vdr-vdrmanager | |
| parent | 8ffa53b6eb634defd45a8af9aa11e5687f689fce (diff) | |
| download | vdr-manager-0df0579cdd76d9aa97620581c43031da85ef0570.tar.gz vdr-manager-0df0579cdd76d9aa97620581c43031da85ef0570.tar.bz2 | |
VPS in Timer too
Diffstat (limited to 'vdr-vdrmanager')
| -rw-r--r-- | vdr-vdrmanager/helpers.cpp | 11 | ||||
| -rw-r--r-- | vdr-vdrmanager/sock.cpp | 2 |
2 files changed, 10 insertions, 3 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>()); } diff --git a/vdr-vdrmanager/sock.cpp b/vdr-vdrmanager/sock.cpp index a860b53..1d1d907 100644 --- a/vdr-vdrmanager/sock.cpp +++ b/vdr-vdrmanager/sock.cpp @@ -350,5 +350,5 @@ void cVdrmanagerClientSocket::Compress() { sendsize = compressor.getDataSize(); double ratio = 1.0 * writebuf.length() / sendsize; - isyslog("Compression stats: raw %ld, compressed %ld, ratio %f:1", writebuf.length(), sendsize, ratio); + dsyslog("[vdrmanager] Compression stats: raw %ld, compressed %ld, ratio %f:1", writebuf.length(), sendsize, ratio); } |