From 2df5e7266e07947010ce3cdd430e79f0642f247d Mon Sep 17 00:00:00 2001 From: Sacha Chua Date: Tue, 17 Oct 2023 11:56:06 -0400 Subject: update watch pages --- emacsconf-publish.el | 43 +++++++++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/emacsconf-publish.el b/emacsconf-publish.el index a142fd7..827ed8d 100644 --- a/emacsconf-publish.el +++ b/emacsconf-publish.el @@ -1948,8 +1948,8 @@ This video is available under the terms of the Creative Commons Attribution-Shar (defun emacsconf-publish-format-watch-index (info) (concat "\n -

Tracks

" - "\n" +

Tracks

" + "

Watch page	IRC channel (libera.chat)	Alternative for streaming player	Low res

\n" (mapconcat (lambda (track) (emacsconf-replace-plist-in-string (append (list :year emacsconf-year) track) @@ -1990,8 +1990,10 @@ ${resources-info} (defun emacsconf-publish-schedule-short (info) (mapconcat (lambda (o) (emacsconf-replace-plist-in-string - (append o (list :base-url emacsconf-base-url)) - "${slug} (pad, ${qa-link})")) + (append o (list + :qa-link-include (emacsconf-surround ", " (plist-get o :qa-link) "" "") + :base-url emacsconf-base-url)) + "${slug} (pad${qa-link-include})")) info " - ")) (defun emacsconf-publish-page-nav (nav &optional current sep) @@ -2052,8 +2054,20 @@ ${title-info} (emacsconf-publish-page-nav nav "watch") " | ${stream-nav} | Tips for watching/participating +For better performance, we recommend watching ${stream-hires} using a streaming media player. Examples: + +

mpv ${stream-hires}
vlc ${stream-hires}
ffplay ${stream-hires}

+ +If you have limited bandwidth, you can watch the low-res stream ${480p}. + +If you don't have a streaming media player, you can watch using the player below. +

Alternatively, load ${stream-hires} or ${480p} (low-res) in a streaming media player such as MPV.

" (emacsconf-publish-page-nav nav "links") " | ${stream-nav}

" "

${brief}

@@ -2123,9 +2137,17 @@ if (video) { (when emacsconf-publish-watch-directory (make-directory (expand-file-name "watch" (expand-file-name emacsconf-year emacsconf-publish-watch-directory)) t) (with-temp-file (expand-file-name "watch/index.html" (expand-file-name emacsconf-year emacsconf-publish-watch-directory)) - (insert "Watch EmacsConf" (emacsconf-publish-format-watch-index info) - - "

+ (insert + (emacsconf-replace-plist-in-string + (list + :conf-name emacsconf-name + :year emacsconf-year + :watch-index (emacsconf-publish-format-watch-index info) + ) + "Watch ${conf-name} ${year} +

${conf-name} ${year}

+${watch-index} +

Depending on which media player you use, you may enter the stream address in a graphical user interface or provide it as an argument to the program when launching it from the terminal. @@ -2157,10 +2179,7 @@ Q&A in the BigBlueButton room, please use headphones or earphones in order to minimize audio feedback. The link on the talk page will take you to a waiting room that will automatically refresh when the host has opened the Q&A.

- -" - - "")) +"))) (mapc (lambda (track) (make-directory (expand-file-name (format "%s/watch/%s" emacsconf-year (plist-get track :id)) emacsconf-publish-watch-directory) t) (make-directory (expand-file-name (format "%s/watch/%s-480p" emacsconf-year (plist-get track :id)) emacsconf-publish-watch-directory) t) -- cgit v1.2.3

Watch page	IRC channel (libera.chat)	URL for streaming player (ex: mpv, vlc, ffplay)	Low res