From 759f42984b04fe63d011cf14fa9ef1d41dfa7a94 Mon Sep 17 00:00:00 2001
From: parret-freaud <none>
Date: Wed, 20 Dec 2006 23:44:27 +0100
Subject: [PATCH] Mises  jours diverses de la tl.

darcs-hash:20061220224427-1dcb7-75b6925ee5066fa58888f0f9bfad64cce8e4fcdf.gz
---
 tv/sat_base.py | 42 +++++++++++++++++++++++++++---------------
 tv/sat_conf.py |  4 ++--
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/tv/sat_base.py b/tv/sat_base.py
index b554a7e1..16c886be 100755
--- a/tv/sat_base.py
+++ b/tv/sat_base.py
@@ -255,18 +255,26 @@ class Hotbird_10911(carte) :
        '5801 5831' : 'rad fra Meteo Express',
        '5800 5820 5830' : 'fra Meteo Express' }
 
-class Hotbird_11137(carte) :
-    pol='h'
+class Hotbird_10911(carte) :
+    pol='v'
     srate=27500
     chaines = {
-       '3521 3641 717 3601' : 'fra TV5 FBS',
-       '3522 3642 719 3602' : 'fra TV5 Europe',
-       '3523 3643 265' : 'ita Roma uno',
-       '3524 3644 3664 262' : 'ara ANN',
-       '3525 3645 267' : 'ita Videolook',
-       '3526 3646 263' : 'ara Kurdistan TV',
-       '3528 3648 264' : 'ita Videolina',
-       '3531 3651 261' : 'ita starmarket' }
+       '3207 3237' : 'rad fra RFI',
+       '1004 3531' : 'rad fra France Musiques',
+       '1005 3533' : 'rad fra FIP',
+       '1003 3536' : 'rad fra France Culture',
+       '1008 3538' : 'rad fra Le Mouv',
+       '5801 5831' : 'rad fra Meteo Express',
+       '5800 5820 5830' : 'fra Meteo Express' }
+
+class Hotbird_12111(carte) :
+    pol='v'
+    srate=27500
+    chaines = {
+       '250 251 1029' : 'ara Al Jazeera Mubasher',
+       '260 261 1030' : 'ita Ceramicanda',
+       '270 271 1031' : 'ara Al Jazeera Satellite Channel',
+       '310 311 1040' : 'ita Radio Radio TV'}
 
 class Hotbird_11200(carte) :
     pol='V'
@@ -324,7 +332,13 @@ class Hotbird_11727(carte) :
        '2791 2792 269' : 'ita Sicilia International (SET)',
        '2751 2752 266' : 'ita Sardegna Uno Sat',
        '6507 6662' : 'rad eng BBC English (Europe)',
-       '6510 6692' : 'rad eng BBC English News'}
+       '6510 6692' : 'rad eng BBC English News',
+       '7302 6571' : 'rad eng BBC Feed 1',
+       '7312 6572' : 'rad eng BBC Feed 2',
+       '7322 6573' : 'rad eng BBC Feed 3',
+       '7332 6574' : 'rad eng BBC Feed 4',
+       '7342 6575' : 'rad eng BBC Feed 5',
+       '7352 6576' : 'rad eng BBC Feed 6'}
        
 class Hotbird_11785(carte) :
     pol='h'
@@ -380,11 +394,9 @@ class Hotbird_12673(carte) :
     pol='v'
     srate=27500
     chaines = {
-       '308 309 306 307 310' : 'ara Al Maghribiyah',
+       '308 309 306 307' : 'ara Al Maghribiyah',
        '35 36 33 34 38' : 'ara TVM inter l',
-       '37 39 40 41 42 43' : 'ara TVM',
-       '46 47 48 44 45' : 'ara Arabiaa',
-       '1026 1027 1028 1024 1025' : 'ara TVM inter'}
+       '46 47 44 45' : 'ara Arabiaa'}
 
 class TNT_base(carte) :
     qam="auto"
diff --git a/tv/sat_conf.py b/tv/sat_conf.py
index 2cb70e78..13a480c0 100755
--- a/tv/sat_conf.py
+++ b/tv/sat_conf.py
@@ -21,8 +21,8 @@ transpondeurs = { 'canard' : [ TNT_R4_498000(0) ,
                                TNT_R3_522000(5) ],
                   'oie' : [    Hotbird_10796(0) ,
                                Hotbird_10873(1) ,
-                               Hotbird_11137(2) ]
-#                               Hotbird_11623(3) ,
+#                               Hotbird_11137(2) ,
+                               Hotbird_12111(3) ],
 #                               Hotbird_12673(4) ]
                                }