[PATCH] Fix the output from scan utility for vdr

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

the scan utility from dvb-apps creates a wrong channel.conf for vdr. Vdr uses the original network id instead of the
network id. The attached patch does fix this little problem.

Signed-of-by: Hartmut Birr <e9hack@xxxxxxxxxxxxxx>

- Hartmut

--- a/util/scan/scan.c	Sat Aug 12 13:29:37 2006 +0100
+++ b/util/scan/scan.c	Mon Aug 21 19:56:16 2006 +0200
@@ -130,6 +130,7 @@ struct transponder {
 	struct list_head list;
 	struct list_head services;
 	int network_id;
+	int original_network_id;
 	int transport_stream_id;
 	enum fe_type type;
 	struct dvb_frontend_parameters param;
@@ -236,6 +237,7 @@ static void copy_transponder(struct tran
 static void copy_transponder(struct transponder *d, struct transponder *s)
 {
 	d->network_id = s->network_id;
+	d->original_network_id = s->original_network_id;
 	d->transport_stream_id = s->transport_stream_id;
 	d->type = s->type;
 	memcpy(&d->param, &s->param, sizeof(d->param));
@@ -860,6 +862,7 @@ static void parse_nit (const unsigned ch
 		memset(&tn, 0, sizeof(tn));
 		tn.type = -1;
 		tn.network_id = network_id;
+		tn.original_network_id = (buf[2] << 8) | buf[3];
 		tn.transport_stream_id = transport_stream_id;
 
 		parse_descriptors (NIT, buf + 6, descriptors_loop_len, &tn);
@@ -1991,7 +1994,7 @@ static void dump_lists (void)
 						    //FIXME: s->subtitling_pid
 						    s->ac3_pid,
 						    s->service_id,
-						    t->network_id,
+						    t->original_network_id,
 						    s->transport_stream_id,
 						    t->orbital_pos,
 						    t->we_flag,
_______________________________________________
linux-dvb mailing list
linux-dvb@xxxxxxxxxxx
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linux-dvb

[Index of Archives]     [Linux Media]     [Video 4 Linux]     [Asterisk]     [Samba]     [Xorg]     [Xfree86]     [Linux USB]

  Powered by Linux