Various adjustments for Trøndisk 2021.

diff --git a/nageru/ultimate.lua b/nageru/ultimate.lua
index 31dc87a0981c6db578bb2083c20eb60bbcc81f12..16cb5b1497d042c30e21e23eece7df91ba300f86 100644 (file)
--- a/nageru/ultimate.lua
+++ b/nageru/ultimate.lua
@@ -1,6 +1,6 @@
 -- Nageru theme for TFK mini-tournament 2017, based on the default theme.
 
-local futatabi_server = "http://10.42.0.2:9096"
+local futatabi_server = "http://10.42.0.1:9096"
 
 local state = {
        transition_start = -2.0,

diff --git a/nageru/ultimate.mapping b/nageru/ultimate.mapping
index 4e15b0462908553f6dd35564f9a59688f380d02b..61f09e2742e0374fe55834c34900ac1756344582 100644 (file)
--- a/nageru/ultimate.mapping
+++ b/nageru/ultimate.mapping
@@ -16,8 +16,8 @@ bus {
 bus {
   name: "Commentator 1"
   device_index: 0
-  source_channel_left: 2
-  source_channel_right: 2
+  source_channel_left: 1
+  source_channel_right: 1
 }
 bus {
   name: "Sound Shark"

diff --git a/ultimate.sh b/ultimate.sh
index bca2812b4243ced846319439d22c8ffcadb250c4..b2b1b20559500ac0637a0072b61417d16ed3e2c5 100755 (executable)
--- a/ultimate.sh
+++ b/ultimate.sh
@@ -28,7 +28,7 @@ fi
 # Start Nageru
 ( cd /home/sesse/dev/nageru/obj &&
  ./nageru \
-       -c 6 \
+       -c 8 \
        -t /home/sesse/dev/ultimatescore/nageru/ultimate.lua \
        -M /home/sesse/dev/ultimatescore/nageru/ultimate.mapping \
        -r /srv/ultimate/opptak \
@@ -41,8 +41,11 @@ fi
        --x264-bitrate 4500 \
        --http-audio-bitrate 128 \
        --quick-cut-keys \
-       --mjpeg-export-cards=1-5 \
-       -m 0,1 -m 1,2 -m 2,3 -m 3,4 -m 4,5 -m 5,0
+        --output-card 7 \
+        --output-card-unsynchronized \
+       --mjpeg-export-cards=0-3,5-6 \
+       #--mjpeg-export-cards=1-5 \
+       #-m 0,1 -m 1,2 -m 2,3 -m 3,4 -m 4,5 -m 5,0
        #-m 0,2 -m 1,3 -m 2,4 -m 3,5 -m 4,0 -m 5,1 \
 )