5 files changed, 68 insertions, 35 deletions
diff --git a/roles/obs/templates/bbb b/roles/obs/templates/bbb
index c12702c..b7c508f 100755
--- a/roles/obs/templates/bbb
+++ b/roles/obs/templates/bbb
@@ -3,17 +3,13 @@
 # {{ ansible_managed }}
 
 # Kill the background music if playing
-if screen -list | grep -q background; then
-    screen -S background -X quit
-fi
+/usr/local/bin/reset-state
 
 # Update the overlay
 SLUG=$1
 overlay $SLUG
-killall -s TERM firefox-esr
 firefox https://media.emacsconf.org/{{ emacsconf_year }}/backstage/assets/redirects/open/bbb-$SLUG.html &
 sleep 5
-xdotool search --class firefox windowactivate --sync
 xdotool key Return
 xdotool key F11
 wait
diff --git a/roles/obs/templates/music b/roles/obs/templates/music
index 29c5ddb..3e729ec 100755
--- a/roles/obs/templates/music
+++ b/roles/obs/templates/music
@@ -1,5 +1,5 @@
 if screen -list | grep -q background; then
   echo "Already running in screen, attach with screen -x background"
 else
-  screen -dmS background /bin/bash -c "mpv ~/stream/background.wav --loop=yes"
+  screen -dmS background /bin/bash -c "mpv {{ background_music_dir }}/* --shuffle --loop=inf --volume={{ background_music_volume }}"
 fi
diff --git a/roles/obs/templates/play b/roles/obs/templates/play
index 20fd24c..22f58c7 100755
--- a/roles/obs/templates/play
+++ b/roles/obs/templates/play
@@ -2,19 +2,53 @@
 # Play intro if recorded, then play files
 # {{ ansible_managed }}
 
-# Kill the background music if playing
-if screen -list | grep -q background; then
-    screen -S background -X quit
-fi
+shopt -s nullglob
+
+# play-with-intro $SLUG
+YEAR="{{ emacsconf_year }}"
+BASE_DIR="{{ emacsconf_caption_dir }}"
+CACHE_DIR="{{ emacsconf_caption_dir }}/cache"
+FIREFOX_NAME=firefox-esr
+SLUG=$1
+PREFIX=$(get-file-prefix $SLUG)
+
+/usr/local/bin/reset-state
 
 # Update the overlay
-FILE=$1
-if [[ ! -f $FILE ]]; then
-    LIST=({{ emacsconf_caption_dir }}/assets/stream/emacsconf-{{ emacsconf_year }}-$FILE*--main.webm)
+overlay $SLUG
+
+# Play the video if it exists. If it doesn't exist, switch to the BBB room and stop processing.
+if [ "x$TEST_MODE" = "x" ]; then
+  LIST=($BASE_DIR/assets/stream/{{ emacsconf_id }}-{{ emacsconf_year }}-$SLUG*--main.webm)
+else
+  LIST=($BASE_DIR/assets/test/{{ emacsconf_id }}-{{ emacsconf_year }}-$SLUG*--main.webm)
+fi
+FILE="${LIST[0]}"
+# No file in the stream directory; check for original files in the stream directory, then check the cache
+NOSUB=""
+if [[ ! -f "$FILE" ]]; then
+		# Is there a cache file or an original file?
+		LIST=($CACHE_DIR/{{ emacsconf_id }}-{{ emacsconf_year }}-$SLUG*--main.webm)
     FILE="${LIST[0]}"
-    BY_SLUG=1
+		if [[ ! -f $FILE ]]; then
+				LIST=($CACHE_DIR/{{ emacsconf_id }}-{{ emacsconf_year }}-$SLUG*--original.*)
+				FILE="${LIST[0]}"
+		fi
+		echo "Candidate: " $FILE
+		SUBS=($CACHE_DIR/{{ emacsconf_id }}-{{ emacsconf_year }}-$SLUG*--main.vtt)
+		if [[ -f "${SUBS[0]}"  ]]; then
+		  if ! cat ${SUBS[0]} | head -1 | grep -q captioned ; then
+				echo "Skipping subtitles because they're not edited"
+				NOSUB="--sub-visibility=no"
+			else
+					NOSUB="--sub-visibility=yes"
+			fi
+		fi
+fi
+
+if [[ -f "$FILE" ]]; then
+  screen -mS talk /bin/bash -c "mpv $NOSUB $FILE"
+else
+	/usr/local/bin/bbb $SLUG
+  exit 0
 fi
-shift
-SLUG=$(echo "$FILE" | perl -ne 'if (/emacsconf-[0-9]*-(.*?)--/) { print $1; } else { print; }')
-overlay $SLUG
-mpv $FILE $* &
diff --git a/roles/obs/templates/play-with-intro b/roles/obs/templates/play-with-intro
index 1b1b9a5..7f7865b 100755
--- a/roles/obs/templates/play-with-intro
+++ b/roles/obs/templates/play-with-intro
@@ -2,23 +2,26 @@
 # Play intro if recorded, then play files
 # {{ ansible_managed }}
 
-# Kill the background music if playing
-if screen -list | grep -q background; then
-    screen -S background -X quit
-fi
+# play-with-intro $SLUG
+YEAR="{{ emacsconf_year }}"
+BASE_DIR="{{ emacsconf_caption_dir }}"
+CACHE_DIR="{{ emacsconf_caption_dir }}/cache"
+FIREFOX_NAME=firefox-esr
+SLUG=$1
+PREFIX=$(get-file-prefix $SLUG)
+
+/usr/local/bin/reset-state
 
 # Update the overlay
-FILE=$1
-if [[ ! -f $FILE ]]; then
-    LIST=({{ emacsconf_caption_dir }}/assets/stream/emacsconf-{{ emacsconf_year }}-$FILE*.webm)
-    FILE="${LIST[0]}"
-    BY_SLUG=1
-fi
-shift
-SLUG=$(echo "$FILE" | perl -ne 'if (/emacsconf-[0-9]*-(.*?)--/) { print $1; } else { print; }')
 overlay $SLUG
-# Play the video
-if [[ -f {{ emacsconf_caption_dir }}/assets/intros/$SLUG.webm ]]; then
-    intro $SLUG
+
+# Play the intro if it exists. If it doesn't exist, switch to the intro slide and stop processing.
+
+if [[ -f $CACHE_DIR/$PREFIX--intro.webm ]]; then
+  mpv $CACHE_DIR/$PREFIX--intro.webm
+else
+  firefox --kiosk $BASE_DIR/assets/in-between/$SLUG.png
+  exit 0
 fi
-mpv $FILE $* &
+
+/usr/local/bin/play $SLUG
diff --git a/roles/obs/templates/xstartup-track b/roles/obs/templates/xstartup-track
index e09c081..f2f6716 100755
--- a/roles/obs/templates/xstartup-track
+++ b/roles/obs/templates/xstartup-track
@@ -5,7 +5,7 @@ export PATH="/usr/local/bin:/usr/bin:/bin:{{ emacsconf_home }}/bin"
 xrdb $HOME/.Xresources
 pulseaudio --start
 pacmd set-default-sink qa
-firefox file:///data/emacsconf/{{ emacsconf_year }}/index-{{ item.id }}.html &
+firefox file:///data/emacsconf/admin/{{ emacsconf_year }}/index-{{ item.id }}.html &
 $HOME/bin/track-obs &
 mumble mumble://{{ emacsconf_id }}-{{ item.id }}@{{ mumble_server }}/{{ item.mumble_channel }} &
 termit &