From e13ac70e2b432bd2ea24b10573d172f926712e94 Mon Sep 17 00:00:00 2001
From: Jannik Beyerstedt <code@jbeyerstedt.de>
Date: Sun, 22 Oct 2023 21:20:14 +0200
Subject: [PATCH] Backport changes introduced by "update make-ffmpeg"

---
 cccamp19/config.ini    | 11 ++++++++---
 denog11/config.ini     | 11 ++++++++---
 jh19-berlin/config.ini | 29 +++++++++++++++++------------
 jh20-jue/config.ini    | 21 ++++++++++++++-------
 jh21-rn/config.ini     | 11 ++++++++---
 jugendhackt/config.ini | 11 ++++++++---
 make-ffmpeg.py         |  4 ++--
 mrmcd2019/config.ini   | 13 ++++++++++---
 8 files changed, 75 insertions(+), 36 deletions(-)

diff --git a/cccamp19/config.ini b/cccamp19/config.ini
index f3c0668..181caed 100644
--- a/cccamp19/config.ini
+++ b/cccamp19/config.ini
@@ -3,11 +3,14 @@ schedule = https://fahrplan.events.ccc.de/camp/2019/Fahrplan/schedule.xml
 template = cccamp19_talks_intro_1080p.mov
 alpha = true
 prores = true
+fontfile = true
+inout = n
 
 [title]
 in = 193
 out = 324
-font = Marvel-Bold.ttf
+fontfamily =
+fontfile = Marvel-Bold.ttf
 fontsize = 120
 fontcolor = #c68100
 x = (w-text_w)/2
@@ -16,7 +19,8 @@ y = 480
 [speaker]
 in = 233
 out = 324
-font = Marvel-Regular.ttf
+fontfamily =
+fontfile = Marvel-Regular.ttf
 fontsize = 70
 fontcolor = #c68100
 x = (w-text_w)/2
@@ -25,7 +29,8 @@ y = 845
 [text]
 in = 242
 out = 324
-font = Marvel-Regular.ttf
+fontfamily =
+fontfile = Marvel-Regular.ttf
 fontsize = 45
 fontcolor = #c68100
 x = (w-text_w)/2
diff --git a/denog11/config.ini b/denog11/config.ini
index 20367cd..6f403b5 100644
--- a/denog11/config.ini
+++ b/denog11/config.ini
@@ -3,11 +3,14 @@ schedule = https://pretalx.denog.de/denog11/schedule/export/schedule.xml
 template = denog11_intro_template.ts
 alpha = false
 prores = false
+fontfile = true
+inout = n
 
 [title]
 in = 1
 out = 6.5
-font = DejaVuSans.ttf
+fontfamily =
+fontfile = DejaVuSans.ttf
 fontsize = 100
 fontcolor = #f9cc12
 x = 640
@@ -16,7 +19,8 @@ y = 200
 [speaker]
 in = 2
 out = 6.5
-font = DejaVuSans.ttf
+fontfamily =
+fontfile = DejaVuSans.ttf
 fontsize = 60
 fontcolor = #ffffff
 x = 640
@@ -25,7 +29,8 @@ y = 900
 [text]
 in = 3
 out = 6.5
-font = DejaVuSans.ttf
+fontfamily =
+fontfile = DejaVuSans.ttf
 fontsize = 45
 fontcolor = #ffffff
 x = 640
diff --git a/jh19-berlin/config.ini b/jh19-berlin/config.ini
index 2a10de5..6a8740d 100644
--- a/jh19-berlin/config.ini
+++ b/jh19-berlin/config.ini
@@ -1,31 +1,36 @@
 [default]
-schedule = https://projects.alpaka.space/media/jhber19-schedule.xml 
+schedule = https://projects.alpaka.space/media/jhber19-schedule.xml
 template = intro-alpha.mov
 alpha = true
 prores = true
+fontfile = true
+inout = n
 
 [title]
 in = 175
