X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ultimate.sh;h=5ef112e3c0ad5de38a5bbd72d1065ec5ec9f2dbc;hb=d14a429ea15184ad2659ba149f3caabef5bfd023;hp=8cff519f27ab75258afc5814b33a711d96a7c153;hpb=3b3c8ae126c476a9e75fd9238a6088f846593570;p=ultimatescore

diff --git a/ultimate.sh b/ultimate.sh
index 8cff519..5ef112e 100755
--- a/ultimate.sh
+++ b/ultimate.sh
@@ -2,7 +2,7 @@
 
 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
@@ -17,19 +17,21 @@ for DEV in $( ip link | grep UP | cut -d" " -f2 | cut -d: -f1 | grep -v lo ); do
 done
 echo bbr | sudo tee /proc/sys/net/ipv4/tcp_congestion_control
 
+# Make sure CSS is up-to-date
+sass score.scss score.css
+
 # Start the client
 if ! pidof ultimatescore > /dev/null; then
 	urxvt -e /home/sesse/dev/ultimatescore/client/ultimatescore &
 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 \
@@ -38,10 +40,11 @@ fi
 	--http-audio-codec aac \
 	--x264-bitrate 4500 \
 	--http-audio-bitrate 128 \
-	--http-coarse-timebase \
 	--quick-cut-keys \
-	-m 0,2 -m 1,3 -m 2,4 -m 3,5 -m 4,0 -m 5,1
+	--mjpeg-export-cards=0-5
+	#-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