Support pour autoncfiguration=2, et mise a jour
Autonconfiguration = 2 permet de ne preciser aucune chaine et mumu trouve toutes les chaines du transpondeur tout seul darcs-hash:20090130133840-9fc8c-23b935078867c6c037ca5ffdb9cb62f4cfc72273.gz
This commit is contained in:
parent
162c3a9c3c
commit
3e49eb27d8
1 changed files with 27 additions and 20 deletions
|
@ -85,6 +85,13 @@ sap_group=%(sap_group)s
|
|||
name=%(name)s
|
||||
pids=%(pids)s
|
||||
#-----
|
||||
"""
|
||||
|
||||
autoconf2_template = """common_port=1234
|
||||
autoconfiguration=2
|
||||
autoconf_ip_header=%(ip)s
|
||||
sap_default_group=various
|
||||
#-----
|
||||
"""
|
||||
|
||||
pid_file = "/var/run/mumudvb/mumudvb_carte%i.pid" # % num carte
|
||||
|
@ -136,8 +143,14 @@ pids=%(pids)s
|
|||
ip = '239.%s.20%i.2%02i' % ( IP.split('.')[-1], self.card, n)
|
||||
n += 1
|
||||
fd.write(self.chaine_template % vars())
|
||||
|
||||
#Si pas de chaines, on passe en autoconfiguration=2
|
||||
if not n :
|
||||
ip = '239.%s' % ( IP.split('.')[-1])
|
||||
fd.write(self.autoconf2_template % { "ip" : ip})
|
||||
|
||||
fd.close()
|
||||
|
||||
|
||||
def get_pid(self) :
|
||||
""" Retourne le pid associé ŕ la carte """
|
||||
try:
|
||||
|
@ -241,14 +254,10 @@ pids=%(pids)s
|
|||
|
||||
#Format : "'pids' : ( 'groupe sap' : 'nom' ),"
|
||||
|
||||
class Hotbird_10873(carte) :
|
||||
pol='v'
|
||||
class Hotbird_10853(carte) :
|
||||
pol='h'
|
||||
srate=27500
|
||||
chaines = {
|
||||
'3101 3131' : ('radios' , 'rad fra Europe 1'),
|
||||
'3102 3132' : ('radios' , 'rad fra Virgin radio'),
|
||||
'3103 3133' : ('radios' , 'rad fra RFM'),
|
||||
'3238 3208' : ('radios' , 'rad fra Alouette')}
|
||||
chaines = {}
|
||||
|
||||
class Hotbird_11137(carte) :
|
||||
pol='h'
|
||||
|
@ -276,7 +285,8 @@ class Hotbird_11240(carte) :
|
|||
srate=27500
|
||||
chaines = {
|
||||
'244' : ('fra' , 'fra France 24'),
|
||||
'247' : ('eng' , 'eng France 24')}
|
||||
'247' : ('eng' , 'eng France 24'),
|
||||
'401' : ('fra' , 'fra RTBF sat')}
|
||||
|
||||
class Hotbird_11604(carte) :
|
||||
pol='h'
|
||||
|
@ -295,12 +305,7 @@ class Hotbird_11604(carte) :
|
|||
class Hotbird_11623(carte) :
|
||||
pol='v'
|
||||
srate=27500
|
||||
chaines = {
|
||||
'230 250 210 297' : ('fra' , 'fra 123sat'),
|
||||
'225 245 205' : ('fra' , 'fra Best Of Shopping'),
|
||||
'221 241 201' : ('x-ero' , 'x-ero Videosexy TV'),
|
||||
'231 251 32 8190' : ('x-ero' , 'x-ero SexySat 3'),
|
||||
'227 247 287 5008' : ('rom' , 'rom TV Romania International')}
|
||||
chaines = {}
|
||||
|
||||
class Hotbird_11642(carte) :
|
||||
pol='h'
|
||||
|
@ -340,13 +345,15 @@ class Hotbird_11766(carte) :
|
|||
'1107' : ('eng' , 'eng ita Senato italiano'),
|
||||
'261' : ('ita' , 'ita Rai Edu2')}
|
||||
|
||||
class Hotbird_11785(carte) :
|
||||
class Hotbird_11727(carte) :
|
||||
pol='v'
|
||||
srate=27500
|
||||
chaines = {}
|
||||
|
||||
class Hotbird_11054(carte) :
|
||||
pol='h'
|
||||
srate=27500
|
||||
chaines = {
|
||||
'32' : ('esp' , 'esp TVE International'),
|
||||
'33' : ('esp' , 'esp Canal 24 Horas'),
|
||||
'34' : ('esp' , 'esp TVE Internacional Asia/Africa')}
|
||||
chaines = {}
|
||||
|
||||
class Hotbird_12111(carte) :
|
||||
pol='v'
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue