diff options
| -rw-r--r-- | .ignore | 4 | ||||
| -rw-r--r-- | TODOs.org | 12 | ||||
| -rw-r--r-- | _includes/feed.atom | 2 | ||||
| -rw-r--r-- | _layouts/post.html | 4 | ||||
| -rw-r--r-- | _plugins/generate-torrent.rb | 2 | ||||
| -rw-r--r-- | _plugins/linter.rb | 6 | ||||
| l--------- | resources/screencasts/2020-12-24-sample-screencast.mkv | 1 | ||||
| l--------- | resources/screencasts/2020-12-24-sample-screencast.webm | 1 |
8 files changed, 21 insertions, 11 deletions
@@ -1,2 +1,2 @@ -/vendor/ -/locale/ +/vendor/reveal.js/ +/locale/
\ No newline at end of file @@ -63,11 +63,16 @@ CLOSED: [2020-12-24 jeu. 14:25] :END: - State "DONE" from "TODO" [2020-12-24 jeu. 14:25] - State "TODO" from [2020-12-24 jeu. 11:09] -** CANCELLED Use =.mkv= over =.webm= for embedding subtitles +** DONE Use =.mkv= over =.webm= for embedding subtitles CLOSED: [2020-12-24 jeu. 18:49] :PROPERTIES: :CUSTOM_ID: 6587304c-ee0d-4f40-b046-48de94d00629 :END: +- State "DONE" from "CANCELLED" [2020-12-28 lun. 12:43] \\ + I didn't find the issues with web browsers easier to deal with using WebM files. + I'll keep MKV and investigate further later. + + See also {{{bug(9d75fe3a-b7e5-4cc5-9300-1054c7e981c0)}}}. - State "CANCELLED" from "DONE" [2020-12-28 lun. 11:01] \\ WebM is more web friendly than MKV. Right now there is no support for subtitles, only translated screencasts. @@ -83,6 +88,11 @@ CLOSED: [2020-12-24 jeu. 18:49] :CUSTOM_ID: 8d8a9202-97d4-4c43-b042-15fd5c95da65 :END: - State "TODO" from [2020-12-27 dim. 22:58] +** TODO Fix play of videos with WebTorrent +:PROPERTIES: +:CUSTOM_ID: 9d75fe3a-b7e5-4cc5-9300-1054c7e981c0 +:END: +- State "TODO" from [2020-12-28 lun. 12:44] * Bugs :PROPERTIES: :CUSTOM_ID: bugs diff --git a/_includes/feed.atom b/_includes/feed.atom index 0d1e0a4..f28ef45 100644 --- a/_includes/feed.atom +++ b/_includes/feed.atom @@ -55,7 +55,7 @@ {% if is_audio %} <enclosure url="{{ '/' | absolute_url | xml_escape }}resources/podcasts/{{ entry.date | date: "%Y-%m-%d" }}-{{ entry.ref }}.ogg" type="audio/ogg" /> {% elsif is_video %} - <enclosure url="{{ '/' | absolute_url | xml_escape }}resources/screencasts/{{ entry.date | date: "%Y-%m-%d" }}-{{ entry.ref }}.webm.torrent" type="application/x-bittorrent" /> + <enclosure url="{{ '/' | absolute_url | xml_escape }}resources/screencasts/{{ entry.date | date: "%Y-%m-%d" }}-{{ entry.ref }}.mkv.torrent" type="application/x-bittorrent" /> {% endif %} <category>EuAndreh</category> <pubDate>{{ entry.date | date_to_xmlschema }}</pubDate> diff --git a/_layouts/post.html b/_layouts/post.html index cdd9b93..1ba6d6e 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -31,12 +31,12 @@ layout: default {% if page.video %} {% if site.flags.direct-video %} <video controls> - <source src="{% link /resources/screencasts/{{ page.date | date: "%Y-%m-%d" }}-{{ page.slug }}.webm %}" type="video/webm"> + <source src="{% link /resources/screencasts/{{ page.date | date: "%Y-%m-%d" }}-{{ page.slug }}.mkv %}" type="video/x-matroska"> </video> {% endif %} <div class="torrent-link"> - {% capture torrent-file %}{{ site.url }}/resources/screencasts/{{ page.date | date: "%Y-%m-%d" }}-{{ page.slug }}.webm.torrent{% endcapture %} + {% capture torrent-file %}{{ site.url }}/resources/screencasts/{{ page.date | date: "%Y-%m-%d" }}-{{ page.slug }}.mkv.torrent{% endcapture %} <a href="{{ torrent-file }}">torrent</a> | <a href="/torrent.html?torrent={{ torrent-file | uri_escape }}">online webtorrent</a> diff --git a/_plugins/generate-torrent.rb b/_plugins/generate-torrent.rb index 0c4cd72..a2077bc 100644 --- a/_plugins/generate-torrent.rb +++ b/_plugins/generate-torrent.rb @@ -6,7 +6,7 @@ module Jekyll MEDIA_EXTENSION = { 'podcasts' => 'ogg', - 'screencasts' => 'webm' + 'screencasts' => 'mkv' } def generate(site) diff --git a/_plugins/linter.rb b/_plugins/linter.rb index 94ebc67..c0059c9 100644 --- a/_plugins/linter.rb +++ b/_plugins/linter.rb @@ -107,9 +107,9 @@ module Jekyll end if name == 'screencasts' then - webm = "resources/screencasts/#{date}-#{slug}.webm" - unless File.exist? webm then - raise "Missing WebM file '#{webm}'" + mkv = "resources/screencasts/#{date}-#{slug}.mkv" + unless File.exist? mkv then + raise "Missing MKV file '#{mkv}'" end end end diff --git a/resources/screencasts/2020-12-24-sample-screencast.mkv b/resources/screencasts/2020-12-24-sample-screencast.mkv new file mode 120000 index 0000000..57b8a0c --- /dev/null +++ b/resources/screencasts/2020-12-24-sample-screencast.mkv @@ -0,0 +1 @@ +../../.git/annex/objects/XJ/2W/SHA256E-s2501872--37c770199944f7136a10ee0862d619a8784a6b62aea81416736e920114f2fb14.mkv/SHA256E-s2501872--37c770199944f7136a10ee0862d619a8784a6b62aea81416736e920114f2fb14.mkv
\ No newline at end of file diff --git a/resources/screencasts/2020-12-24-sample-screencast.webm b/resources/screencasts/2020-12-24-sample-screencast.webm deleted file mode 120000 index 199cbf2..0000000 --- a/resources/screencasts/2020-12-24-sample-screencast.webm +++ /dev/null @@ -1 +0,0 @@ -../../.git/annex/objects/qk/Q5/SHA256E-s625561--4619a2293cfad13ecc1c5a65a54d895fe61968f65d0594252d9c3f45e9270d70.webm/SHA256E-s625561--4619a2293cfad13ecc1c5a65a54d895fe61968f65d0594252d9c3f45e9270d70.webm
\ No newline at end of file |