Update playbook with assumption that Leo is streaming

2 files changed, 67 insertions, 102 deletions

diff --git a/playbook.md b/playbook.md
index 7a19ef25..86159068 100644
--- a/playbook.md
+++ b/playbook.md
@@ -2,7 +2,6 @@
 # Table of Contents
 
 -   [Roles/values](#roles)
--   [Pre-conference dry run](#dry-run)
 -   [Thursday or Friday before the conference](#days-before)
 -   [On the day of the conference](#day-of)
     -   [Set up](#setup)
@@ -128,35 +127,13 @@
 </table>
 
 
-<a id="dry-run"></a>
-
-# Pre-conference dry run
-
--   - DONE Working together via upcoming.org
-    -   DONE Streaming [main.webm](https://live0.emacsconf.org/main.webm)
-    -   DONE Streaming [main-480p.webm](https://live0.emacsconf.org/main-480p.webm")
-    -   CXLD Streaming [alt.webm](https://live0.emacsconf.org/alt.webm")
-        -   Doesn’t really work for corwin because of some weird setting problem
-    -   STRT Streaming to YouTube
-
--   [X] [Start streaming](#start-streaming)
-    -   Ugh, need to figure out ffmpeg for streaming
--   [ ] [Check in a speaker](#check-in)
--   [ ] Try streaming the organizer room, HOST rehearses opening remarks
--   [X] Play a prerec with subtitles
--   [ ] Try switching to talk room and streaming pretend Q&A
--   [ ] Try playing another prerec
--   [ ] Try publication process
--   [ ] Start alternate stream and check (?)
-    -   No alternate streams at the moment
--   [ ] Review the playbook
-
-
 <a id="days-before"></a>
 
 # Thursday or Friday before the conference
 
 -   STREAM: Download prerecorded videos from ${protected}
+    
+        rsync -avzue ssh front:/var/www/media.emacsconf.org/2021/protected/*--main* .
 
 
 <a id="day-of"></a>
@@ -185,10 +162,8 @@
               sleep 15m
             end
     -   Computer for alternate streaming:
-        -   [Set up sinks for sound](#sound)
         -   Open browser for joining BBB
         -   Open MPV for playing <https://live0.emacsconf.org/main.webm>
-        -   MPV goes to MPV sink, browser goes to recording sink, FFMPEG takes in recording monitor
 -   HOST:
     -   Check OBS scenes for sharing windows/tabs as a virtual camera:
         -   chat.emacsconf.org with #emacsconf
@@ -199,14 +174,12 @@
     -   Set up backchannel for easy viewing
         -   ${upcoming}
         -   \#emacsconf-org and #emacsconf channels
-    -   Join organizer room S
+    -   (?) Join organizer room S
 -   STREAM:
-    -   Join organizer BBB room
+    -   (?) Join organizer BBB room
     -   Check OBS scenes
-        -   MPV and audio from MPV
-        -   Web browser with BBB
-        -   Browser window with organizer room, audio from organizer room
-        -   Browser window that will have talk room, audio from talk room
+        -   Prerecorded video in MPV
+        -   HOST's stream in MPV
     -   Backchannel for easy viewing
 
 
@@ -214,8 +187,8 @@
 
 ### Start streaming     :stream:
 
--   HOST: Display getting-ready message
--   STREAM: Set up BBB view in organizer room to have HOST's webcam maximized
+-   HOST: Display getting-ready message and start streaming to Icecast
+-   STREAM: Load HOST stream in MPV
 -   STREAM: Start streaming from OBS to local Icecast, relay to live0 icecast
 -   HOST: Confirm that the stream is live at <https://live.emacsconf.org/main.webm>
 -   STREAM: Update ${status} to say that the stream is live
@@ -265,7 +238,7 @@ Exception: [CHECK is unavailable](#check-gone)
                 can skip; coach possible responses for awkward things) or asking HOST to read questions to them
                 -   HOST can share the pad or IRC; speaker shares screen only if doing demo
             -   encouragement of webcam, although it's optional
-            -   how STREAM will join shortly before the prerec ends and then
+            -   how HOST will join shortly before the prerec ends and then
                 give them the go-ahead
             -   closing any tabs watching the stream as their talk starts
                 (otherwise the audio is confusing)
@@ -273,7 +246,9 @@ Exception: [CHECK is unavailable](#check-gone)
             collects emergency contact information (in case of technical
             issues) and shares it with HOST in the CRDT buffer
         -   Okay to do other things until the prerec ends
-    -   CHECK updates ${upcoming} with link to the talk room and preferences for Q&A-. CHECK will also /msg the relevant information.
+    -   CHECK updates ${upcoming} with link to the talk room and
+        preferences for Q&A-. CHECK will also /msg the relevant
+        information.
 
 
 <a id="present"></a>
@@ -286,20 +261,20 @@ Exception: [CHECK is unavailable](#check-gone)
     -   wiki
 -   PAD clears pad colours.
 -   [? prerec]
-    -   STREAM and HOST switch to the organizer room in BBB.
+    -   (TODO: needed?) STREAM and HOST switch to the organizer room in BBB.
     -   STREAM switches to MPV scene in OBS and plays the video (with captions if available).
         -   Exception: [Last-minute prerecording submission](#last-minute-prerec)
         -   Exception: [Last-minute caption update](#last-minute-captions)
     -   [CHECK publishes information](#publish)
     -   [HOST gets a head start on handling Q&A](#questions)
-    -   When prerec finishes, [STREAM joins Q&A](#questions)
+    -   When prerec finishes, STREAM switches to HOST stream in MPV.
 -   [? live]
     -   Exception: [Speaker does not have a prerec and has not checked in](#really-missing)
     -   HOST joins the BBB room and double-checks that recording is on
-    -   STREAM joins the BBB room and gives the go-ahead
     -   CHECK notes that this is a live presentation and that the recording will be posted after the conference.
     -   CHECK notes the time that the presentation started, recalculates schedule, and publishes it.
-    -   CHECK-alternate joins the BBB room and pauses MPV.
+    -   CHECK-alternate joins the BBB room and pauses main MPV.
+    -   STREAM switches to HOST stream in MPV.
     -   Speaker presents.
         -   Exception: [Technical issues during a live presentation](#live-issues)
     -   [? talk needs to be wrapped up]
@@ -314,9 +289,9 @@ Exception: [CHECK is unavailable](#check-gone)
     -   ${conf}
     -   ${upcoming}
     -   wiki
--   CHECK publishes the video to media.emacsconf.org
--   CHECK updates the wiki page to include the video and any other published files.
--   CHECK publishes the video on YouTube.
+-   CHECK publishes the video to media.emacsconf.org using `conf-publish-files`
+-   CHECK commits the wiki page and the captions for the talk.
+-   CHECK publishes the video on YouTube using `conf-video-share`.
     -   Update description:
         
             This video is available under the terms of the
@@ -327,7 +302,6 @@ Exception: [CHECK is unavailable](#check-gone)
             ${url}
             
             ${description}
-    -   Reupload subtitles if needed.
     -   Mark it as public.
     -   Add it to EmacsConf 2021 playlist.
 -   CHECK publishes the video on ToobNix.
@@ -355,8 +329,8 @@ Exceptions:
     -   CHECK-alternate joins the BBB room and pauses MPV.
     -   HOST joins the BBB room
     -   HOST starts recording in BBB or confirms that it's already recording
-    -   STREAM joins meeting and gives go-ahead
-    -   HOST describes how to ask questions
+    -   STREAM switches to the HOST stream and gives HOST the go-ahead via IRC.
+    -   HOST describes how to ask questions.
     -   [? No questions yet]
         -   HOST thanks speaker, says nice things about talk, and asks a couple of prepared questions
     -   [? Awkward question]
@@ -366,15 +340,17 @@ Exceptions:
         -   HOST writes in Etherpad/IRC or nudges speaker verbally.
     -   CHECK notes the time that the live Q&A finished and switches back to the main stream on CHECK-alternate.
 -   [? IRC/pad]
-    -   HOST and STREAM switch to organizer BBB meeting (room S)
-    -   HOST describes Q&A method and shows it on the screen
+    -   HOST switches to pad/chat OBS scene.
+    -   STREAM switches to HOST view and gives HOST the go-ahead.
+    -   HOST describes Q&A method and shows it on the screen.
     -   While there's buffer time before the next talk, HOST can read out
         questions and answers, or transition to the next talk early
     -   HOST: It's time for the next talk, but if you want to keep
         discussing the previous talk, please feel free to continue doing
         so on IRC or the pad.
 -   [? speaker will answer after the conference]
-    -   HOST and STREAM switch to organizer BBB meeting (room S)
+    -   HOST switches to pad/chat OBS scene.
+    -   STREAM switches to HOST view and gives HOST the go-ahead.
     -   HOST says the speaker is not available right now, but we'll
         forward the questions to the speaker and we'll post the speaker's
         answers on the wiki page. Leave your contact information if you
@@ -398,6 +374,7 @@ Exceptions:
 ## End of stream
 
 -   CHECK stops ffmpeg process for Youtube
+-   CHECK stops ffmpeg process for Toobnix
 -   CHECK stops ffmpeg process for main-480p
 -   STREAM stops streaming
 
@@ -494,6 +471,11 @@ Exceptions:
     4.  Use pavucontrol to set the recording source for the ffmpeg
         command to be the audio monitor, so you get system output as
         well.
+        -   OR:
+            -   [? splitting audio] [Set up sinks for sound](#sound)
+            -   [? same audio]
+        -   Set up audio monitor as the input for FFMPEG
+        -   MPV goes to MPV sink, browser goes to recording sink, FFMPEG takes in recording monitor
 
 
 <a id="pad-broken"></a>
diff --git a/playbook.org b/playbook.org
index f8f4d8ba..c2e5f48a 100644
--- a/playbook.org
+++ b/playbook.org
@@ -25,35 +25,15 @@
 | ${dump}          | [[/ssh:live:/data/]]                                        |
 | ${media}         | [[/ssh:front:/var/www/media.emacsconf.org/2021/]]           |
 
-* Pre-conference dry run
-:PROPERTIES:
-:CUSTOM_ID: dry-run
-:END:
--   - DONE Working together via upcoming.org
-  - DONE Streaming [[https://live0.emacsconf.org/main.webm][main.webm]]
-  - DONE Streaming [[https://live0.emacsconf.org/main-480p.webm"][main-480p.webm]]
-  - CXLD Streaming [[https://live0.emacsconf.org/alt.webm"][alt.webm]]
-    - Doesn’t really work for corwin because of some weird setting problem
-  - STRT Streaming to YouTube
-
-- [X] [[*Start streaming][Start streaming]]
-  - Ugh, need to figure out ffmpeg for streaming
-- [ ] [[*Check in a speaker][Check in a speaker]]
-- [ ] Try streaming the organizer room, HOST rehearses opening remarks
-- [X] Play a prerec with subtitles
-- [ ] Try switching to talk room and streaming pretend Q&A
-- [ ] Try playing another prerec
-- [ ] Try publication process
-- [ ] Start alternate stream and check (?)
-  - No alternate streams at the moment
-- [ ] Review the playbook
-        
 * Thursday or Friday before the conference
 :PROPERTIES:
 :CUSTOM_ID: days-before
 :END:
 
 - STREAM: Download prerecorded videos from ${protected}
+  #+begin_src sh :eval no
+  rsync -avzue ssh front:/var/www/media.emacsconf.org/2021/protected/*--main* .
+  #+end_src
 
 * On the day of the conference
 :PROPERTIES:
@@ -81,10 +61,8 @@
     end
     #+end_src
   - Computer for alternate streaming:
-    - [[#sound][Set up sinks for sound]]
     - Open browser for joining BBB
     - Open MPV for playing https://live0.emacsconf.org/main.webm
-    - MPV goes to MPV sink, browser goes to recording sink, FFMPEG takes in recording monitor
 - HOST:
   - Check OBS scenes for sharing windows/tabs as a virtual camera:
     - chat.emacsconf.org with #emacsconf
@@ -95,14 +73,12 @@
   - Set up backchannel for easy viewing
     - ${upcoming}
     - #emacsconf-org and #emacsconf channels
-  - Join organizer room S
+  - (?) Join organizer room S
 - STREAM:
-  - Join organizer BBB room
+  - (?) Join organizer BBB room
   - Check OBS scenes
-    - MPV and audio from MPV
-    - Web browser with BBB
-    - Browser window with organizer room, audio from organizer room
-    - Browser window that will have talk room, audio from talk room
+    - Prerecorded video in MPV
+    - HOST's stream in MPV
   - Backchannel for easy viewing
     
 *** Start streaming                                                :stream:
@@ -110,8 +86,8 @@
 :CUSTOM_ID: start-streaming
 :END:
 
-- HOST: Display getting-ready message
-- STREAM: Set up BBB view in organizer room to have HOST's webcam maximized
+- HOST: Display getting-ready message and start streaming to Icecast
+- STREAM: Load HOST stream in MPV
 - STREAM: Start streaming from OBS to local Icecast, relay to live0 icecast
 - HOST: Confirm that the stream is live at https://live.emacsconf.org/main.webm
 - STREAM: Update ${status} to say that the stream is live
@@ -162,7 +138,7 @@ Exception: [[*CHECK is unavailable][CHECK is unavailable]]
         can skip; coach possible responses for awkward things) or asking HOST to read questions to them
         - HOST can share the pad or IRC; speaker shares screen only if doing demo
       - encouragement of webcam, although it's optional
-      - how STREAM will join shortly before the prerec ends and then
+      - how HOST will join shortly before the prerec ends and then
         give them the go-ahead
       - closing any tabs watching the stream as their talk starts
         (otherwise the audio is confusing)
@@ -170,8 +146,9 @@ Exception: [[*CHECK is unavailable][CHECK is unavailable]]
       collects emergency contact information (in case of technical
       issues) and shares it with HOST in the CRDT buffer
     - Okay to do other things until the prerec ends
-  - CHECK updates ${upcoming} with link to the talk room and preferences for Q&A-. CHECK will also /msg the relevant information.
-    
+  - CHECK updates ${upcoming} with link to the talk room and
+    preferences for Q&A-. CHECK will also /msg the relevant
+    information.
 
 *** Present talk
 :PROPERTIES:
@@ -184,20 +161,20 @@ Exception: [[*CHECK is unavailable][CHECK is unavailable]]
   - wiki  
 - PAD clears pad colours.
 - [? prerec]
-  - STREAM and HOST switch to the organizer room in BBB.
+  - (TODO: needed?) STREAM and HOST switch to the organizer room in BBB.
   - STREAM switches to MPV scene in OBS and plays the video (with captions if available).
     - Exception: [[*Last-minute prerecording submission][Last-minute prerecording submission]]
     - Exception: [[*Last-minute caption update][Last-minute caption update]]
   - [[*Publish information][CHECK publishes information]]
   - [[*Handle Q&A][HOST gets a head start on handling Q&A]]
-  - When prerec finishes, [[*Handle Q&A][STREAM joins Q&A]]
+  - When prerec finishes, STREAM switches to HOST stream in MPV.
 - [? live]
   - Exception: [[*Speaker does not have a prerec and has not checked in][Speaker does not have a prerec and has not checked in]]
   - HOST joins the BBB room and double-checks that recording is on
-  - STREAM joins the BBB room and gives the go-ahead
   - CHECK notes that this is a live presentation and that the recording will be posted after the conference.
   - CHECK notes the time that the presentation started, recalculates schedule, and publishes it.
-  - CHECK-alternate joins the BBB room and pauses MPV.
+  - CHECK-alternate joins the BBB room and pauses main MPV.
+  - STREAM switches to HOST stream in MPV.
   - Speaker presents.
     - Exception: [[*Technical issues during a live presentation][Technical issues during a live presentation]]
   - [? talk needs to be wrapped up]
@@ -212,9 +189,9 @@ Exception: [[*CHECK is unavailable][CHECK is unavailable]]
     - ${conf}
     - ${upcoming}
     - wiki
-  - CHECK publishes the video to media.emacsconf.org
-  - CHECK updates the wiki page to include the video and any other published files.
-  - CHECK publishes the video on YouTube.
+  - CHECK publishes the video to media.emacsconf.org using =conf-publish-files=
+  - CHECK commits the wiki page and the captions for the talk.
+  - CHECK publishes the video on YouTube using =conf-video-share=.
     - Update description:
       #+begin_example
 This video is available under the terms of the
@@ -226,7 +203,6 @@ ${url}
 
 ${description}
       #+end_example
-    - Reupload subtitles if needed.
     - Mark it as public.
     - Add it to EmacsConf 2021 playlist.
   - CHECK publishes the video on ToobNix.
@@ -253,8 +229,8 @@ Exceptions:
   - CHECK-alternate joins the BBB room and pauses MPV.
   - HOST joins the BBB room
   - HOST starts recording in BBB or confirms that it's already recording
-  - STREAM joins meeting and gives go-ahead
-  - HOST describes how to ask questions
+  - STREAM switches to the HOST stream and gives HOST the go-ahead via IRC.
+  - HOST describes how to ask questions.
   - [? No questions yet]
     - HOST thanks speaker, says nice things about talk, and asks a couple of prepared questions
   - [? Awkward question]
@@ -264,15 +240,17 @@ Exceptions:
     - HOST writes in Etherpad/IRC or nudges speaker verbally.
   - CHECK notes the time that the live Q&A finished and switches back to the main stream on CHECK-alternate.
 - [? IRC/pad]
-  - HOST and STREAM switch to organizer BBB meeting (room S)
-  - HOST describes Q&A method and shows it on the screen
+  - HOST switches to pad/chat OBS scene.
+  - STREAM switches to HOST view and gives HOST the go-ahead.
+  - HOST describes Q&A method and shows it on the screen.
   - While there's buffer time before the next talk, HOST can read out
     questions and answers, or transition to the next talk early
   - HOST: It's time for the next talk, but if you want to keep
     discussing the previous talk, please feel free to continue doing
     so on IRC or the pad.
 - [? speaker will answer after the conference]
-  - HOST and STREAM switch to organizer BBB meeting (room S)
+  - HOST switches to pad/chat OBS scene.
+  - STREAM switches to HOST view and gives HOST the go-ahead.
   - HOST says the speaker is not available right now, but we'll
     forward the questions to the speaker and we'll post the speaker's
     answers on the wiki page. Leave your contact information if you
@@ -296,10 +274,10 @@ Exceptions:
 :END:
 
 - CHECK stops ffmpeg process for Youtube
+- CHECK stops ffmpeg process for Toobnix
 - CHECK stops ffmpeg process for main-480p
 - STREAM stops streaming
   
-  
 ** In case of...
 :PROPERTIES:
 :CUSTOM_ID: exceptions
@@ -374,7 +352,7 @@ Exceptions:
 - CHECK updates ${stream-status} to note that the alternate stream is finished.
 
   FFMPEG process for sending the desktop and audio to the $CONFALT mountpoint on Linux with X11 and Alsa:
-  
+
   1. Set the CONFALT environment variable to icecast://user:password@live0.emacsconf.org:8000/alt.webm
   2. Install pavucontrol if you don't have it already.
   3. Start the following command ([[file:playbook/stream-desktop-and-audio.sh]]:
@@ -384,7 +362,12 @@ Exceptions:
   4. Use pavucontrol to set the recording source for the ffmpeg
      command to be the audio monitor, so you get system output as
      well.
-  
+     - OR:
+       - [? splitting audio] [[#sound][Set up sinks for sound]]
+       - [? same audio]
+     - Set up audio monitor as the input for FFMPEG
+     - MPV goes to MPV sink, browser goes to recording sink, FFMPEG takes in recording monitor
+
 *** Pad malfunction or mess-up
 :PROPERTIES:
 :CUSTOM_ID: pad-broken