From 35c0ad6646e1d048fb42b5a0436d118da4a1d151 Mon Sep 17 00:00:00 2001
From: Sacha Chua <sacha@sachachua.com>
Date: Fri, 2 Dec 2022 08:20:11 -0500
Subject: OBS-related things

---
 roles/obs/templates/mpv-track | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

(limited to 'roles/obs/templates/mpv-track')

diff --git a/roles/obs/templates/mpv-track b/roles/obs/templates/mpv-track
index bb87677..87849e1 100755
--- a/roles/obs/templates/mpv-track
+++ b/roles/obs/templates/mpv-track
@@ -16,26 +16,6 @@ if [[ ! -f $FILE ]]; then
 fi
 shift
 SLUG=$(echo "$FILE" | perl -ne 'if (/^emacsconf-[0-9]*-(.*?)--/) { print $1; } else { print; }')
-if [[ -f /data/emacsconf/assets/overlays/$SLUG-other.png ]]; then
-    echo "Found other overlay for $SLUG, copying"
-    cp /data/emacsconf/assets/overlays/$SLUG-other.png ~/other.png
-else
-    echo "Could not find /data/emacsconf/assets/overlays/$SLUG-other.png, please override ~/other.png manually"
-    cp /data/emacsconf/assets/overlays/blank-other.png ~/other.png
-fi
-if [[ -f /data/emacsconf/assets/overlays/$SLUG-video.png ]]; then
-    echo "Found video overlay for $SLUG, copying"
-    cp /data/emacsconf/assets/overlays/$SLUG-video.png ~/video.png
-else
-    echo "Could not find /data/emacsconf/assets/overlays/$SLUG-video.png, override ~/video.png manually"
-    cp /data/emacsconf/assets/overlays/blank-video.png ~/video.png
-fi
-if [[ "x$BY_SLUG" == "x1" ]] && [[ -f /data/emacsconf/assets/intros/$SLUG.webm ]]; then
-    INTRO=/data/emacsconf/assets/intros/$SLUG.webm
-    echo "Found intro $INTRO"
-else
-    echo "Could not find /data/emacsconf/assets/intros/$SLUG.webm"
-fi
-
+overlay $SLUG
 # Play the video
-DISPLAY="${DISPLAY:-:{{ item.vnc_id }}}" mpv --input-ipc-server={{ emacsconf_home }}/mpv-socket-{{ emacsconf_id }}-{{ item.id }} --audio-device=pulse/vid --profile={{ emacsconf_id }}-talks $FILE $* &
+mpv $FILE $* &
-- 
cgit v1.2.3