diff --git a/tv/genconf/sat_base_ng.py b/tv/genconf/sat_base_ng.py index 2d6ee0be..c27d8562 100755 --- a/tv/genconf/sat_base_ng.py +++ b/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""" diff --git a/tv/genconf/sat_conf.py b/tv/genconf/sat_conf.py index be432a0d..2c1c0b43 100755 --- a/tv/genconf/sat_conf.py +++ b/tv/genconf/sat_conf.py @@ -8,26 +8,28 @@ from socket import gethostname host = gethostname() -transpondeurs = { 'canard' : [ SAT_10773h(0), - #Hotbird_11240(1) , +transpondeurs = { 'canard' : [ SAT_10773h(0), + SAT_10714h(1) , #Hotbird_12597(2) , #Hotbird_11604(3) , - TNT_R6_562000(4) ], # Cette carte est HS + TNT_R2_474000(4), + ], 'lapin' : [ SAT_10714h(0) , #Hotbird_11727(1) , #Cette carte capte bizarrement, a vérifier TNT_R5_538000(2) , - TNT_R6_562000(3) ], # Cette carte chie. + TNT_R3_522000(3) ], 'poulet' : [ TNT_R2_474000(1) ], #la 0 est la carte sat + decodeur #serveur de test 'dindon' : [ TNT_R1_586000(0) , TNT_R4_498000(1) , - TNT_R6_562000(2) , - TNT_R3_522000(3) ], + TNT_R6_562000(2) , # La carte dual tuner de dindon est HS + TNT_R3_522000(3) ], # ... 'oie' : [ SAT_10773h(0), #Hotbird_11642(1) , #Hotbird_12111(2) , #Hotbird_11137(3) , - TNT_R7_490000(4) , # Cette carte chie. - TNT_R2_474000(5) ] + TNT_R6_562000(4) , # les cartes d'oie ne supportent pas le multiplex R2. + TNT_R7_490000(5) , + ] } conf = transpondeurs.get(host,[])