Merge tag 'upstream/0+git20141009.d26b627'

Upstream version 0+git20141009.d26b627

1 files changed, 144 insertions, 18 deletions

diff --git a/dvb-s/Agila2_C-146.0E b/dvb-s/Agila2_C-146.0E
index ac30747..5591e50 100644
--- a/dvb-s/Agila2_C-146.0E
+++ b/dvb-s/Agila2_C-146.0E
@@ -6,55 +6,181 @@
 # freq pol sr fec
 
 # Viva Prime Channel
-S 3725000 H 2345000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3725000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2345000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # Zoe Philippines
-S 3774000 V 3300000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3774000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3300000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # Da Ai TV indonesia
-S 3791000 H 3100000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3791000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3100000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # Trinity Broadcasting Multiplex
-S 3791000 V 10091000 5/6
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3791000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 10091000
+	INNER_FEC = 5/6
+	INVERSION = AUTO
+
 
 # Bayon TV
-S 3796000 H 3360000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3796000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3360000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # White Springs TV
-S 3846000 H 6110000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3846000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 6110000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # TCT World
-S 3854000 H 2603000 5/6
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3854000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2603000
+	INNER_FEC = 5/6
+	INVERSION = AUTO
+
 
 # CCTN
-S 3873000 V 2532000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3873000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2532000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # NBN Philippines
-S 3875000 H 3000000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3875000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3000000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # Al Masriyah
-S 3880000 H 2000000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3880000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2000000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # Viva Entertainment Multiplex
-S 3887000 H 6716000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3887000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 6716000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # IBC13
-S 3896000 H 3000000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3896000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3000000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # CTN Cambodia Multiplex
-S 3979000 V 9628000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3979000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 9628000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # Divya TV
-S 3990000 V 13330000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3990000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 13330000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # Familyland TV Network
-S 4164000 V 3735000 7/8
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4164000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3735000
+	INNER_FEC = 7/8
+	INVERSION = AUTO
+
 
 # MTV Philippines
-S 4171000 V 3213000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4171000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 3213000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # The Old Path TV
-S 4183000 V 2170000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4183000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2170000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # UNTV
-S 4188000 V 2170000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4188000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2170000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+