[tv] chaines.shuffle()

darcs-hash:20101111153156-ffbb2-3078ab68e579af179676494a03c4f1d0e725335a.gz

tv/genconf/sat_base_ng.py

@@ -109,6 +109,11 @@ class Card(object):
     sap_default_group=%(sap)s
     """)
 
+    template_conf_sid = textwrap.dedent("""\
+    
+    # Liste des chaines à diffuser
+    autoconf_sid_list=%(sids)s
+    """)
 
     def __cmp__(a,b) :
         for attr in ( 'card', 'freq', 'chaines' ) :
@@ -152,6 +157,10 @@ class Card(object):
                     'sap': self.sap,
                     'srate': self.srate,
                     'ip': IP.split('.')[-1]} )
+        if hasattr(self, 'sid_list'):
+            fd.write(self.template_conf_sid %
+                    { 'sids' : " ".join(str(sid) for sid in self.sid_list) })
+
         fd.close()
 
     def start(self) :
@@ -176,7 +185,8 @@ class TNT_R2_474000(TNT_base):
     pass
 
 class TNT_R3_522000(TNT_base):
-    pass
+    # Canal+ : pas de diffusion la plupart du temps...
+    timeout_no_diff=0
 
 class TNT_R4_498000(TNT_base):
     pass
@@ -200,6 +210,12 @@ class SAT_10773h(SAT_UK_base):
 class SAT_10714h(SAT_UK_base):
     """Channel4"""
     srate = 22000
+    sid_list = [
+            9211, # Channel4
+            9220, # Film4
+            9225, # Film4 +1
+            9230, # More4 +1
+            ]
 
 class SAT_12480v(SAT_UK_base):
     """Channel 4"""