diff options
| author | Sacha Chua <sacha@sachachua.com> | 2025-01-23 08:58:03 -0500 |
|---|---|---|
| committer | Sacha Chua <sacha@sachachua.com> | 2025-01-23 08:58:03 -0500 |
| commit | 964f44e68a0eba8dd49ab354c3739313f75914be (patch) | |
| tree | ad41c936512f9f9c08f764c2cccf926f6df79e27 /roles/obs | |
| parent | 22e032875f454c7edd1f15329532874196476fc5 (diff) | |
| download | emacsconf-ansible-964f44e68a0eba8dd49ab354c3739313f75914be.tar.xz emacsconf-ansible-964f44e68a0eba8dd49ab354c3739313f75914be.zip | |
use cache dir
Diffstat (limited to '')
| -rwxr-xr-x | roles/obs/templates/intro | 6 | ||||
| -rwxr-xr-x | roles/obs/templates/music | 2 | ||||
| -rwxr-xr-x | roles/obs/templates/play | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/roles/obs/templates/intro b/roles/obs/templates/intro index bf02dc3..7af9c4c 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 }}/assets/stream/emacsconf-{{ emacsconf_year }}-$FILE--*.webm) + LIST=({{ emacsconf_caption_dir }}/cache/emacsconf-{{ emacsconf_year }}-$FILE--*.webm) FILE="${LIST[0]}" BY_SLUG=1 else @@ -16,8 +16,8 @@ else fi shift overlay $SLUG -if [[ -f {{ emacsconf_caption_dir }}/assets/intros/$SLUG.webm ]]; then - mpv {{ emacsconf_caption_dir }}/assets/intros/$SLUG.webm +if [[ -f "$FILE" ]]; then + mpv "$FILE" else firefox {{ emacsconf_caption_dir }}/assets/in-between/$SLUG.png fi diff --git a/roles/obs/templates/music b/roles/obs/templates/music index 3e729ec..a5a6a31 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 {{ background_music_dir }}/* --shuffle --loop=inf --volume={{ background_music_volume }}" + screen -dmS background /bin/bash -c "mpv {{ background_music_dir }}/* --shuffle --loop-playlist=inf --volume={{ background_music_volume }}" fi diff --git a/roles/obs/templates/play b/roles/obs/templates/play index e205b46..69632d4 100755 --- a/roles/obs/templates/play +++ b/roles/obs/templates/play @@ -24,7 +24,7 @@ fi # 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) + LIST=($CACHE_DIR/{{ emacsconf_id }}-{{ emacsconf_year }}-$SLUG*--main.webm) else LIST=($BASE_DIR/assets/test/{{ emacsconf_id }}-{{ emacsconf_year }}-$SLUG*--main.webm) fi |