]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
Disallow multi service streaming from a single mux if the adapter is only 12Mbit...
authorAndreas Öman <andreas@lonelycoder.com>
Sat, 9 Jan 2010 22:19:40 +0000 (22:19 +0000)
committerAndreas Öman <andreas@lonelycoder.com>
Sat, 9 Jan 2010 22:19:40 +0000 (22:19 +0000)
src/dvb/dvb_transport.c

index f5e5fc8fb30957e43adbab8591025e10947d095c..5487ab0e5d35f8ef2e80e3200661ded00414db92 100644 (file)
@@ -117,13 +117,15 @@ dvb_transport_start(th_transport_t *t, unsigned int weight, int force_start)
 
   /* Check if adapter is idle, or already tuned */
 
-  if(tdmi != NULL && tdmi != t->tht_dvb_mux_instance && !force_start) {
+  if(tdmi != NULL && 
+     (tdmi != t->tht_dvb_mux_instance ||
+      tda->tda_hostconnection == HOSTCONNECTION_USB12)) {
 
-    w = transport_compute_weight(&tdmi->tdmi_adapter->tda_transports);
-    if(w >= weight)
+    w = transport_compute_weight(&tda->tda_transports);
+    if(w >= weight && !force_start)
       /* We are outranked by weight, cant use it */
       return TRANSPORT_NOSTART_NOT_FREE;
-
+    
     dvb_adapter_clean(tda);
   }