X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ultimate.sh;h=e06d620b27d246b36b5a5b5c30fe728cf95ae4b6;hb=165775c5c9cde9d59b980cc100f3f5b5a8c1e436;hp=d7b7c77ef3695489e31baa12e4dd6d175995cd6c;hpb=3be15e14fe46f1c035a9c33858264a1ceff6309d;p=ultimatescore

diff --git a/ultimate.sh b/ultimate.sh
index d7b7c77..e06d620 100755
--- a/ultimate.sh
+++ b/ultimate.sh
@@ -2,20 +2,23 @@
 
 if ! [ -d /srv/ultimate/opptak ]; then
 #	sudo mount /dev/sda1 /srv/ultimate
-	sudo mount /dev/disk/by-uuid/5ba6626a-7539-4b43-a9e1-b13243f1abdf /srv/ultimate
+	sudo mount /dev/disk/by-uuid/af9070b1-ba86-4240-83b3-8b866b86a46b /srv/ultimate
 fi
 
-if ! pidof ssh > /dev/null; then
-	echo "Set up SSH forwarding forwarding before running this script:"
-	echo "  ssh -R 9095:127.0.0.1:9095 stream@pannekake.samfundet.no"
+if ! ping -c 1 -t 1 10.42.1.1 >/dev/null; then
+	echo "Wireguard tunnel is not working (cannot ping 10.42.1.1), please fix before starting streaming."
 	exit
 fi
 
 # Set up BBR
-for DEV in $( ip link | grep UP | cut -d" " -f2 | cut -d: -f1 | grep -v lo ); do
+for DEV in $( ip link | grep UP | cut -d" " -f2 | cut -d: -f1 | cut -d@ -f1 | grep -v lo ); do
 	sudo tc qdisc add root dev $DEV fq
 done
 echo bbr | sudo tee /proc/sys/net/ipv4/tcp_congestion_control
+sudo ethtool -K enp0s31f6 tx off  # takes iperf from 750 to 920 mbit/sec!?
+
+# Make sure CSS is up-to-date
+sass score.scss score.css
 
 # Start the client
 if ! pidof ultimatescore > /dev/null; then
@@ -23,13 +26,12 @@ if ! pidof ultimatescore > /dev/null; then
 fi
 
 # Start Nageru
-( cd /home/sesse/dev/nageru &&
+( cd /home/sesse/dev/nageru/obj &&
  ./nageru \
-	--va-display /dev/dri/renderD129 \
 	-c 6 \
+	-t /home/sesse/dev/ultimatescore/nageru/ultimate.lua \
+	-M /home/sesse/dev/ultimatescore/nageru/ultimate.mapping \
 	-r /srv/ultimate/opptak \
-	-t ultimate.lua \
-	-M ultimate.mapping \
 	--midi-mapping=akai_midimix.midimapping \
 	--http-x264 \
 	--x264-speedcontrol \
@@ -39,8 +41,11 @@ fi
 	--x264-bitrate 4500 \
 	--http-audio-bitrate 128 \
 	--quick-cut-keys \
-	-m 0,2 -m 1,3 -m 2,4 -m 3,5 -m 4,0 -m 5,1
+	--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 \
 )
 
+
 	#--output-card 4 \
 	#--output-buffer-frames 8.0