-out = 260 
-font = SourceSansPro-Bold.otf 
-fontsize = 90 
+out = 260
+fontfamily =
+fontfile = SourceSansPro-Bold.otf
+fontsize = 90
 fontcolor = #ffffff
-x = 1090 
+x = 1090
 y = 450
 
 [speaker]
-in = 175 
-out = 260 
-font = SourceSansPro-Regular.otf 
-fontsize = 36 
+in = 175
+out = 260
+fontfamily =
+fontfile = SourceSansPro-Regular.otf
+fontsize = 36
 fontcolor = #ffffff
-x = 1090 
+x = 1090
 y = 900
 
 [text]
 in = 200
-out = 250 
-font = SourceSansPro-Regular.otf 
+out = 250
+fontfamily =
+fontfile = SourceSansPro-Regular.otf
 fontsize = 45
 fontcolor = #c68100
 x = (w-text_w)/2
diff --git a/jh20-jue/config.ini b/jh20-jue/config.ini
index 310d66d..163ca71 100644
--- a/jh20-jue/config.ini
+++ b/jh20-jue/config.ini
@@ -1,19 +1,24 @@
 [default]
 schedule = https://releasing.c3voc.de/releases/jhjue2020/schedule-jhjue20.xml
-; intro_template.ts was derived from a png which was derived from jhjue-20-intro.svg 
+; intro_template.ts was derived from a png which was derived from jhjue-20-intro.svg
 ; ffmpeg -loop 1 -i jh20-jue/jh20-jue-intro.png -ar 48000 -ac 2 -f s16le -i /dev/zero -c:v mpeg2video -pix_fmt:v yuv420p -qscale:v 2 -qmin:v 2 -qmax:v 7 -keyint_min 0 -bf 0 -g 0 -intra:0 -maxrate:0 90M  -c:a mp2 -b:a 384k -t 5  jh20-jue/jh20-jue_intro_template.ts
 template = jh20-jue_intro_template.ts
 alpha = false
 prores = false
+; enable using a font file
+fontfile = true
+; in and out time format: t for seconds, n for frame number
+inout = n
 
 ; fields for title and speaker names are empty in the template.ts, so we'll render them in via ffmpeg
 [title]
 ; inframe for title
-in = 20 
+in = 20
 ; outframe  for totle
 out = 225
-; title font
-font = ebisu.ttf
+; title font (either font family or file, see default setting above)
+fontfamily =
+fontfile = ebisu.ttf
 ; title font size
 fontsize = 70
 ; title color
@@ -25,7 +30,8 @@ y = 865
 [speaker]
 in = 40
 out = 225
-font = ebisu.ttf
+fontfamily =
+fontfile = ebisu.ttf
 fontsize = 40
 fontcolor = #eeeeee
 x = 600
@@ -35,7 +41,8 @@ y = 950
 [text]
 in = 3
 out = 4
-font = ebisu.ttf
+fontfamily =
+fontfile = ebisu.ttf
 fontsize = 45
 fontcolor = #ffffff
 x = 640
@@ -44,4 +51,4 @@ text = ''
 
 
 ; build intros via
-; ./make-ffmpeg.py jh20-jue/ 
+; ./make-ffmpeg.py jh20-jue/
diff --git a/jh21-rn/config.ini b/jh21-rn/config.ini
index 293225e..a7870db 100644
--- a/jh21-rn/config.ini
+++ b/jh21-rn/config.ini
@@ -3,11 +3,14 @@ schedule = https://pretalx.c3voc.de/jugend-hackt-rhein-neckar-2021/schedule/expo
 template = jh21-rn-template.ts
 alpha = false
 prores = false
+fontfile = true
+inout = t
 
 [title]
 in = 1
 out = 6.5
-font = SourceSansPro-Semibold.ttf
+fontfamily =
+fontfile = SourceSansPro-Semibold.ttf
 fontsize = 85
 fontcolor = #ffffff
 x = 410
@@ -16,7 +19,8 @@ y = 877
 [speaker]
 in = 2
 out = 6.5
