From 3f3cc5b8b09ad3d5b245a827b329d32973b45f62 Mon Sep 17 00:00:00 2001
From: dubost <none>
Date: Fri, 17 Mar 2006 12:03:57 +0100
Subject: [PATCH] Mise a jour

Desormais France info et France Inter sont diffuss a la place de chaines
qui sont dsormais cryptes

darcs-hash:20060317110357-c3cc4-c37d22b33ec25641723a1b20ace51d92ce802941.gz
---
 tv/sat_base.py | 14 ++++----------
 tv/sat_conf.py |  4 ++--
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/tv/sat_base.py b/tv/sat_base.py
index 7258a42d..07c3dc4d 100755
--- a/tv/sat_base.py
+++ b/tv/sat_base.py
@@ -225,8 +225,9 @@ class Hotbird_10796(carte) :
     pol='v'
     srate=27500
     chaines = {
-       '3534 3504' : 'rad fra France Inter',
-       '3535 3505' : 'rad fra France Info' }
+       '3336 3306' : 'rad fra Radio FG',
+       '3534 1001' : 'rad fra France Inter',
+       '3535 1002' : 'rad fra France Info' }
 
 class Hotbird_10873(carte) :
     pol='v'
@@ -293,17 +294,10 @@ class Hotbird_11242(carte) :
     chaines = {
        '121 122 123' : 'ita TV7 Lombardia',
        '3011 3012 3010' : 'fra TV8 Mont Blanc',
+       '5701 5702 5700' : 'esp Bethel Television',
        '33 36 35 500' : 'fra HD Forum',
        '308 256 257' : 'fra World Fashion Channel' }
 
-class Hotbird_11304(carte) :
-    pol='h'
-    srate=27500
-    chaines = {
-       '1060 1020 210' : 'esp venevision continental',
-       '310 256 211' : 'esp TV Chile',
-       '513 514 212' : 'esp TV Colombia'}
-
 class Hotbird_11604(carte) :
     pol='h'
     srate=27500
diff --git a/tv/sat_conf.py b/tv/sat_conf.py
index c189f2df..e5585659 100755
--- a/tv/sat_conf.py
+++ b/tv/sat_conf.py
@@ -19,10 +19,10 @@ transpondeurs = { 'canard' : [ TNT_R4_498000(0) ,
                                TNT_R6_562000(3) ,
                                TNT_R2_474000(4) ,
                                TNT_R3_522000(5) ],
-                  'oie' : [    Hotbird_12245(0) ,
+                  'oie' : [    Hotbird_10796(0) ,
                                Hotbird_11137(1) ,
                                Hotbird_10873(2) ,
-                               Hotbird_11304(3) ,
+                               Hotbird_12245(3) ,
                                Hotbird_11623(4) ]
                                }