aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2016-02-13 00:37:39 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2016-02-13 00:37:39 +0100
commitf3db40bce7340cccd8cccdf2767a7cbf15448e8a (patch)
treed7dd0b5158a6d0a56bb42dd6e1cd52f6baf5564f
parentd088bcdd51ec120c3e818ac15b915077458da5bf (diff)
downloaddab-scripts-f3db40bce7340cccd8cccdf2767a7cbf15448e8a.tar.gz
dab-scripts-f3db40bce7340cccd8cccdf2767a7cbf15448e8a.tar.bz2
dab-scripts-f3db40bce7340cccd8cccdf2767a7cbf15448e8a.zip
Remove old EDI format from mux.conf to avoid confusion
-rw-r--r--config/mux.conf48
1 files changed, 3 insertions, 45 deletions
diff --git a/config/mux.conf b/config/mux.conf
index 0fec378..d4c23bb 100644
--- a/config/mux.conf
+++ b/config/mux.conf
@@ -160,10 +160,10 @@ subchannels {
}
sub-maxxima {
type dabplus
- inputfile "tcp://*:9002"
+ inputfile "tcp://*:9002"
bitrate 96
id 2
- protection-profile EEP_A
+ protection-profile EEP_A
protection 2
}
sub-fip {
@@ -171,7 +171,7 @@ subchannels {
inputfile "tcp://*:9003"
bitrate 96
id 3
- protection-profile EEP_A
+ protection-profile EEP_A
protection 3
; ZMQ specific options, mandatory:
@@ -290,48 +290,6 @@ outputs {
; Throttle output to real-time (one ETI frame every 24ms)
throttle "simul://"
- ; The edi output has a different syntax
- ;edi {
- ; ; example for unicast EDI
- ; ;destination "192.168.23.23"
- ; ; for unicast EDI, do not set source
-
- ; ; example for multicast EDI, the source IP is required
- ; ; so that the data is sent on the correct ethernet interface
- ; destination "232.20.10.1"
- ; source "192.168.0.50"
- ; ; The multicast TTL has to be adapted according to your network
- ; ttl 1
-
- ; ; The settings below apply to both unicast and multicast
-
- ; ; EDI uses the UDP protocol
- ; port 12000
- ; sourceport 13000
-
- ; ; Enable the PFT subsystem. If false, AFPackets are sent.
- ; enable_pft true
-
- ; ; How many lost fragments can be recovered by Reed-Solomon
- ; fec 2
-
- ; ; Length of a RS chunk, can be overriden
- ; ;default=207
- ; ;chunk_len 207
-
- ; ; Save the packets sent over ethernet to the file ./edi.debug
- ; dump false
-
- ; ; show more debugging info
- ; verbose false
-
- ; ; (optional) set the kind of alignment to use in TAG Packets
- ; ; 0: no padding
- ; ; 8: pad to eight bytes (default)
- ; ; above 8: insert *dmy TAG Item to pad to given size in bytes
- ; ;tagpacket_alignment 8
- ;
-
; Other outputs:
; TCP listen on port
;net "tcp://host:port"