summaryrefslogtreecommitdiffstats
path: root/roles/obs
diff options
context:
space:
mode:
Diffstat (limited to 'roles/obs')
-rw-r--r--roles/obs/tasks/main.yml17
-rwxr-xr-xroles/obs/templates/intro8
2 files changed, 15 insertions, 10 deletions
diff --git a/roles/obs/tasks/main.yml b/roles/obs/tasks/main.yml
index 5df7d56..95f12b6 100644
--- a/roles/obs/tasks/main.yml
+++ b/roles/obs/tasks/main.yml
@@ -47,6 +47,16 @@
template:
src: xorg.conf
dest: /etc/X11/xorg.conf
+- name: Create directories
+ file:
+ owner: "{{ emacsconf_user }}"
+ group: "{{ emacsconf_group }}"
+ path: "{{ item }}"
+ state: directory
+ mode: 0775
+ loop:
+ - "{{ emacsconf_asset_dir }}"
+ - "{{ emacsconf_asset_dir }}/stream"
- name: Set up MPV and MPVC
tags: mpv
include_tasks: mpv.yml
@@ -105,13 +115,6 @@
nopassword: true
with_items:
- "{{ emacsconf_tracks }}"
-- name: Create directories
- file:
- owner: "{{ emacsconf_user }}"
- group: "{{ emacsconf_group }}"
- path: "{{ emacsconf_asset_dir }}"
- state: directory
- mode: 0775
- name: Set up scripts
tags: wip, obs-scripts
template:
diff --git a/roles/obs/templates/intro b/roles/obs/templates/intro
index 7af9c4c..9bf1161 100755
--- a/roles/obs/templates/intro
+++ b/roles/obs/templates/intro
@@ -8,7 +8,7 @@ fi
SLUG=$1
FILE=$1
if [[ ! -f $FILE ]]; then
- LIST=({{ emacsconf_caption_dir }}/cache/emacsconf-{{ emacsconf_year }}-$FILE--*.webm)
+ LIST=({{ emacsconf_caption_dir }}/cache/emacsconf-{{ emacsconf_year }}-$FILE--*--intro.webm)
FILE="${LIST[0]}"
BY_SLUG=1
else
@@ -17,7 +17,9 @@ fi
shift
overlay $SLUG
if [[ -f "$FILE" ]]; then
- mpv "$FILE"
+ echo "Playing $FILE"
+ mpv "$FILE"
else
- firefox {{ emacsconf_caption_dir }}/assets/in-between/$SLUG.png
+ echo "Opening backup image {{ emacsconf_caption_dir }}/assets/in-between/$SLUG.png"
+ firefox {{ emacsconf_caption_dir }}/assets/in-between/$SLUG.png
fi