Imported Upstream version 0+git20141009.d26b627upstream/0+git20141009.d26b627

3 files changed, 208 insertions, 22 deletions

diff --git a/dvb-t/au-Melbourne b/dvb-t/au-Melbourne
index 6fefbea..e3963b1 100644
--- a/dvb-t/au-Melbourne
+++ b/dvb-t/au-Melbourne
@@ -1,12 +1,89 @@
-# Australia / Melbourne (Mt Dandenong transmitters)
-# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-# ABC
-T 226500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Seven
-T 177500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Nine
-T 191625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# Ten
-T 219500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-# SBS
-T 536625000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+#------------------------------------------------------------------------------
+# file automatically generated by w_scan
+# (http://wirbel.htpc-forum.de/w_scan/index2.html)
+#! <w_scan> 20130331 1 0 TERRESTRIAL AU </w_scan>
+#------------------------------------------------------------------------------
+# location and provider: Australia / Melbourne (Mt Dandenong transmitters)
+# date (yyyy-mm-dd)    : 2014-08-17
+# provided by (opt)    : <your name or email here>
+#
+# T[2] [plp_id] [system_id] <freq> <bw> <fec_hi> <fec_lo> <mod> <tm> <guard> <hi> [# comment]
+#------------------------------------------------------------------------------
+# Seven Network
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 177500000
+	BANDWIDTH_HZ = 7000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = AUTO
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/16
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+# SBS Melbourne
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 184500000
+	BANDWIDTH_HZ = 7000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = AUTO
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/8
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+# Nine Network Australia
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 191625000
+	BANDWIDTH_HZ = 7000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = AUTO
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/16
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+# Network TEN
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 219500000
+	BANDWIDTH_HZ = 7000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = AUTO
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/16
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+# ABC Melbourne
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 226500000
+	BANDWIDTH_HZ = 7000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = AUTO
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/16
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
+# C31
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 557625000
+	BANDWIDTH_HZ = 7000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = AUTO
+	MODULATION = QPSK
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/16
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
diff --git a/dvb-t/au-Melbourne-Selby b/dvb-t/au-Melbourne-Selby
index 36d20e4..ec346ff 100644
--- a/dvb-t/au-Melbourne-Selby
+++ b/dvb-t/au-Melbourne-Selby
@@ -1,13 +1,67 @@
 # Australia / Melbourne (Selby Repeater)
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 # ABC
-T 662500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 662500000
+	BANDWIDTH_HZ = 7000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/16
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
 # Seven
-T 620500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 620500000
+	BANDWIDTH_HZ = 7000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/16
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
 # Nine
-T 641500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 641500000
+	BANDWIDTH_HZ = 7000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/16
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
 # Ten
-T 711500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 711500000
+	BANDWIDTH_HZ = 7000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/16
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
 # SBS
-T 683500000 7MHz AUTO NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 683500000
+	BANDWIDTH_HZ = 7000000
+	CODE_RATE_HP = AUTO
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/8
+	HIERARCHY = NONE
+	INVERSION = AUTO
 
diff --git a/dvb-t/au-Melbourne-Upwey b/dvb-t/au-Melbourne-Upwey
index 2171845..20c55e2 100644
--- a/dvb-t/au-Melbourne-Upwey
+++ b/dvb-t/au-Melbourne-Upwey
@@ -1,12 +1,67 @@
 # Australia / Melbourne (Upwey Repeater)
 # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
 # ABC
-T 662500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 662500000
+	BANDWIDTH_HZ = 7000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/16
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
 # Seven
-T 620500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 620500000
+	BANDWIDTH_HZ = 7000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/16
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
 # Nine
-T 641500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 641500000
+	BANDWIDTH_HZ = 7000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/16
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
 # Ten
-T 711500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 711500000
+	BANDWIDTH_HZ = 7000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/16
+	HIERARCHY = NONE
+	INVERSION = AUTO
+
 # SBS
-T 683500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 683500000
+	BANDWIDTH_HZ = 7000000
+	CODE_RATE_HP = 2/3
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/8
+	HIERARCHY = NONE
+	INVERSION = AUTO
+