-font = SourceSansPro-Semibold.ttf
+fontfamily =
+fontfile = SourceSansPro-Semibold.ttf
 fontsize = 45
 fontcolor = #ffffff
 x = 410
@@ -25,7 +29,8 @@ y = 954
 [text]
 in = 3
 out = 6.5
-font = SourceSansPro-Semibold.ttf
+fontfamily =
+fontfile = SourceSansPro-Semibold.ttf
 fontsize = 45
 fontcolor = #ffffff
 x = 1920
diff --git a/jugendhackt/config.ini b/jugendhackt/config.ini
index 8e1457a..54955fb 100644
--- a/jugendhackt/config.ini
+++ b/jugendhackt/config.ini
@@ -4,11 +4,14 @@ schedule = https://jh.franzi.business/schedule/jh23dd.xml
 template = alpaka_orange.ts
 alpha = false
 prores = false
+fontfile = true
+inout = t
 
 [title]
 in = 1
 out = 9.5
-font = SourceSansPro-Semibold.ttf
+fontfamily =
+fontfile = SourceSansPro-Semibold.ttf
 fontsize = 100
 fontcolor = #00a5dd
 x = 100
@@ -17,7 +20,8 @@ y = 785
 [speaker]
 in = 2
 out = 9
-font = SourceSansPro-Semibold.ttf
+fontfamily =
+fontfile = SourceSansPro-Semibold.ttf
 fontsize = 55
 fontcolor = #00a5dd
 x = 100
@@ -26,7 +30,8 @@ y = 900
 [text]
 in = 3
 out = 8
-font = SourceSansPro-Semibold.ttf
+fontfamily =
+fontfile = SourceSansPro-Semibold.ttf
 fontsize = 45
 fontcolor = #00a5dd
 x = 100
diff --git a/make-ffmpeg.py b/make-ffmpeg.py
index 9b77a26..af1ecb6 100755
--- a/make-ffmpeg.py
+++ b/make-ffmpeg.py
@@ -75,8 +75,8 @@ cparser.read(os.path.join(os.path.dirname(args.project), 'config.ini'))
 template = cparser['default']['template']
 alpha = cparser['default']['alpha']
 prores = cparser['default']['prores']
-fontfile = cparser['default']['fontfile']
-inout = cparser['default']['inout']
+fontfile = cparser['default']['fontfile'] # use a font file instead of a font family
+inout = cparser['default']['inout'] # in and out time format: t for seconds, n for frame number
 
 title_in = cparser['title']['in']
 title_out = cparser['title']['out']
diff --git a/mrmcd2019/config.ini b/mrmcd2019/config.ini
index 5c02e73..165753c 100755
--- a/mrmcd2019/config.ini
+++ b/mrmcd2019/config.ini
@@ -2,11 +2,16 @@
 #schedule = https://talks.mrmcd.net/2019/schedule/export/schedule.xml
 schedule = file:///home/thorti/git/c3voc/intro-outro-generator/mrmcd2019/schedule.xml
 template = mrmcd2019.mov
+alpha = false
+prores = false
+fontfile = true
+inout = n
 
 [title]
 in = 50
 out = 225
-font = Jura-Bold.ttf
+fontfamily =
+fontfile = Jura-Bold.ttf
 fontsize = 80
 fontcolor = #47acda
 x = (w-text_w)/2
@@ -15,7 +20,8 @@ y = 540
 [speaker]
 in = 75
 out = 225
-font = Jura-Regular.ttf
+fontfamily =
+fontfile = Jura-Regular.ttf
 fontsize = 50
 fontcolor = #094762
 x = (w-text_w)/2
@@ -24,7 +30,8 @@ y = 950
 [text]
 in = 242
 out = 324
-font = Jura-Regular.ttf
+fontfamily =
+fontfile = Jura-Regular.ttf
 fontsize = 45
 fontcolor = #c68100
 x = (w-text_w)/2