Merge branch 'master' of git.emacsconf.org:emacsconf-wiki

3 files changed, 31 insertions, 19 deletions

diff --git a/2020/organizers-notebook.org b/2020/organizers-notebook.org
index 1011adc9..cefc4200 100644
--- a/2020/organizers-notebook.org
+++ b/2020/organizers-notebook.org
@@ -1,8 +1,8 @@
 * Things to check or decide
-- Mail merge?
-- Amin to investigate if Icecast can take one stream source and send it to the main conference stream and the individual talk stream
+- Can we stream from multiple rooms without getting thoroughly confused?
 - Assign rooms shortly before presentation
   - *Shortly before presentation:* accommodates reshuffling
+
 - Generating static images
   - Before the presentation: Talk title, speaker
   - Speaker checked in
@@ -16,19 +16,19 @@
    :END:
 * Workflows
   
-** If we have four or rooms
+** If we have four rooms
   
  O1 - main organizer, O2 - secondary organizer or volunteer
 
 *** Overview
- - 1 green room for speaker checkin so that I get an audio alert? Alternatively, check in via IRC, 4 rooms
+ - Check in via IRC, 4 rooms
  - 4 rooms streamed as room mounts.
    - Individual talks have fallback mount of room mount.
    - O1 streams from room or sets appropriate mount as fallback mount for main conference stream
 *** Before the conference
  - Do tech checks and get alternative ways to contact speakers (phone number? IRC nick? Something that goes ding?)
  - Turn on audio alert
- - Install Mute Tab extension
+ - Install Mute Tab extension if desired
 *** Tech check
  - Explain process
  - Test audio, webcam, screensharing, collaborative pad
@@ -46,14 +46,16 @@
 *** During the presentation
  - Speaker presents, keeping an eye on the collaborative pad for questions
  - O1 stays with speaker to help with questions and timing
- - O2 wanders off to do the tech check with the next person and pings O1 when ready
+ - O2 stays with speaker to stream to room source
+ - If there is another speaker, another organizer (O3) helps with the tech check
 *** After the presentation
  - O1 announces next steps: If you want to continue the conversation, go to the individual talk page
  - O1 goes to next talk when ready
  - Speaker continues with extended presentation if they want
+ - O2 stays in room
 *** After the extended presentation (if any)
- - Speaker removes the recorder/streamer user to end the stream and recording
- - Speaker stops the BBB recording
+ - If we figure out how to have the recorder/streamer be another user, speaker removes the recorder/streamer user to end the stream and recording, and speaker stops the BBB recording
+ - Alternatively, O2 stays in room, stops the BBB recording, notifies #emacsconf-org that the room is available, and looks for the next speaker to set up
 *** Scenarios
 **** Prerecorded presentations
  - O1 streams presentation to both endpoints (is there a neat command-line way to do this?)
diff --git a/2020/prepare.md b/2020/prepare.md
index 03f384b9..dfbd2f60 100644
--- a/2020/prepare.md
+++ b/2020/prepare.md
@@ -160,3 +160,4 @@ the logistics.
 - If you plan to show your keystrokes, is that display visible?
 - If you want to share your webcam (optional), can you enable it? Is it visible? Will there likely be distractions in the background?
 - Can you view the collaborative pad? Will you be comfortable reviewing questions on your own (perhaps by keeping it open beside your shared window), or will you need a volunteer to relay questions to you?
+- Can you share contact information (ex: phone number) so that we can get in touch with you in case of technical issues or scheduling changes?
diff --git a/2020/submissions.org b/2020/submissions.org
index 90d82dce..3b25c486 100644
--- a/2020/submissions.org
+++ b/2020/submissions.org
@@ -2939,7 +2939,7 @@ SCHEDULED: <2020-11-29 Sun 16:30-17:00>
        (org-entry-get (point) "TARGET_TIME")))
 #+end_src
 
-#+begin_src emacs-lisp :results none
+#+begin_src emacs-lisp :results none :tangle "conf.el"
 (defun conf/assign-ids ()
   (interactive)
   (goto-char (point-min))
@@ -3064,6 +3064,12 @@ The total is written to the MIN_TIME_SUM property of this heading"
     (when talk (setq results (cons talk results)))
     (reverse results)))
 
+(defun conf/filter-talks (list)
+  "Return only talk info in LIST."
+  (seq-filter
+   (lambda (talk) (eq (plist-get talk :type) 'talk))
+   list))
+
 (defun conf/format-talk-link (talk)
     (and talk (format "<a href=\"/2020/schedule/%s\">%s</a>"
                       (plist-get talk :talk-id)
@@ -3124,21 +3130,24 @@ conference for instructions on how to watch and participate. See you then!
               (write-file (format "schedule/%s.md" (plist-get o :talk-id)))))
           talks)))
 
-(defun conf/generate-schedule-files ()
-  (interactive)
+(defun conf/get-talk-info-from-file (&optional filename)
   (with-temp-buffer
-    (insert-file-contents "submissions.org")
+    (insert-file-contents (or filename "submissions.org"))
     (org-mode)
     (org-show-all)
     (goto-char (point-min))
     (goto-char (org-find-property "ID" "talks"))
-    (let ((info (conf/get-talk-info)))
-      (with-temp-buffer
-        (insert (conf/format-talk-info-as-schedule info))
-        (write-file "schedule-details.txt"))
-      (conf/format-talk-pages info)
-      (with-current-buffer (find-file "schedule.org")
-        (org-export-to-file 'md "schedule.md")))))
+    (conf/get-talk-info)))
+
+(defun conf/generate-schedule-files (&optional filename)
+  (interactive)
+  (let ((info (conf/get-talk-info-from-file filename)))
+    (with-temp-buffer
+      (insert (conf/format-talk-info-as-schedule info))
+      (write-file "schedule-details.txt"))
+    (conf/format-talk-pages info)
+    (with-current-buffer (find-file "schedule.org")
+      (org-export-to-file 'md "schedule.md"))))
 #+end_src
 
 #+RESULTS: