summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Lampard <mlampard@users.sourceforge.net>2004-11-24 02:58:20 +0000
committerMike Lampard <mlampard@users.sourceforge.net>2004-11-24 02:58:20 +0000
commita668dfc779d2b31d245c562b00a8108a64bf1888 (patch)
tree478aaeaf5f59e6cf10fc3b40b97c4a1dedbe3fa4
parent9661c3c05c243f99b00c6f9f17caf50d4fd162b4 (diff)
downloadxine-lib-a668dfc779d2b31d245c562b00a8108a64bf1888.tar.gz
xine-lib-a668dfc779d2b31d245c562b00a8108a64bf1888.tar.bz2
add support for slightly non-standard? ?zap channels.conf files
CVS patchset: 7152 CVS date: 2004/11/24 02:58:20
-rw-r--r--src/input/input_dvb.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c
index 72aa63858..198efcbd2 100644
--- a/src/input/input_dvb.c
+++ b/src/input/input_dvb.c
@@ -671,7 +671,12 @@ static int extract_channel_from_string(channel_t * channel,char * str,fe_type_t
if (!(field = strsep(&tmp, ":")))
return -1;
channel->service_id = strtoul(field, NULL, 0);
-
+
+ /* some channel.conf files are generated with the service ID 1 to the right
+ this needs investigation */
+ if ((field = strsep(&tmp, ":")))
+ if(strtoul(field,NULL,0)>0)
+ channel->service_id = strtoul(field, NULL, 0);
return 0;
}