]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
network scan: sort muxes also by networks
authorJaroslav Kysela <perex@perex.cz>
Fri, 18 Mar 2016 10:32:19 +0000 (11:32 +0100)
committerJaroslav Kysela <perex@perex.cz>
Fri, 18 Mar 2016 10:32:33 +0000 (11:32 +0100)
src/input/mpegts/mpegts_network_scan.c

index 1bc1f9beab5a3a7d1055d53698f63b9a3a489bdb..45db6f358b21c45a9de7a9edf4ca6e0733b047b5 100644 (file)
@@ -36,6 +36,10 @@ mm_cmp ( mpegts_mux_t *a, mpegts_mux_t *b )
 {
   int r = b->mm_scan_weight - a->mm_scan_weight;
   if (r == 0) {
+    r = uuid_cmp(&a->mm_network->mn_id.in_uuid,
+                 &b->mm_network->mn_id.in_uuid);
+    if (r)
+      return r;
     if (idnode_is_instance(&a->mm_id, &dvb_mux_dvbs_class) &&
         idnode_is_instance(&b->mm_id, &dvb_mux_dvbs_class)) {
       dvb_mux_conf_t *mc1 = &((dvb_mux_t *)a)->lm_tuning;