From f344adaba3203ba20ad069e5d282b940a8769116 Mon Sep 17 00:00:00 2001
From: Stephane Glondu <Stephane.Glondu@crans.org>
Date: Tue, 8 Apr 2008 09:21:39 +0200
Subject: [PATCH] Nouvelles chanes

darcs-hash:20080408072139-61eff-2d1e01d8474560f81dbf1ec649e6b7201107634f.gz
---
 tv/sat_base.py | 28 ++++++++++++++++------------
 tv/sat_conf.py | 13 ++++++-------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/tv/sat_base.py b/tv/sat_base.py
index c50d8600..f1a1bd4e 100755
--- a/tv/sat_base.py
+++ b/tv/sat_base.py
@@ -244,7 +244,6 @@ class Hotbird_10911(carte) :
     pol='v'
     srate=27500
     chaines = {
-       '3207 3237' : 'rad fra RFI',
        '1004 3531' : 'rad fra France Musiques',
        '1005 3533' : 'rad fra FIP',
        '1003 3536' : 'rad fra France Culture',
@@ -280,8 +279,7 @@ class Hotbird_11240(carte) :
     srate=27500
     chaines = {
        '244 245 246' : 'fra France 24',
-       '247 248 249' : 'eng France 24', 
-       '160 80 81 1280 132 35' : 'fra Canal_plus' }
+       '247 248 249' : 'eng France 24' }
 
 class Hotbird_11604(carte) :
     pol='h'
@@ -380,8 +378,6 @@ class Hotbird_12577(carte) :
     srate=27500
     chaines = {
        '1204 1104 134' : 'fra telesud',
-       '1206 1306 1106' : 'x-ero Full X 4 free',
-       '1218 1313 33 34' : 'x-ero sexysat 4',
        '1209 1309 1109' : 'fra liberty TV',
        '1239 1339 1139' : 'ned liberty TV' }
 
@@ -432,7 +428,7 @@ class TNT_R2_474000(TNT_base) :
 
 class TNT_R3_522000(TNT_base) :
     chaines = {
-       '170 120 62 122 1280' : 'fra TNT04 Canal'}
+       '1280 170 120 62 122 160 80 81 83' : 'fra TNT04 Canal'}
 
 class TNT_R4_498000(TNT_base) :
     chaines = {
@@ -440,15 +436,23 @@ class TNT_R4_498000(TNT_base) :
        '220 230 210 240'  : 'fra TNT09 W9',
        '320 330 310' : 'fra TNT11 NT1'}
 
-class TNT_R6_562000(TNT_base) :
-    chaines = {
-       '120 130 100 140 131 132 150'  : 'fra TNT01 TF1',
-       '600 620 630' : 'fra TNT10 TMC',
-       '220 230 231 200'  : 'fra TNT12 NRJ12'}
-
 class TNT_R5_538000(TNT_base) :
     chaines = {
        '110 120 131' : 'fra TNT TEST_HD1',
        '210 220 230 231' : 'fra TNT TEST_HD2',
        '310 320 331' : 'fra TNT TEST_HD3'}
 
+class TNT_R6_562000(TNT_base) :
+    chaines = {
+       '120 130 100 140 131 132 150'  : 'fra TNT01 TF1',
+       '600 620 630' : 'fra TNT10 TMC',
+       '220 230 231 200'  : 'fra TNT12 NRJ12'}
+
+class TNT_R7_490000(TNT_base) :
+    chaines = {
+       '3521 3641 4321' : 'fra TNT21 Canal 21',
+       '3522 3642 4322' : 'fra TNT22 IDF1',
+       '3523 3643 4323' : 'fra TNT23 NRJ Paris',
+       '3524 3644 4324' : 'fra TNT24 Cap 24'}
+
+
diff --git a/tv/sat_conf.py b/tv/sat_conf.py
index 54fae29a..26a75b2d 100755
--- a/tv/sat_conf.py
+++ b/tv/sat_conf.py
@@ -17,14 +17,13 @@ transpondeurs = { 'canard' : [ TNT_R4_498000(0) ,
                                Hotbird_10911(1) ,
                                TNT_R1_586000(2) ,
                                TNT_R6_562000(3) ,
-                               TNT_R2_474000(4) ,
-                               TNT_R3_522000(5) ],
-#                  'oie' : [ ]
-                  'oie' : [    Hotbird_11766(0) ,
-#                               Hotbird_10873(1) ,
-                               Hotbird_11137(1) ,
+                               TNT_R2_474000(4) ],
+                  'oie' : [    Hotbird_12673(0) ,
+                               Hotbird_11766(1) ,
                                Hotbird_12111(2) ,
-                               Hotbird_12673(3) ]
+                               Hotbird_11137(3) ,
+                               TNT_R7_490000(4) ,
+                               TNT_R3_522000(5) ]
                                }
 
 conf = transpondeurs.get(host,[])