frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed not logging changes for channels that have no number

Browse Source
This commit is contained in:
Klaus Schmidinger 2009-08-30 11:32:39 +02:00
parent 0709d357ce
commit c9a27b09af
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CONTRIBUTORS
View File

@ -2490,3 +2490,7 @@ Martin Neuditschko <yosuke.tomoe@gmx.net>
Mikko Tuumanen <mikko.tuumanen@utu.fi> Mikko Tuumanen <mikko.tuumanen@utu.fi>
for implementing full handling of subtitling descriptors for implementing full handling of subtitling descriptors
Timothy D. Lenz <tlenz@vorgon.com>
for reporting a problem with logging changes for channels that
have no number

2
HISTORY
View File

@ -6162,3 +6162,5 @@ Video Disk Recorder Revision History
- Updated the Italian OSD texts (thanks to Diego Pierotto). - Updated the Italian OSD texts (thanks to Diego Pierotto).
- Fixed wrong bracketing in cChannel::SubtitlingType() etc. - Fixed wrong bracketing in cChannel::SubtitlingType() etc.
(thanks to Rolf Ahrenberg). (thanks to Rolf Ahrenberg).
- Fixed not logging changes for channels that have no number
(reportted by Timothy D. Lenz).

13
channels.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: channels.c 2.7 2009/08/16 15:08:49 kls Exp $ * $Id: channels.c 2.8 2009/08/30 11:25:50 kls Exp $
*/ */
#include "channels.h" #include "channels.h"
@ -508,7 +508,8 @@ void cChannel::SetPids(int Vpid, int Ppid, int Vtype, int *Apids, char ALangs[][
q = NewSpidsBuf; q = NewSpidsBuf;
q += IntArrayToString(q, Spids, 10, SLangs); q += IntArrayToString(q, Spids, 10, SLangs);
*q = 0; *q = 0;
dsyslog("changing pids of channel %d from %d+%d=%d:%s:%s:%d to %d+%d=%d:%s:%s:%d", Number(), vpid, ppid, vtype, OldApidsBuf, OldSpidsBuf, tpid, Vpid, Ppid, Vtype, NewApidsBuf, NewSpidsBuf, Tpid); if (Number())
dsyslog("changing pids of channel %d from %d+%d=%d:%s:%s:%d to %d+%d=%d:%s:%s:%d", Number(), vpid, ppid, vtype, OldApidsBuf, OldSpidsBuf, tpid, Vpid, Ppid, Vtype, NewApidsBuf, NewSpidsBuf, Tpid);
vpid = Vpid; vpid = Vpid;
ppid = Ppid; ppid = Ppid;
vtype = Vtype; vtype = Vtype;
@ -558,7 +559,8 @@ void cChannel::SetCaIds(const int *CaIds)
char NewCaIdsBuf[MAXCAIDS * 5 + 10]; char NewCaIdsBuf[MAXCAIDS * 5 + 10];
IntArrayToString(OldCaIdsBuf, caids, 16); IntArrayToString(OldCaIdsBuf, caids, 16);
IntArrayToString(NewCaIdsBuf, CaIds, 16); IntArrayToString(NewCaIdsBuf, CaIds, 16);
dsyslog("changing caids of channel %d from %s to %s", Number(), OldCaIdsBuf, NewCaIdsBuf); if (Number())
dsyslog("changing caids of channel %d from %s to %s", Number(), OldCaIdsBuf, NewCaIdsBuf);
for (int i = 0; i <= MAXCAIDS; i++) { // <= to copy the terminating 0 for (int i = 0; i <= MAXCAIDS; i++) { // <= to copy the terminating 0
caids[i] = CaIds[i]; caids[i] = CaIds[i];
if (!CaIds[i]) if (!CaIds[i])
@ -574,7 +576,7 @@ void cChannel::SetCaDescriptors(int Level)
if (Level > 0) { if (Level > 0) {
modification |= CHANNELMOD_CA; modification |= CHANNELMOD_CA;
Channels.SetModified(); Channels.SetModified();
if (Level > 1) if (Number() && Level > 1)
dsyslog("changing ca descriptors of channel %d", Number()); dsyslog("changing ca descriptors of channel %d", Number());
} }
} }
@ -622,7 +624,8 @@ void cChannel::SetLinkChannels(cLinkChannels *LinkChannels)
} }
else else
q += sprintf(q, " none"); q += sprintf(q, " none");
dsyslog(buffer); if (Number())
dsyslog(buffer);
} }
void cChannel::SetRefChannel(cChannel *RefChannel) void cChannel::SetRefChannel(cChannel *RefChannel)