summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2017-02-27 20:54:00 +0000
committerJonas Smedegaard <dr@jones.dk>2017-02-27 20:54:00 +0000
commit6ce57b47f050c39fbf28f4af639ef19608a74cfa (patch)
treeb6ef01437b5b8d9f0038ce9965792f7e69eb86f1
parentf953824dd2a18f15c2beeb5bd792f5f13fb75a44 (diff)
Use voctobox (not localhost) as voctocore host.
-rwxr-xr-xexample-scripts/control-server/set-audio-cam1.sh9
-rwxr-xr-xexample-scripts/control-server/set-audio-cam2.sh9
-rwxr-xr-xexample-scripts/control-server/set-composite-fullscreen.sh9
-rwxr-xr-xexample-scripts/control-server/set-composite-picture-in-picture.sh9
-rwxr-xr-xexample-scripts/control-server/set-composite-side-by-side-equal.sh9
-rwxr-xr-xexample-scripts/control-server/set-composite-side-by-side-preview.sh9
-rwxr-xr-xexample-scripts/control-server/set-stream-blank-nostream.sh9
-rwxr-xr-xexample-scripts/control-server/set-stream-blank-pause.sh9
-rwxr-xr-xexample-scripts/control-server/set-stream-live.sh9
-rwxr-xr-xexample-scripts/control-server/set-video-cam1.sh9
-rwxr-xr-xexample-scripts/control-server/set-video-cam2.sh9
-rwxr-xr-xexample-scripts/control-server/set-video-grabber.sh9
-rw-r--r--example-scripts/default-config.sh1
-rwxr-xr-xexample-scripts/ffmpeg/play-mixed-ffplay.sh9
-rwxr-xr-xexample-scripts/ffmpeg/playout-grabber-to-framebuffer.sh9
-rwxr-xr-xexample-scripts/ffmpeg/playout-mix-to-framebuffer.sh9
-rwxr-xr-xexample-scripts/ffmpeg/record-mixed-ffmpeg-segmented-timestamps.sh8
-rwxr-xr-xexample-scripts/ffmpeg/record-mixed-ffmpeg-segmented.sh9
-rwxr-xr-xexample-scripts/ffmpeg/record-mixed-ffmpeg.sh9
-rwxr-xr-xexample-scripts/ffmpeg/source-avsync-test-clip-as-cam1.sh3
-rwxr-xr-xexample-scripts/ffmpeg/source-avsync-test-clip-looped-as-cam1.sh3
-rwxr-xr-xexample-scripts/ffmpeg/source-background-loop.sh3
-rwxr-xr-xexample-scripts/ffmpeg/source-decklink-cam1.sh9
-rwxr-xr-xexample-scripts/ffmpeg/source-decklink-cam2.sh9
-rwxr-xr-xexample-scripts/ffmpeg/source-mjpg-framegrabber.sh3
-rwxr-xr-xexample-scripts/ffmpeg/source-nostream-music.sh3
-rwxr-xr-xexample-scripts/ffmpeg/source-nostream-pause-loop.sh3
-rwxr-xr-xexample-scripts/ffmpeg/source-testvideo-as-cam1.sh3
-rwxr-xr-xexample-scripts/ffmpeg/source-testvideo-as-cam2.sh3
-rwxr-xr-xexample-scripts/ffmpeg/stream-combined.sh10
-rwxr-xr-xexample-scripts/ffmpeg/stream-hd.sh9
-rwxr-xr-xexample-scripts/ffmpeg/stream-sd.sh9
-rwxr-xr-xexample-scripts/gstreamer/play-cam1-av.sh9
-rwxr-xr-xexample-scripts/gstreamer/play-mixed-audio.sh9
-rwxr-xr-xexample-scripts/gstreamer/play-mixed-av.sh9
-rwxr-xr-xexample-scripts/gstreamer/play-mixed-video.sh9
-rwxr-xr-xexample-scripts/gstreamer/play-mixer-video.sh9
-rwxr-xr-xexample-scripts/gstreamer/record-mixed-av.sh9
-rwxr-xr-xexample-scripts/gstreamer/source-all-videotestsrces.sh1
-rwxr-xr-xexample-scripts/gstreamer/source-avsync-test-clip-as-cam1.sh3
-rwxr-xr-xexample-scripts/gstreamer/source-videotestsrc-as-background-loop.sh3
-rwxr-xr-xexample-scripts/gstreamer/source-videotestsrc-as-cam1.sh3
-rwxr-xr-xexample-scripts/gstreamer/source-videotestsrc-as-cam2.sh3
-rwxr-xr-xexample-scripts/gstreamer/source-videotestsrc-as-grabber.sh3
-rwxr-xr-xexample-scripts/gstreamer/visualize-mixed-audio.sh9
-rwxr-xr-xexample-scripts/misc/demo-local.sh8
-rw-r--r--example-scripts/voctomidi/default-config.ini2
-rw-r--r--voctogui/default-config.ini2
48 files changed, 276 insertions, 47 deletions
diff --git a/example-scripts/control-server/set-audio-cam1.sh b/example-scripts/control-server/set-audio-cam1.sh
index 19d3b8e..a419636 100755
--- a/example-scripts/control-server/set-audio-cam1.sh
+++ b/example-scripts/control-server/set-audio-cam1.sh
@@ -1,2 +1,9 @@
#!/bin/sh
-echo set_audio cam1 | nc -q0 localhost 9999
+
+confdir="`dirname "$0"`/../"
+. $confdir/default-config.sh
+if [ -f $confdir/config.sh ]; then
+ . $confdir/config.sh
+fi
+
+echo set_audio cam1 | nc -q0 $MIXHOST 9999
diff --git a/example-scripts/control-server/set-audio-cam2.sh b/example-scripts/control-server/set-audio-cam2.sh
index 9177772..0e6cb00 100755
--- a/example-scripts/control-server/set-audio-cam2.sh
+++ b/example-scripts/control-server/set-audio-cam2.sh
@@ -1,2 +1,9 @@
#!/bin/sh
-echo set_audio cam2 | nc -q0 localhost 9999
+
+confdir="`dirname "$0"`/../"
+. $confdir/default-config.sh
+if [ -f $confdir/config.sh ]; then
+ . $confdir/config.sh
+fi
+
+echo set_audio cam2 | nc -q0 $MIXHOST 9999
diff --git a/example-scripts/control-server/set-composite-fullscreen.sh b/example-scripts/control-server/set-composite-fullscreen.sh
index 850e591..c2dbcd9 100755
--- a/example-scripts/control-server/set-composite-fullscreen.sh
+++ b/example-scripts/control-server/set-composite-fullscreen.sh
@@ -1,2 +1,9 @@
#!/bin/sh
-echo set_composite_mode fullscreen | nc -q0 localhost 9999
+
+confdir="`dirname "$0"`/../"
+. $confdir/default-config.sh
+if [ -f $confdir/config.sh ]; then
+ . $confdir/config.sh
+fi
+
+echo set_composite_mode fullscreen | nc -q0 $MIXHOST 9999
diff --git a/example-scripts/control-server/set-composite-picture-in-picture.sh b/example-scripts/control-server/set-composite-picture-in-picture.sh
index eae3bea..25462cc 100755
--- a/example-scripts/control-server/set-composite-picture-in-picture.sh
+++ b/example-scripts/control-server/set-composite-picture-in-picture.sh
@@ -1,2 +1,9 @@
#!/bin/sh
-echo set_composite_mode picture_in_picture | nc -q0 localhost 9999
+
+confdir="`dirname "$0"`/../"
+. $confdir/default-config.sh
+if [ -f $confdir/config.sh ]; then
+ . $confdir/config.sh
+fi
+
+echo set_composite_mode picture_in_picture | nc -q0 $MIXHOST 9999
diff --git a/example-scripts/control-server/set-composite-side-by-side-equal.sh b/example-scripts/control-server/set-composite-side-by-side-equal.sh
index 37e3357..8b655ad 100755
--- a/example-scripts/control-server/set-composite-side-by-side-equal.sh
+++ b/example-scripts/control-server/set-composite-side-by-side-equal.sh
@@ -1,2 +1,9 @@
#!/bin/sh
-echo set_composite_mode side_by_side_equal | nc -q0 localhost 9999
+
+confdir="`dirname "$0"`/../"
+. $confdir/default-config.sh
+if [ -f $confdir/config.sh ]; then
+ . $confdir/config.sh
+fi
+
+echo set_composite_mode side_by_side_equal | nc -q0 $MIXHOST 9999
diff --git a/example-scripts/control-server/set-composite-side-by-side-preview.sh b/example-scripts/control-server/set-composite-side-by-side-preview.sh
index dd8a04b..c596324 100755
--- a/example-scripts/control-server/set-composite-side-by-side-preview.sh
+++ b/example-scripts/control-server/set-composite-side-by-side-preview.sh
@@ -1,2 +1,9 @@
#!/bin/sh
-echo set_composite_mode side_by_side_preview | nc -q0 localhost 9999
+
+confdir="`dirname "$0"`/../"
+. $confdir/default-config.sh
+if [ -f $confdir/config.sh ]; then
+ . $confdir/config.sh
+fi
+
+echo set_composite_mode side_by_side_preview | nc -q0 $MIXHOST 9999
diff --git a/example-scripts/control-server/set-stream-blank-nostream.sh b/example-scripts/control-server/set-stream-blank-nostream.sh
index abdab4b..8f7e606 100755
--- a/example-scripts/control-server/set-stream-blank-nostream.sh
+++ b/example-scripts/control-server/set-stream-blank-nostream.sh
@@ -1,2 +1,9 @@
#!/bin/sh
-echo set_stream_blank nostream | nc -q0 localhost 9999
+
+confdir="`dirname "$0"`/../"
+. $confdir/default-config.sh
+if [ -f $confdir/config.sh ]; then
+ . $confdir/config.sh
+fi
+
+echo set_stream_blank nostream | nc -q0 $MIXHOST 9999
diff --git a/example-scripts/control-server/set-stream-blank-pause.sh b/example-scripts/control-server/set-stream-blank-pause.sh
index abf3580..c41ff56 100755
--- a/example-scripts/control-server/set-stream-blank-pause.sh
+++ b/example-scripts/control-server/set-stream-blank-pause.sh
@@ -1,2 +1,9 @@
#!/bin/sh
-echo set_stream_blank pause | nc -q0 localhost 9999
+
+confdir="`dirname "$0"`/../"
+. $confdir/default-config.sh
+if [ -f $confdir/config.sh ]; then
+ . $confdir/config.sh
+fi
+
+echo set_stream_blank pause | nc -q0 $MIXHOST 9999
diff --git a/example-scripts/control-server/set-stream-live.sh b/example-scripts/control-server/set-stream-live.sh
index e2584c8..e7479f0 100755
--- a/example-scripts/control-server/set-stream-live.sh
+++ b/example-scripts/control-server/set-stream-live.sh
@@ -1,2 +1,9 @@
#!/bin/sh
-echo set_stream_live | nc -q0 localhost 9999
+
+confdir="`dirname "$0"`/../"
+. $confdir/default-config.sh
+if [ -f $confdir/config.sh ]; then
+ . $confdir/config.sh
+fi
+
+echo set_stream_live | nc -q0 $MIXHOST 9999
diff --git a/example-scripts/control-server/set-video-cam1.sh b/example-scripts/control-server/set-video-cam1.sh
index d02b385..e6e70bb 100755
--- a/example-scripts/control-server/set-video-cam1.sh
+++ b/example-scripts/control-server/set-video-cam1.sh
@@ -1,2 +1,9 @@
#!/bin/sh
-echo set_video_a cam1 | nc -q0 localhost 9999
+
+confdir="`dirname "$0"`/../"
+. $confdir/default-config.sh
+if [ -f $confdir/config.sh ]; then
+ . $confdir/config.sh
+fi
+
+echo set_video_a cam1 | nc -q0 $MIXHOST 9999
diff --git a/example-scripts/control-server/set-video-cam2.sh b/example-scripts/control-server/set-video-cam2.sh
index c953ade..4b91fe8 100755
--- a/example-scripts/control-server/set-video-cam2.sh
+++ b/example-scripts/control-server/set-video-cam2.sh
@@ -1,2 +1,9 @@
#!/bin/sh
-echo set_video_a cam2 | nc -q0 localhost 9999
+
+confdir="`dirname "$0"`/../"
+. $confdir/default-config.sh
+if [ -f $confdir/config.sh ]; then
+ . $confdir/config.sh
+fi
+
+echo set_video_a cam2 | nc -q0 $MIXHOST 9999
diff --git a/example-scripts/control-server/set-video-grabber.sh b/example-scripts/control-server/set-video-grabber.sh
index ee39c3b..6413b8d 100755
--- a/example-scripts/control-server/set-video-grabber.sh
+++ b/example-scripts/control-server/set-video-grabber.sh
@@ -1,2 +1,9 @@
#!/bin/sh
-echo set_video_a grabber | nc -q0 localhost 9999
+
+confdir="`dirname "$0"`/../"
+. $confdir/default-config.sh
+if [ -f $confdir/config.sh ]; then
+ . $confdir/config.sh
+fi
+
+echo set_video_a grabber | nc -q0 $MIXHOST 9999
diff --git a/example-scripts/default-config.sh b/example-scripts/default-config.sh
index 8dbf1ba..20a5015 100644
--- a/example-scripts/default-config.sh
+++ b/example-scripts/default-config.sh
@@ -3,3 +3,4 @@ WIDTH=320
HEIGHT=176
FRAMERATE=25
AUDIORATE=48000
+MIXHOST=voctobox
diff --git a/example-scripts/ffmpeg/play-mixed-ffplay.sh b/example-scripts/ffmpeg/play-mixed-ffplay.sh
index 733c279..40e3bcf 100755
--- a/example-scripts/ffmpeg/play-mixed-ffplay.sh
+++ b/example-scripts/ffmpeg/play-mixed-ffplay.sh
@@ -1,2 +1,9 @@
#!/bin/sh
-ffplay tcp://localhost:11000
+
+confdir="`dirname "$0"`/../"
+. $confdir/default-config.sh
+if [ -f $confdir/config.sh ]; then
+ . $confdir/config.sh
+fi
+
+ffplay tcp://$MIXHOST:11000
diff --git a/example-scripts/ffmpeg/playout-grabber-to-framebuffer.sh b/example-scripts/ffmpeg/playout-grabber-to-framebuffer.sh
index 9369821..849f5ba 100755
--- a/example-scripts/ffmpeg/playout-grabber-to-framebuffer.sh
+++ b/example-scripts/ffmpeg/playout-grabber-to-framebuffer.sh
@@ -1,9 +1,16 @@
#!/bin/sh
+
+confdir="`dirname "$0"`/../"
+. $confdir/default-config.sh
+if [ -f $confdir/config.sh ]; then
+ . $confdir/config.sh
+fi
+
fbset -g 1920 1080 1920 1080 32
echo 0 >/sys/class/graphics/fbcon/cursor_blink
ffmpeg \
- -i tcp://localhost:13002 \
+ -i tcp://$MIXHOST:13002 \
-map 0:v \
-c:v rawvideo \
-pix_fmt bgra \
diff --git a/example-scripts/ffmpeg/playout-mix-to-framebuffer.sh b/example-scripts/ffmpeg/playout-mix-to-framebuffer.sh
index 1adcd58..5c1077e 100755
--- a/example-scripts/ffmpeg/playout-mix-to-framebuffer.sh
+++ b/example-scripts/ffmpeg/playout-mix-to-framebuffer.sh
@@ -1,9 +1,16 @@
#!/bin/sh
+
+confdir="`dirname "$0"`/../"
+. $confdir/default-config.sh
+if [ -f $confdir/config.sh ]; then
+ . $confdir/config.sh
+fi
+
fbset -g 1920 1080 1920 1080 32
echo 0 >/sys/class/graphics/fbcon/cursor_blink
ffmpeg \
- -i tcp://localhost:11000 \
+ -i tcp://$MIXHOST:11000 \
-map 0:v \
-c:v rawvideo \
-pix_fmt bgra \
diff --git a/example-scripts/ffmpeg/record-mixed-ffmpeg-segmented-timestamps.sh b/example-scripts/ffmpeg/record-mixed-ffmpeg-segmented-timestamps.sh
index 48d8d1f..f8b1a7b 100755
--- a/example-scripts/ffmpeg/record-mixed-ffmpeg-segmented-timestamps.sh
+++ b/example-scripts/ffmpeg/record-mixed-ffmpeg-segmented-timestamps.sh
@@ -1,12 +1,18 @@
#!/bin/sh
+confdir="`dirname "$0"`/../"
+. $confdir/default-config.sh
+if [ -f $confdir/config.sh ]; then
+ . $confdir/config.sh
+fi
+
# WARNING: Using '%t' in the output filename requires a patched FFmpeg!
# If this command fails with the message 'Invalid segment filename template',
# you do not have such a FFmpeg version.
ffmpeg \
-y -nostdin \
- -i tcp://localhost:11000 \
+ -i tcp://$MIXHOST:11000 \
-ac 2 -channel_layout 2 -aspect 16:9 \
-map 0:v -c:v:0 mpeg2video -pix_fmt:v:0 yuv422p -qscale:v:0 2 -qmin:v:0 2 -qmax:v:0 7 -keyint_min 0 -bf:0 0 -g:0 0 -intra:0 -maxrate:0 90M \
-map 0:a -c:a:0 mp2 -b:a:0 192k -ac:a:0 2 -ar:a:0 48000 \
diff --git a/example-scripts/ffmpeg/record-mixed-ffmpeg-segmented.sh b/example-scripts/ffmpeg/record-mixed-ffmpeg-segmented.sh
index 341aa27..4167e92 100755
--- a/example-scripts/ffmpeg/record-mixed-ffmpeg-segmented.sh
+++ b/example-scripts/ffmpeg/record-mixed-ffmpeg-segmented.sh
@@ -1,7 +1,14 @@
#!/bin/sh
+
+confdir="`dirname "$0"`/../"
+. $confdir/default-config.sh
+if [ -f $confdir/config.sh ]; then
+ . $confdir/config.sh
+fi
+
ffmpeg \
-y -nostdin \
- -i tcp://localhost:11000 \
+ -i tcp://$MIXHOST:11000 \
-ac 2 -channel_layout 2 -aspect 16:9 \
-map 0:v -c:v:0 mpeg2video -pix_fmt:v:0 yuv422p -qscale:v:0 2 -qmin:v:0 2 -qmax:v:0 7 -keyint_min 0 -bf:0 0 -g:0 0 -intra:0 -maxrate:0 90M \
-map 0:a -c:a:0 mp2 -b:a:0 192k -ac:a:0 2 -ar:a:0 48000 \
diff --git a/example-scripts/ffmpeg/record-mixed-ffmpeg.sh b/example-scripts/ffmpeg/record-mixed-ffmpeg.sh
index c9b583e..81df928 100755
--- a/example-scripts/ffmpeg/record-mixed-ffmpeg.sh
+++ b/example-scripts/ffmpeg/record-mixed-ffmpeg.sh
@@ -1,7 +1,14 @@
#!/bin/sh
+
+confdir="`dirname "$0"`/../"
+. $confdir/default-config.sh
+if [ -f $confdir/config.sh ]; then
+ . $confdir/config.sh
+fi
+
ffmpeg \
-y -nostdin \
- -i tcp://localhost:11000 \
+ -i tcp://$MIXHOST:11000 \
-ac 2 -channel_layout 2 -aspect 16:9 \
-map 0:v -c:v:0 mpeg2video -pix_fmt:v:0 yuv422p -qscale:v:0 2 -qmin:v:0 2 -qmax:v:0 7 -keyint_min 0 -bf:0 0 -g:0 0 -intra:0 -maxrate:0 90M \
-map 0:a -c:a:0 mp2 -b:a:0 192k -ac:a:0 2 -ar:a:0 48000 \
diff --git a/example-scripts/ffmpeg/source-avsync-test-clip-as-cam1.sh b/example-scripts/ffmpeg/source-avsync-test-clip-as-cam1.sh
index b248ee8..5619445 100755
--- a/example-scripts/ffmpeg/source-avsync-test-clip-as-cam1.sh
+++ b/example-scripts/ffmpeg/source-avsync-test-clip-as-cam1.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+
confdir="`dirname "$0"`/../"
. $confdir/default-config.sh
if [ -f $confdir/config.sh ]; then
@@ -16,4 +17,4 @@ ffmpeg -y -nostdin \
-c:a pcm_s16le \
-pix_fmt yuv420p \
-f matroska \
- tcp://localhost:10000
+ tcp://$MIXHOST:10000
diff --git a/example-scripts/ffmpeg/source-avsync-test-clip-looped-as-cam1.sh b/example-scripts/ffmpeg/source-avsync-test-clip-looped-as-cam1.sh
index 55a504c..2f16407 100755
--- a/example-scripts/ffmpeg/source-avsync-test-clip-looped-as-cam1.sh
+++ b/example-scripts/ffmpeg/source-avsync-test-clip-looped-as-cam1.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+
confdir="`dirname "$0"`/../"
. $confdir/default-config.sh
if [ -f $confdir/config.sh ]; then
@@ -17,4 +18,4 @@ wget -nc -O /tmp/avsync.ts http://c3voc.mazdermind.de/testfiles/avsync.ts
-c:a pcm_s16le \
-pix_fmt yuv420p \
-f matroska \
- tcp://localhost:10000
+ tcp://$MIXHOST:10000
diff --git a/example-scripts/ffmpeg/source-background-loop.sh b/example-scripts/ffmpeg/source-background-loop.sh
index a88c39d..e352ecb 100755
--- a/example-scripts/ffmpeg/source-background-loop.sh
+++ b/example-scripts/ffmpeg/source-background-loop.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+
confdir="`dirname "$0"`/../"
. $confdir/default-config.sh
if [ -f $confdir/config.sh ]; then
@@ -15,4 +16,4 @@ while true; do cat /tmp/bg.ts || exit 1; done |\
-c:v rawvideo \
-pix_fmt yuv420p \
-f matroska \
- tcp://localhost:16000
+ tcp://$MIXHOST:16000
diff --git a/example-scripts/ffmpeg/source-decklink-cam1.sh b/example-scripts/ffmpeg/source-decklink-cam1.sh
index 42b96af..fab2080 100755
--- a/example-scripts/ffmpeg/source-decklink-cam1.sh
+++ b/example-scripts/ffmpeg/source-decklink-cam1.sh
@@ -1,8 +1,15 @@
#!/bin/sh
+
+confdir="`dirname "$0"`/../"
+. $confdir/default-config.sh
+if [ -f $confdir/config.sh ]; then
+ . $confdir/config.sh
+fi
+
ffmpeg -y -nostdin \
-f decklink \
-i 'DeckLink Mini Recorder (1)@10' \
-c:v rawvideo -c:a pcm_s16le \
-pix_fmt yuv420p \
-f matroska \
- tcp://localhost:10000
+ tcp://$MIXHOST:10000
diff --git a/example-scripts/ffmpeg/source-decklink-cam2.sh b/example-scripts/ffmpeg/source-decklink-cam2.sh
index baee933..2336a76 100755
--- a/example-scripts/ffmpeg/source-decklink-cam2.sh
+++ b/example-scripts/ffmpeg/source-decklink-cam2.sh
@@ -1,8 +1,15 @@
#!/bin/sh
+
+confdir="`dirname "$0"`/../"
+. $confdir/default-config.sh
+if [ -f $confdir/config.sh ]; then
+ . $confdir/config.sh
+fi
+
ffmpeg -y -nostdin \
-f decklink \
-i 'DeckLink Mini Recorder (2)@10' \
-c:v rawvideo -c:a pcm_s16le \
-pix_fmt yuv420p \
-f matroska \
- tcp://localhost:10001
+ tcp://$MIXHOST:10001
diff --git a/example-scripts/ffmpeg/source-mjpg-framegrabber.sh b/example-scripts/ffmpeg/source-mjpg-framegrabber.sh
index e5797ad..a44f068 100755
--- a/example-scripts/ffmpeg/source-mjpg-framegrabber.sh
+++ b/example-scripts/ffmpeg/source-mjpg-framegrabber.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+
confdir="`dirname "$0"`/../"
. $confdir/default-config.sh
if [ -f $confdir/config.sh ]; then
@@ -16,4 +17,4 @@ ffmpeg -y -nostdin -xerror \
-c:v rawvideo \
-pix_fmt yuv420p \
-f matroska \
- tcp://localhost:10002
+ tcp://$MIXHOST:10002
diff --git a/example-scripts/ffmpeg/source-nostream-music.sh b/example-scripts/ffmpeg/source-nostream-music.sh
index 27df45a..d185c62 100755
--- a/example-scripts/ffmpeg/source-nostream-music.sh
+++ b/example-scripts/ffmpeg/source-nostream-music.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+
confdir="`dirname "$0"`/../"
. $confdir/default-config.sh
if [ -f $confdir/config.sh ]; then
@@ -13,7 +14,7 @@ while true; do
-af aresample=$AUDIORATE \
-c:a pcm_s16le \
-f matroska \
- tcp://localhost:18000
+ tcp://$MIXHOST:18000
sleep 1;
done
diff --git a/example-scripts/ffmpeg/source-nostream-pause-loop.sh b/example-scripts/ffmpeg/source-nostream-pause-loop.sh
index f5c0b53..e6d92ce 100755
--- a/example-scripts/ffmpeg/source-nostream-pause-loop.sh
+++ b/example-scripts/ffmpeg/source-nostream-pause-loop.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+
confdir="`dirname "$0"`/../"
. $confdir/default-config.sh
if [ -f $confdir/config.sh ]; then
@@ -15,4 +16,4 @@ while true; do cat /tmp/pause.ts || exit 1; done |\
-c:v rawvideo \
-pix_fmt yuv420p \
-f matroska \
- tcp://localhost:17000
+ tcp://$MIXHOST:17000
diff --git a/example-scripts/ffmpeg/source-testvideo-as-cam1.sh b/example-scripts/ffmpeg/source-testvideo-as-cam1.sh
index 33dd7f8..d81c205 100755
--- a/example-scripts/ffmpeg/source-testvideo-as-cam1.sh
+++ b/example-scripts/ffmpeg/source-testvideo-as-cam1.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+
confdir="`dirname "$0"`/../"
. $confdir/default-config.sh
if [ -f $confdir/config.sh ]; then
@@ -17,4 +18,4 @@ ffmpeg -y -nostdin \
-c:v rawvideo \
-c:a pcm_s16le \
-f matroska \
- tcp://localhost:10000
+ tcp://$MIXHOST:10000
diff --git a/example-scripts/ffmpeg/source-testvideo-as-cam2.sh b/example-scripts/ffmpeg/source-testvideo-as-cam2.sh
index dec6a9f..3460adf 100755
--- a/example-scripts/ffmpeg/source-testvideo-as-cam2.sh
+++ b/example-scripts/ffmpeg/source-testvideo-as-cam2.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+
confdir="`dirname "$0"`/../"
. $confdir/default-config.sh
if [ -f $confdir/config.sh ]; then
@@ -17,4 +18,4 @@ ffmpeg -y -nostdin \
-c:v rawvideo \
-c:a pcm_s16le \
-f matroska \
- tcp://localhost:10001
+ tcp://$MIXHOST:10001
diff --git a/example-scripts/ffmpeg/stream-combined.sh b/example-scripts/ffmpeg/stream-combined.sh
index 9ee74f3..26aec64 100755
--- a/example-scripts/ffmpeg/stream-combined.sh
+++ b/example-scripts/ffmpeg/stream-combined.sh
@@ -1,5 +1,11 @@
#!/bin/sh
+confdir="`dirname "$0"`/../"
+. $confdir/default-config.sh
+if [ -f $confdir/config.sh ]; then
+ . $confdir/config.sh
+fi
+
#
# a variation of this script was used to generate all combinations of
# [native|translated|stereo]_[hd|sd|slides] streams for 33c3
@@ -7,9 +13,9 @@
ffmpeg -y -nostdin \
-thread_queue_size 512 \
- -i tcp://localhost:15000 \
+ -i tcp://$MIXHOST:15000 \
-thread_queue_size 512 \
- -i tcp://localhost:13000 \
+ -i tcp://$MIXHOST:13000 \
-threads:0 0 \
-aspect 16:9 \
-filter_complex '
diff --git a/example-scripts/ffmpeg/stream-hd.sh b/example-scripts/ffmpeg/stream-hd.sh
index b0c0e07..1210ecf 100755
--- a/example-scripts/ffmpeg/stream-hd.sh
+++ b/example-scripts/ffmpeg/stream-hd.sh
@@ -1,7 +1,14 @@
#!/bin/sh
+
+confdir="`dirname "$0"`/../"
+. $confdir/default-config.sh
+if [ -f $confdir/config.sh ]; then
+ . $confdir/config.sh
+fi
+
wget -nc -O /tmp/overlay_hd.png http://c3voc.mazdermind.de/testfiles/overlay_hd.png
ffmpeg -y -nostdin \
- -i tcp://localhost:15000 \
+ -i tcp://$MIXHOST:15000 \
-threads:0 0 \
-aspect 16:9 \
-c:v libx264 \
diff --git a/example-scripts/ffmpeg/stream-sd.sh b/example-scripts/ffmpeg/stream-sd.sh
index 26a7cfb..83db56a 100755
--- a/example-scripts/ffmpeg/stream-sd.sh
+++ b/example-scripts/ffmpeg/stream-sd.sh
@@ -1,7 +1,14 @@
#!/bin/sh
+
+confdir="`dirname "$0"`/../"
+. $confdir/default-config.sh
+if [ -f $confdir/config.sh ]; then
+ . $confdir/config.sh
+fi
+
wget -nc -O /tmp/overlay_hd.png http://c3voc.mazdermind.de/testfiles/overlay_hd.png
ffmpeg -y -nostdin \
- -i tcp://localhost:11000 \
+ -i tcp://$MIXHOST:11000 \
-threads:0 0 \
-aspect 16:9 \
-c:v libx264 \
diff --git a/example-scripts/gstreamer/play-cam1-av.sh b/example-scripts/gstreamer/play-cam1-av.sh
index ab237ec..b4b48ea 100755
--- a/example-scripts/gstreamer/play-cam1-av.sh
+++ b/example-scripts/gstreamer/play-cam1-av.sh
@@ -1,6 +1,13 @@
#!/bin/sh
+
+confdir="`dirname "$0"`/../"
+. $confdir/default-config.sh
+if [ -f $confdir/config.sh ]; then
+ . $confdir/config.sh
+fi
+
gst-launch-1.0 \
- tcpclientsrc host=localhost port=13000 !\
+ tcpclientsrc host=$MIXHOST port=13000 !\
matroskademux name=demux \
\
demux. !\
diff --git a/example-scripts/gstreamer/play-mixed-audio.sh b/example-scripts/gstreamer/play-mixed-audio.sh
index a1dfa1f..426a1ce 100755
--- a/example-scripts/gstreamer/play-mixed-audio.sh
+++ b/example-scripts/gstreamer/play-mixed-audio.sh
@@ -1,5 +1,12 @@
#!/bin/sh
+
+confdir="`dirname "$0"`/../"
+. $confdir/default-config.sh
+if [ -f $confdir/config.sh ]; then
+ . $confdir/config.sh
+fi
+
gst-launch-1.0 \
- tcpclientsrc host=localhost port=11000 !\
+ tcpclientsrc host=$MIXHOST port=11000 !\
matroskademux !\
alsasink ts-offset=500000000
diff --git a/example-scripts/gstreamer/play-mixed-av.sh b/example-scripts/gstreamer/play-mixed-av.sh
index 7437f43..c2a9636 100755
--- a/example-scripts/gstreamer/play-mixed-av.sh
+++ b/example-scripts/gstreamer/play-mixed-av.sh
@@ -1,6 +1,13 @@
#!/bin/sh
+
+confdir="`dirname "$0"`/../"
+. $confdir/default-config.sh
+if [ -f $confdir/config.sh ]; then
+ . $confdir/config.sh
+fi
+
gst-launch-1.0 \
- tcpclientsrc host=localhost port=11000 !\
+ tcpclientsrc host=$MIXHOST port=11000 !\
matroskademux name=demux \
\
demux. !\
diff --git a/example-scripts/gstreamer/play-mixed-video.sh b/example-scripts/gstreamer/play-mixed-video.sh
index 49cc6f7..5fd4fac 100755
--- a/example-scripts/gstreamer/play-mixed-video.sh
+++ b/example-scripts/gstreamer/play-mixed-video.sh
@@ -1,6 +1,13 @@
#!/bin/sh
+
+confdir="`dirname "$0"`/../"
+. $confdir/default-config.sh
+if [ -f $confdir/config.sh ]; then
+ . $confdir/config.sh
+fi
+
gst-launch-1.0 \
- tcpclientsrc host=localhost port=11000 !\
+ tcpclientsrc host=$MIXHOST port=11000 !\
matroskademux !\
glupload !\
glimagesink ts-offset=500000000
diff --git a/example-scripts/gstreamer/play-mixer-video.sh b/example-scripts/gstreamer/play-mixer-video.sh
index 49cc6f7..5fd4fac 100755
--- a/example-scripts/gstreamer/play-mixer-video.sh
+++ b/example-scripts/gstreamer/play-mixer-video.sh
@@ -1,6 +1,13 @@
#!/bin/sh
+
+confdir="`dirname "$0"`/../"
+. $confdir/default-config.sh
+if [ -f $confdir/config.sh ]; then
+ . $confdir/config.sh
+fi
+
gst-launch-1.0 \
- tcpclientsrc host=localhost port=11000 !\
+ tcpclientsrc host=$MIXHOST port=11000 !\
matroskademux !\
glupload !\
glimagesink ts-offset=500000000
diff --git a/example-scripts/gstreamer/record-mixed-av.sh b/example-scripts/gstreamer/record-mixed-av.sh
index b8818c6..a1b4c84 100755
--- a/example-scripts/gstreamer/record-mixed-av.sh
+++ b/example-scripts/gstreamer/record-mixed-av.sh
@@ -1,6 +1,13 @@
#!/bin/sh
+
+confdir="`dirname "$0"`/../"
+. $confdir/default-config.sh
+if [ -f $confdir/config.sh ]; then
+ . $confdir/config.sh
+fi
+
gst-launch-1.0 \
- tcpclientsrc host=localhost port=11000 !\
+ tcpclientsrc host=$MIXHOST port=11000 !\
matroskademux name=demux \
\
demux. !\
diff --git a/example-scripts/gstreamer/source-all-videotestsrces.sh b/example-scripts/gstreamer/source-all-videotestsrces.sh
index a733107..8e28335 100755
--- a/example-scripts/gstreamer/source-all-videotestsrces.sh
+++ b/example-scripts/gstreamer/source-all-videotestsrces.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+
confdir="`dirname "$0"`/../"
. $confdir/default-config.sh
if [ -f $confdir/config.sh ]; then
diff --git a/example-scripts/gstreamer/source-avsync-test-clip-as-cam1.sh b/example-scripts/gstreamer/source-avsync-test-clip-as-cam1.sh
index 5c77882..bc2172b 100755
--- a/example-scripts/gstreamer/source-avsync-test-clip-as-cam1.sh
+++ b/example-scripts/gstreamer/source-avsync-test-clip-as-cam1.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+
confdir="`dirname "$0"`/../"
. $confdir/default-config.sh
if [ -f $confdir/config.sh ]; then
@@ -26,4 +27,4 @@ gst-launch-1.0 \
mux. \
\
matroskamux name=mux !\
- tcpclientsink host=localhost port=10000
+ tcpclientsink host=$MIXHOST port=10000
diff --git a/example-scripts/gstreamer/source-videotestsrc-as-background-loop.sh b/example-scripts/gstreamer/source-videotestsrc-as-background-loop.sh
index b889517..3a43ec3 100755
--- a/example-scripts/gstreamer/source-videotestsrc-as-background-loop.sh
+++ b/example-scripts/gstreamer/source-videotestsrc-as-background-loop.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+
confdir="`dirname "$0"`/../"
. $confdir/default-config.sh
if [ -f $confdir/config.sh ]; then
@@ -11,4 +12,4 @@ gst-launch-1.0 \
mux. \
\
matroskamux name=mux !\
- tcpclientsink host=localhost port=16000
+ tcpclientsink host=$MIXHOST port=16000
diff --git a/example-scripts/gstreamer/source-videotestsrc-as-cam1.sh b/example-scripts/gstreamer/source-videotestsrc-as-cam1.sh
index 5d05a25..e79ee91 100755
--- a/example-scripts/gstreamer/source-videotestsrc-as-cam1.sh
+++ b/example-scripts/gstreamer/source-videotestsrc-as-cam1.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+
confdir="`dirname "$0"`/../"
. $confdir/default-config.sh
if [ -f $confdir/config.sh ]; then
@@ -15,4 +16,4 @@ gst-launch-1.0 \
mux. \
\
matroskamux name=mux !\
- tcpclientsink host=localhost port=10000
+ tcpclientsink host=$MIXHOST port=10000
diff --git a/example-scripts/gstreamer/source-videotestsrc-as-cam2.sh b/example-scripts/gstreamer/source-videotestsrc-as-cam2.sh
index a89de52..8380680 100755
--- a/example-scripts/gstreamer/source-videotestsrc-as-cam2.sh
+++ b/example-scripts/gstreamer/source-videotestsrc-as-cam2.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+
confdir="`dirname "$0"`/../"
. $confdir/default-config.sh
if [ -f $confdir/config.sh ]; then
@@ -15,4 +16,4 @@ gst-launch-1.0 \
mux. \
\
matroskamux name=mux !\
- tcpclientsink host=localhost port=10001
+ tcpclientsink host=$MIXHOST port=10001
diff --git a/example-scripts/gstreamer/source-videotestsrc-as-grabber.sh b/example-scripts/gstreamer/source-videotestsrc-as-grabber.sh
index 005b027..e921a89 100755
--- a/example-scripts/gstreamer/source-videotestsrc-as-grabber.sh
+++ b/example-scripts/gstreamer/source-videotestsrc-as-grabber.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+
confdir="`dirname "$0"`/../"
. $confdir/default-config.sh
if [ -f $confdir/config.sh ]; then
@@ -15,4 +16,4 @@ gst-launch-1.0 \
mux. \
\
matroskamux name=mux !\
- tcpclientsink host=localhost port=10002
+ tcpclientsink host=$MIXHOST port=10002
diff --git a/example-scripts/gstreamer/visualize-mixed-audio.sh b/example-scripts/gstreamer/visualize-mixed-audio.sh
index ce9bc0a..84c2e0a 100755
--- a/example-scripts/gstreamer/visualize-mixed-audio.sh
+++ b/example-scripts/gstreamer/visualize-mixed-audio.sh
@@ -1,6 +1,13 @@
#!/bin/sh
+
+confdir="`dirname "$0"`/../"
+. $confdir/default-config.sh
+if [ -f $confdir/config.sh ]; then
+ . $confdir/config.sh
+fi
+
gst-launch-1.0 \
- tcpclientsrc host=localhost port=13000 !\
+ tcpclientsrc host=$MIXHOST port=13000 !\
matroskademux !\
audioconvert !\
wavescope shader=none style=lines !\
diff --git a/example-scripts/misc/demo-local.sh b/example-scripts/misc/demo-local.sh
index bb57e45..f985fb1 100755
--- a/example-scripts/misc/demo-local.sh
+++ b/example-scripts/misc/demo-local.sh
@@ -1,5 +1,11 @@
#!/bin/bash
+confdir="`dirname "$0"`/../"
+. $confdir/default-config.sh
+if [ -f $confdir/config.sh ]; then
+ . $confdir/config.sh
+fi
+
../../voctocore/voctocore.py &
PID=$!
echo "PID=$PID"
@@ -10,6 +16,6 @@ sleep 1
../ffmpeg/av-record-output-ffmpeg.sh &
#../ffmpeg/stream-hd.sh &
../control-server/demo-cycle-modes.sh &
-ffplay tcp://localhost:11000
+ffplay tcp://$MIXHOST:11000
kill $PID
wait
diff --git a/example-scripts/voctomidi/default-config.ini b/example-scripts/voctomidi/default-config.ini
index 8e68bf3..08b4b7b 100644
--- a/example-scripts/voctomidi/default-config.ini
+++ b/example-scripts/voctomidi/default-config.ini
@@ -1,5 +1,5 @@
[server]
-host=localhost
+host=voctomix
[midi]
device=nanoPAD
diff --git a/voctogui/default-config.ini b/voctogui/default-config.ini
index 367bc26..b764386 100644
--- a/voctogui/default-config.ini
+++ b/voctogui/default-config.ini
@@ -1,5 +1,5 @@
[server]
-host=localhost
+host=voctobox
[previews]
;width=320