summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2009-04-25 13:57:32 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2009-04-25 13:57:32 +0200
commit6aeeae28ef8fd06c0932a0f46276f860e3cb3efc (patch)
treeae2ffddc9dfa18f7e5c75e7d67045d0a05dd46b1
parente7c18af94ce71f52e3c5d7d54e0b5648f64e26e5 (diff)
downloadvdr-6aeeae28ef8fd06c0932a0f46276f860e3cb3efc.tar.gz
vdr-6aeeae28ef8fd06c0932a0f46276f860e3cb3efc.tar.bz2
Using CA_USER_MAX instead of 0x00FF
-rw-r--r--channels.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/channels.c b/channels.c
index 46a8196b..1e857009 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: channels.c 2.5 2009/04/10 11:29:55 kls Exp $
+ * $Id: channels.c 2.6 2009/04/25 13:57:32 kls Exp $
*/
#include "channels.h"
@@ -535,7 +535,7 @@ void cChannel::SetPids(int Vpid, int Ppid, int Vtype, int *Apids, char ALangs[][
void cChannel::SetCaIds(const int *CaIds)
{
- if (caids[0] && caids[0] <= 0x00FF)
+ if (caids[0] && caids[0] <= CA_USER_MAX)
return; // special values will not be overwritten
if (IntArraysDiffer(caids, CaIds)) {
char OldCaIdsBuf[MAXCAIDS * 5 + 10]; // 5: 4 digits plus delimiting ',', 10: paranoia
@@ -864,7 +864,7 @@ bool cChannel::Parse(const char *s)
while ((q = strtok_r(p, ",", &strtok_next)) != NULL) {
if (NumCaIds < MAXCAIDS) {
caids[NumCaIds++] = strtol(q, NULL, 16) & 0xFFFF;
- if (NumCaIds == 1 && caids[0] <= 0x00FF)
+ if (NumCaIds == 1 && caids[0] <= CA_USER_MAX)
break;
}
else