add mpv sub-file argument

2 files changed, 27 insertions, 5 deletions

diff --git a/captioning.md b/captioning.md
index f0692611..d7d0fdab 100644
--- a/captioning.md
+++ b/captioning.md
@@ -69,10 +69,19 @@ During questions and answers, please introduce the question with a
 `[question]:` tag. When the speaker answers, use a `[speaker-name]:`
 tag to make clear who is talking.
 
+# Playing your subtitles together with the video
+
+To load a specific subtitle file in MPV, use the `--sub-file=` or
+`--sub-files=` command-line argument.
+
+If you're using subed, the video should autoplay if it's named the
+same as your subtitle file. If not, you can use `C-c C-v`
+(`subed-mpv-play-from-file`) to load the video file. You can toggle looping over the current subtitle with `C-c C-l` (`subed-toggle-loop-over-current-subtitle`), synchronizing player to point with `C-c ,` (`subed-toggle-sync-player-to-point`), and synchronizing point to player with `C-c .` (`subed-toggle-sync-point-to-player`).
+
 # Editing autogenerated captions
 
 If you want to take advantage of the autogenerated captions and the
-word-level timing data from YouTube, you can start with the VTT file
+word-level timing data from YouTube or Torchaudio, you can start with the VTT file
 for the video you want, then use `my-caption-load-word-data` from
 <https://sachachua.com/dotemacs/#word-level> to load the srv2 file
 (also attached), and then use `my-caption-split` to split using the
@@ -141,10 +150,17 @@ What is BinDat?
 For an example of how chapter markers allow people to quickly navigate
 videos, see <https://emacsconf.org/2021/talks/bindat/> .
 
-If you're using subed, you can make chapter markers by making a copy
-of your WebVTT file and then using ~subed-merge-dwim~ (bound to ~M-m~
-by default) on a region including the subtitles that you want to
-merge. You can also use ~subed-set-subtitle-text~ or
+If you're using subed, you can make chapter markers by adding NOTE
+comments with the chapter headings before the subtitles in the
+chapter. Then we can use
+`emacsconf-subed-make-chapter-file-based-on-comments` from
+https://git.emacsconf.org/emacsconf-el/tree/emacsconf-subed.el to
+create the chapter file.
+
+Alternatively, you can make chapter markers by making a copy of your
+WebVTT file and then using ~subed-merge-dwim~ (bound to ~M-m~ by
+default) on a region including the subtitles that you want to merge.
+You can also use ~subed-set-subtitle-text~ or
 ~subed-merge-region-and-set-text~ - if you can think of good
 keybindings for those, please suggest them!
 
diff --git a/mpv.md b/mpv.md
index 41b3bab8..87171f4b 100644
--- a/mpv.md
+++ b/mpv.md
@@ -1,6 +1,8 @@
 [[!meta title="MPV tips"]]
 [[!meta copyright="Copyright &copy; 2022 Sacha Chua"]]
 
+# Displaying subtitles below the video
+
 The default position of subtitles tends to hide important details like the mode line or minibuffer. If you use `mpv` to view videos, you can adjust the position of subtitles with the "r" and "R" keyboard shortcuts, which run `add sub-pos -1` and `add sub-pos +1` respectively. 
 
 Alternatively, you can configure your MPV to resize videos and show
@@ -77,3 +79,7 @@ If you would like to specify the font to use, you can include a line like:
 ```
 sub-font="Clear Sans Bold"
 ```
+
+# Loading a subtitle file manually
+
+To load a specific subtitle file in MPV, use the `--sub-file=` or `--sub-files=` command-line argument.