summaryrefslogtreecommitdiffstats
path: root/emacsconf-stream.el
diff options
context:
space:
mode:
authorSacha Chua <sacha@sachachua.com>2022-11-28 21:06:21 -0500
committerSacha Chua <sacha@sachachua.com>2022-11-28 21:06:21 -0500
commitd3c6bf186c6239881065e0e3bfe77070a4b6e0bd (patch)
tree0991f380886f9ee155f520e3a4ddd352ac7ece31 /emacsconf-stream.el
parent94adfdf2ea92cdb3e711af11017332735ba5e5ff (diff)
downloademacsconf-el-d3c6bf186c6239881065e0e3bfe77070a4b6e0bd.tar.xz
emacsconf-el-d3c6bf186c6239881065e0e3bfe77070a4b6e0bd.zip
intros
Diffstat (limited to 'emacsconf-stream.el')
-rw-r--r--emacsconf-stream.el28
1 files changed, 14 insertions, 14 deletions
diff --git a/emacsconf-stream.el b/emacsconf-stream.el
index 76c7809..078b673 100644
--- a/emacsconf-stream.el
+++ b/emacsconf-stream.el
@@ -180,20 +180,20 @@ while OTHER-FILENAME will be displayed at other times."
(defun emacsconf-stream-play-intro-maybe (talk)
(interactive (list (emacsconf-complete-talk-info)))
- (when (file-exists-p
- (expand-file-name (concat (plist-get talk :slug) ".webm")
- (expand-file-name "intros" emacsconf-stream-asset-dir)))
- (let ((info (tramp-dissect-file-name (emacsconf-stream-track-login talk))))
- (apply
- #'call-process
- (append
- (list
- "ssh" nil nil t
- (concat (tramp-file-name-user info)
- "@" (tramp-file-name-host info))
- "-p" (tramp-file-name-port info)
- "nohup" "~/bin/track-mpv" (concat "~/assets/intros/" (plist-get talk :slug) ".webm"))
- (list ">" "/dev/null" "2>&1" "&"))))))
+ (let ((info (tramp-dissect-file-name (emacsconf-stream-track-login talk))))
+ (apply
+ #'call-process
+ (append
+ (list
+ "ssh" nil nil t
+ (concat (tramp-file-name-user info)
+ "@" (tramp-file-name-host info))
+ "-p" (tramp-file-name-port info)
+ "nohup")
+ (if (plist-get talk :recorded-intro)
+ (list "~/bin/track-mpv" (concat "~/assets/intros/" (plist-get talk :slug) ".webm"))
+ (list "firefox" (concat "~/assets/in-between/" (plist-get talk :slug) ".png")))
+ (list ">" "/dev/null" "2>&1" "&")))))
(defun emacsconf-stream-play-talk-on-change (talk)
"Play the talk."