From 82b0aced9133507f588486bcef3af322672e8819 Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Fri, 7 Oct 2016 20:03:43 +0200 Subject: Adapt scripts to renamed tools --- config/supervisor/encoder-bbc1.conf | 9 +++++++-- config/supervisor/encoder-f3.conf | 4 ++-- config/supervisor/encoder-fip.conf | 4 ++-- config/supervisor/encoder-maxxima.conf | 4 ++-- 4 files changed, 13 insertions(+), 8 deletions(-) (limited to 'config') diff --git a/config/supervisor/encoder-bbc1.conf b/config/supervisor/encoder-bbc1.conf index a076568..c53068a 100644 --- a/config/supervisor/encoder-bbc1.conf +++ b/config/supervisor/encoder-bbc1.conf @@ -1,5 +1,10 @@ [program:encoder-bbc1] -command=/usr/local/bin/toolame-dab -s 48 -V http://bbcmedia.ic.llnwd.net/stream/bbcmedia_radio1_mf_p -b 128 -W /home/odr/config/mot/bbc1.txt -p 58 -P /home/odr/config/mot/bbc1.pad tcp://127.0.0.1:9004 +# DAB encoding using odr-audioenc +command=/usr/local/bin/odr-audioenc --dab --vlc-uri=http://bbcmedia.ic.llnwd.net/stream/bbcmedia_radio1_mf_p -b 128 -r 48000 -o tcp://127.0.0.1:9004 --pad=58 --pad-fifo=/home/odr/config/mot/bbc1.pad --write-icy-text=/home/odr/config/mot/bbc1.txt + +# DAB encoding using toolame +#command=/usr/local/bin/toolame-dab -s 48 -V http://bbcmedia.ic.llnwd.net/stream/bbcmedia_radio1_mf_p -b 128 -W /home/odr/config/mot/bbc1.txt -p 58 -P /home/odr/config/mot/bbc1.pad tcp://127.0.0.1:9004 + autostart=false autorestart=true priority=10 @@ -7,7 +12,7 @@ stderr_logfile=/var/log/supervisor/encoder-bbc1.log stdout_logfile=/var/log/supervisor/encoder-bbc1.log [program:mot-bbc1] -command=/usr/local/bin/mot-encoder -t /home/odr/config/mot/bbc1.txt -o /home/odr/config/mot/bbc1.pad --pad=58 --charset=15 --dir=/home/odr/config/mot/bbc1/ --sleep=30 +command=/usr/local/bin/odr-padenc -t /home/odr/config/mot/bbc1.txt -o /home/odr/config/mot/bbc1.pad --pad=58 --charset=15 --dir=/home/odr/config/mot/bbc1/ --sleep=30 autostart=false autorestart=true priority=10 diff --git a/config/supervisor/encoder-f3.conf b/config/supervisor/encoder-f3.conf index 71451a4..715bf1a 100644 --- a/config/supervisor/encoder-f3.conf +++ b/config/supervisor/encoder-f3.conf @@ -1,5 +1,5 @@ [program:encoder-f3] -command=/usr/local/bin/dabplus-enc --vlc-uri=http://ice.stream.frequence3.net/frequence3-128.mp3 -b 96 -r 48000 --sbr -o tcp://127.0.0.1:9001 --pad=58 --pad-fifo=/home/odr/config/mot/f3.pad --write-icy-text=/home/odr/config/mot/f3.txt +command=/usr/local/bin/odr-audioenc --vlc-uri=http://ice.stream.frequence3.net/frequence3-128.mp3 -b 96 -r 48000 -o tcp://127.0.0.1:9001 --pad=58 --pad-fifo=/home/odr/config/mot/f3.pad --write-icy-text=/home/odr/config/mot/f3.txt autostart=false autorestart=true priority=10 @@ -7,7 +7,7 @@ stderr_logfile=/var/log/supervisor/encoder-f3.log stdout_logfile=/var/log/supervisor/encoder-f3.log [program:mot-f3] -command=/usr/local/bin/mot-encoder -t /home/odr/config/mot/f3.txt -o /home/odr/config/mot/f3.pad --pad=58 --charset=15 --dir=/home/odr/config/mot/f3/ --sleep=30 +command=/usr/local/bin/odr-padenc -t /home/odr/config/mot/f3.txt -o /home/odr/config/mot/f3.pad --pad=58 --dir=/home/odr/config/mot/f3/ --sleep=30 autostart=false autorestart=true priority=10 diff --git a/config/supervisor/encoder-fip.conf b/config/supervisor/encoder-fip.conf index c1fcbea..a35b96b 100644 --- a/config/supervisor/encoder-fip.conf +++ b/config/supervisor/encoder-fip.conf @@ -1,5 +1,5 @@ [program:encoder-fip] -command=/usr/local/bin/dabplus-enc --vlc-uri=http://audio.scdn.arkena.com/11016/fip-midfi128.mp3 -b 96 -r 48000 --sbr -o tcp://127.0.0.1:9003 --pad=58 --pad-fifo=/home/odr/config/mot/fip.pad --write-icy-text=/home/odr/config/mot/fip.txt +command=/usr/local/bin/odr-audioenc --vlc-uri=http://audio.scdn.arkena.com/11016/fip-midfi128.mp3 -b 96 -r 48000 -o tcp://127.0.0.1:9003 --pad=58 --pad-fifo=/home/odr/config/mot/fip.pad --write-icy-text=/home/odr/config/mot/fip.txt autostart=false autorestart=true priority=10 @@ -7,7 +7,7 @@ stderr_logfile=/var/log/supervisor/encoder-fip.log stdout_logfile=/var/log/supervisor/encoder-fip.log [program:mot-fip] -command=/usr/local/bin/mot-encoder -t /home/odr/config/mot/fip.txt -o /home/odr/config/mot/fip.pad --pad=58 --charset=15 --dir=/home/odr/config/mot/fip/ --sleep=30 +command=/usr/local/bin/odr-padenc -t /home/odr/config/mot/fip.txt -o /home/odr/config/mot/fip.pad --pad=58 --dir=/home/odr/config/mot/fip/ --sleep=30 autostart=false autorestart=true priority=10 diff --git a/config/supervisor/encoder-maxxima.conf b/config/supervisor/encoder-maxxima.conf index 792e668..550eb91 100644 --- a/config/supervisor/encoder-maxxima.conf +++ b/config/supervisor/encoder-maxxima.conf @@ -1,5 +1,5 @@ [program:encoder-maxxima] -command=/usr/local/bin/dabplus-enc --vlc-uri=http://maxxima.mine.nu:8000/ -b 96 -r 32000 --sbr -o tcp://127.0.0.1:9002 --pad=58 --pad-fifo=/home/odr/config/mot/maxxima.pad --write-icy-text=/home/odr/config/mot/maxxima.txt +command=/usr/local/bin/odr-audioenc --vlc-uri=http://maxxima.mine.nu:8000/ -b 96 -r 32000 -o tcp://127.0.0.1:9002 --pad=58 --pad-fifo=/home/odr/config/mot/maxxima.pad --write-icy-text=/home/odr/config/mot/maxxima.txt autostart=false autorestart=true priority=10 @@ -7,7 +7,7 @@ stderr_logfile=/var/log/supervisor/encoder-maxxima.log stdout_logfile=/var/log/supervisor/encoder-maxxima.log [program:mot-maxxima] -command=/usr/local/bin/mot-encoder -t /home/odr/config/mot/maxxima.txt -o /home/odr/config/mot/maxxima.pad --pad=58 --charset=15 --dir=/home/odr/config/mot/maxxima/ --sleep=30 +command=/usr/local/bin/odr-padenc -t /home/odr/config/mot/maxxima.txt -o /home/odr/config/mot/maxxima.pad --pad=58 --dir=/home/odr/config/mot/maxxima/ --sleep=30 autostart=false autorestart=true priority=10 -- cgit v1.2.3