summaryrefslogtreecommitdiffstats
path: root/roles/obs/templates/mpv-track
diff options
context:
space:
mode:
Diffstat (limited to 'roles/obs/templates/mpv-track')
-rwxr-xr-xroles/obs/templates/mpv-track24
1 files changed, 2 insertions, 22 deletions
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 $* &