5 files changed, 33 insertions, 31 deletions
diff --git a/supervisor/dabplus-enc-fb.conf b/supervisor/dabplus-enc-fb.conf
deleted file mode 100644
index 5ea43b0..0000000
--- a/supervisor/dabplus-enc-fb.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-[program:enc-fb]
-command=dabplus-enc -v http://fbpc5.epfl.ch:8001 -o tcp://localhost:9001 -r 32000 -b 80 -w dls.txt -p 34 -P dls.pad -D
-directory=/home/bram/
-autostart=true
-autorestart=true
-stderr_logfile=/home/bram/dab/mmbtools-aux/supervisor/enc-fb.err.log
-stdout_logfile=/home/bram/dab/mmbtools-aux/supervisor/enc-fb.out.log
diff --git a/supervisor/enc-fb.conf b/supervisor/enc-fb.conf
new file mode 100644
index 0000000..5de9266
--- /dev/null
+++ b/supervisor/enc-fb.conf
@@ -0,0 +1,15 @@
+[program:enc-fb]
+command=odr-audioenc -v http://fbpc5.epfl.ch:8001 -o tcp://localhost:9001 -r 32000 -b 80 -w dls.txt -p 34 -P dls.pad -D
+directory=/home/bram/
+autostart=true
+autorestart=true
+stderr_logfile=/home/bram/dab/mmbtools-aux/supervisor/enc-fb.err.log
+stdout_logfile=/home/bram/dab/mmbtools-aux/supervisor/enc-fb.out.log
+
+[program:pad-enc-fb]
+command=odr-padenc -o dls.pad -d dab/slides-fb -R -t dls.txt -c 15 -p 34
+directory=/home/bram/
+autostart=true
+autorestart=true
+stderr_logfile=/home/bram/dab/mmbtools-aux/supervisor/pad-enc-fb.err.log
+stdout_logfile=/home/bram/dab/mmbtools-aux/supervisor/pad-enc-fb.out.log
diff --git a/supervisor/enc-fip.conf b/supervisor/enc-fip.conf
index ee1d14c..c86a2bc 100644
--- a/supervisor/enc-fip.conf
+++ b/supervisor/enc-fip.conf
@@ -1,9 +1,25 @@
 [program:enc-fip]
-#command=toolame -V http://http://audio.scdn.arkena.com/11016/fip-midfi128.mp3 -b 128 -s 48 -p 34 -P /home/bram/dab/fip.pad tcp://localhost:9002
-command=dabplus-enc --dab -v http://http://audio.scdn.arkena.com/11016/fip-midfi128.mp3 -b 128 -s 48 -p 34 -P /home/bram/dab/fip.pad -o tcp://localhost:9002 -D
+#command=toolame -V http://audio.scdn.arkena.com/11016/fip-midfi128.mp3 -b 128 -s 48 -p 34 -P /home/bram/dab/fip.pad tcp://localhost:9002
+command=odr-audioenc --dab -v http://audio.scdn.arkena.com/11016/fip-midfi128.mp3 -b 128 -s 48 -p 34 -P /home/bram/dab/fip.pad -o tcp://localhost:9002 -D
 startretries=30
 directory=/home/bram/
 autostart=true
 autorestart=true
 stderr_logfile=/home/bram/dab/mmbtools-aux/supervisor/enc-fip.err.log
 stdout_logfile=/home/bram/dab/mmbtools-aux/supervisor/enc-fip.out.log
+
+[program:pad-enc-fip]
+command=odr-padenc -o fip.pad -d slides-fip -p 34 -R -t fip.dls -e
+directory=/home/bram/dab/
+autostart=true
+autorestart=true
+stderr_logfile=/home/bram/dab/mmbtools-aux/supervisor/pad-enc-fip.err.log
+stdout_logfile=/home/bram/dab/mmbtools-aux/supervisor/pad-enc-fip.out.log
+
+[program:cover-fip]
+command=/home/bram/dab/mmbtools-aux/fipcover.sh
+directory=/home/bram/dab/slides-fip
+autostart=true
+autorestart=true
+stderr_logfile=/home/bram/dab/mmbtools-aux/supervisor/cover-fip.err.log
+stdout_logfile=/home/bram/dab/mmbtools-aux/supervisor/cover-fip.out.log
diff --git a/supervisor/mot-fb.conf b/supervisor/mot-fb.conf
deleted file mode 100644
index 6138dda..0000000
--- a/supervisor/mot-fb.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-[program:mot-enc-fb]
-command=mot-encoder -o dls.pad -d dab/slides-fb -R -t dls.txt -c 15 -p 34
-directory=/home/bram/
-autostart=true
-autorestart=true
-stderr_logfile=/home/bram/dab/mmbtools-aux/supervisor/mot-enc-fb.err.log
-stdout_logfile=/home/bram/dab/mmbtools-aux/supervisor/mot-enc-fb.out.log
diff --git a/supervisor/mot-fip.conf b/supervisor/mot-fip.conf
deleted file mode 100644
index 2653a24..0000000
--- a/supervisor/mot-fip.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-[program:mot-enc-fip]
-command=mot-encoder -o fip.pad -d slides-fip -p 34 -R -t fip.dls -e
-directory=/home/bram/dab/
-autostart=true
-autorestart=true
-stderr_logfile=/home/bram/dab/mmbtools-aux/supervisor/mot-enc-fip.err.log
-stdout_logfile=/home/bram/dab/mmbtools-aux/supervisor/mot-enc-fip.out.log
-
-[program:cover-fip]
-command=/home/bram/dab/mmbtools-aux/fipcover.sh
-directory=/home/bram/dab/slides-fip
-autostart=true
-autorestart=true
-stderr_logfile=/home/bram/dab/mmbtools-aux/supervisor/cover-fip.err.log
-stdout_logfile=/home/bram/dab/mmbtools-aux/supervisor/cover-fip.out.log