add some more scripts, change 2022 to emacsconf_year

9 files changed, 20 insertions, 11 deletions

diff --git a/roles/obs/templates/bbb b/roles/obs/templates/bbb
index 74c6976..240a122 100755
--- a/roles/obs/templates/bbb
+++ b/roles/obs/templates/bbb
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Play intro (or display in-between slide and wait for input), then play files
+# Open the Big Blue Button room using the backstage link
 # {{ ansible_managed }}
 
 # Kill the background music if playing
@@ -10,5 +10,4 @@ fi
 # Update the overlay
 SLUG=$1
 overlay $SLUG
-# Play the video
 firefox https://media.emacsconf.org/{{ emacsconf_year }}/backstage/current/room/$SLUG
diff --git a/roles/obs/templates/intro b/roles/obs/templates/intro
index 85ee895..7b5d4ab 100755
--- a/roles/obs/templates/intro
+++ b/roles/obs/templates/intro
@@ -5,17 +5,19 @@ if screen -list | grep -q background; then
     screen -S background -X quit
 fi
 # Update the overlay
+SLUG=$1
 FILE=$1
 if [[ ! -f $FILE ]]; then
-    LIST=(/data/emacsconf/assets/stream/emacsconf-2022-$FILE*.webm)
+    LIST=(/data/emacsconf/assets/stream/emacsconf-{{ emacsconf_year }}-$FILE--*.webm)
     FILE="${LIST[0]}"
     BY_SLUG=1
+else
+		SLUG=$(echo "$FILE" | perl -ne 'if (/emacsconf-[0-9]*-(.*?)--/) { print $1; } else { print; }')
 fi
 shift
-SLUG=$(echo "$FILE" | perl -ne 'if (/emacsconf-[0-9]*-(.*?)--/) { print $1; } else { print; }')
 overlay $SLUG
 if [[ -f /data/emacsconf/assets/intros/$SLUG.webm ]]; then
   mpv /data/emacsconf/assets/intros/$SLUG.webm
 else
   firefox /data/emacsconf/assets/in-between/$SLUG.png
-fi
\ No newline at end of file
+fi
diff --git a/roles/obs/templates/mpv-track b/roles/obs/templates/mpv-track
index 87849e1..a7f3c62 100755
--- a/roles/obs/templates/mpv-track
+++ b/roles/obs/templates/mpv-track
@@ -10,7 +10,7 @@ fi
 # Update the overlay
 FILE=$1
 if [[ ! -f $FILE ]]; then
-    LIST=(/data/emacsconf/assets/stream/emacsconf-2022-$FILE*.webm)
+    LIST=(/data/emacsconf/assets/stream/emacsconf-{{ emacsconf_year }}-$FILE*.webm)
     FILE="${LIST[0]}"
     BY_SLUG=1
 fi
diff --git a/roles/obs/templates/mpv.conf b/roles/obs/templates/mpv.conf
index f529ff3..b9efaae 100644
--- a/roles/obs/templates/mpv.conf
+++ b/roles/obs/templates/mpv.conf
@@ -12,7 +12,7 @@ video-align-y=-1
 sub-use-margins=yes
 sub-scale-by-window=yes
 sub-pos=103
-sub-margin-x=110
+sub-margin-x=104
 sub-margin-y=60
 sub-align-x=left
 # Style
diff --git a/roles/obs/templates/pad b/roles/obs/templates/pad
new file mode 100755
index 0000000..e9953a1
--- /dev/null
+++ b/roles/obs/templates/pad
@@ -0,0 +1,8 @@
+#!/bin/bash
+# Display the Etherpad collaborative document
+# {{ ansible_managed }}
+
+# Update the overlay
+SLUG=$1
+overlay $SLUG
+firefox https://pad.emacsconf.org/{{ emacsconf_year }}-$SLUG
diff --git a/roles/obs/templates/play b/roles/obs/templates/play
index 277a49e..4f437a8 100755
--- a/roles/obs/templates/play
+++ b/roles/obs/templates/play
@@ -10,7 +10,7 @@ fi
 # Update the overlay
 FILE=$1
 if [[ ! -f $FILE ]]; then
-    LIST=(/data/emacsconf/assets/stream/emacsconf-2022-$FILE*.webm)
+    LIST=(/data/emacsconf/assets/stream/emacsconf-{{ emacsconf_year }}-$FILE*--main.webm)
     FILE="${LIST[0]}"
     BY_SLUG=1
 fi
diff --git a/roles/obs/templates/play-with-intro b/roles/obs/templates/play-with-intro
index 4f928c3..75ce10d 100755
--- a/roles/obs/templates/play-with-intro
+++ b/roles/obs/templates/play-with-intro
@@ -10,7 +10,7 @@ fi
 # Update the overlay
 FILE=$1
 if [[ ! -f $FILE ]]; then
-    LIST=(/data/emacsconf/assets/stream/emacsconf-2022-$FILE*.webm)
+    LIST=(/data/emacsconf/assets/stream/emacsconf-{{ emacsconf_year }}-$FILE*.webm)
     FILE="${LIST[0]}"
     BY_SLUG=1
 fi
diff --git a/roles/obs/templates/set-overlay b/roles/obs/templates/set-overlay
index cc2e26f..212df71 100644
--- a/roles/obs/templates/set-overlay
+++ b/roles/obs/templates/set-overlay
@@ -1,6 +1,6 @@
 FILE=$1
 if [[ ! -f $FILE ]]; then
-    LIST=(/data/emacsconf/assets/stream/emacsconf-2022-$FILE*.webm)
+    LIST=(/data/emacsconf/assets/stream/emacsconf-[0-9][0-9][0-9][0-9]-$FILE*.webm)
     FILE="${LIST[0]}"
     BY_SLUG=1
 fi
diff --git a/roles/obs/templates/vnc-track b/roles/obs/templates/vnc-track
index 45a177a..4b18c29 100644
--- a/roles/obs/templates/vnc-track
+++ b/roles/obs/templates/vnc-track
@@ -1 +1 @@
-vncserver :{{ item.vnc_id }} -geometry {{ res_x }}x{{ res_y }} -useold -xstartup {{ emacsconf_home }}/.vnc/xstartup -desktop {{ emacsconf_id }}-{{ item.id }} -rfbport {{ item.vnc_port }} -AlwaysShared -randr {{ res_x }}x{{ res_y }}
\ No newline at end of file
+vncserver :{{ item.vnc_id }} -geometry {{ res_x }}x{{ res_y }} -useold -xstartup {{ emacsconf_home }}/.vnc/xstartup -desktop {{ emacsconf_id }}-{{ item.id }} -rfbport {{ item.vnc_port }} -AlwaysShared
\ No newline at end of file