Merge branch 'master' of git.xpub.nl:/var/www/git.xpub.nl/repos/tgc3

usr/local/sbin/thewhispererindarkness.sh

@@ -6,7 +6,7 @@ FLOPPY="/media/floppy"
 MAINPY="${FLOPPY}/main.py"
 PYRUN="python ${MAINPY}"
 MAINPD="${FLOPPY}/main.pd"
-PDRUN="pd -lib import -path /usr/local/lib/pd-externals/net/ -path /usr/local/lib/pd-externals/osc/ -lib osc -lib udpreceive -oss -r 48000 -rt -nogui ${MAINPD}"
+PDRUN="pd -lib import -path /usr/local/lib/pd-externals/net/ -path /usr/local/lib/pd-externals/osc/ -path /usr/lib/pd/extra/cyclone -lib osc -lib udpreceive -oss -r 48000 -rt -nogui ${MAINPD}"
 
 stdbuf -oL -- udevadm monitor --udev -p ${FD} | while read -r -- STATE _ _ _ _
 do
@@ -39,7 +39,11 @@ do
 				echo "pd still running ... killing"
 				pkill -9 pd
 			fi
-
+ 			if [ "$(pgrep -f '^mpv')" ]
+			then
+				echo "mpv still running ... killing"
+				pkill -9 mpv
+			fi
 		fi
 	fi
 done