chore: more changes

voc · Oct 9, 2024 · cfb7e83 · cfb7e83
1 parent 613febf
commit cfb7e83
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 10 deletions.
diff --git a/...a/voctocore-artwork/files/jh24-ffm/bg.png → ...a/voctocore-artwork/files/jh24-ber/bg.png b/...a/voctocore-artwork/files/jh24-ffm/bg.png → ...a/voctocore-artwork/files/jh24-ber/bg.png
diff --git a/bundlewrap/groups/jh24-ber.toml b/bundlewrap/groups/jh24-ber.toml
@@ -0,0 +1,6 @@
+subgroups = ["saal6"]
+members = ["releasing"]
+
+[metadata.event]
+name = "Berlin 2024"
+slug = "jh24-ber"
diff --git a/bundlewrap/groups/jh24-ffm.toml b/bundlewrap/groups/jh24-ffm.toml
diff --git a/bundlewrap/nodes/encoder2.toml b/bundlewrap/nodes/encoder2.toml
@@ -28,6 +28,9 @@ mode = "1080i50"
 devicenumber = 5
 mode = "1080p25"
 
+[metadata.voctocore.playout]
+stream = "fb"
+
 [metadata.voctocore.audio.original]
 streams = "0+1"
 input = "cam1"
@@ -41,3 +44,4 @@ devices = [
     "/dev/disk/by-id/ata-WDC_WD30EFRX-68AX9N0_WD-WMC1T3192687",
     "/dev/disk/by-id/ata-ST3000DM001-1ER166_Z501LTC8",
 ]
+
diff --git a/bundlewrap/nodes/encoder6.toml b/bundlewrap/nodes/encoder6.toml
@@ -8,7 +8,7 @@ meta.secret = "!decrypt:encrypt$gAAAAABlx3cwXRgJExYHPSONTvM4Qr2__WCSqqftfBcBk7pv
 meta.token = "!decrypt:encrypt$gAAAAABlx3cq0mWwMvUECvt8ctW_Wu1IvdbzhzMWbt7yzRUarPgFP6TY4UurHMzpIFoSjeT67zaQoYvZLLG3Vh2lAJZJo4kr_qfN6zEOe6U1RRSNXCzTb4866WgTfdIsaOX_8HBog4b0"
 
 [metadata.event]
-room_name = "Saal 6"
+room_name = "Jugendhaus Königsstadt"
 
 [metadata.interfaces.eth0]
 ips = ["10.73.6.3/16"]
@@ -18,13 +18,12 @@ gateway4 = "10.73.0.254"
 streaming_auth_key = "!decrypt:encrypt$gAAAAABkNYk0lzAoL1Hf5xuaCK0E6A9xq15GeqVfsTCHDomSz0RcFz-kzlyQaS6wXWTsEPF21QhvncKBIstse1UP1Ue5fOKP1J9ruv5ScZrnfctymdDCpuc="
 
 [metadata.voctocore.sources.cam1]
-devicenumber = 1
+devicenumber = 3
 mode = "1080i50"
 
 [metadata.voctocore.sources.slides]
-devicenumber = 4
+devicenumber = 1
 mode = "1080p25"
-hdmi = true
 
 [metadata.voctocore.audio.original]
 streams = "0+1"

diff --git a/bundlewrap/nodes/mixer6.toml b/bundlewrap/nodes/mixer6.toml
@@ -7,3 +7,9 @@ groups = ["debian-bookworm"]
 [metadata.interfaces.eth0]
 ips = ["10.73.6.1/16"]
 gateway4 = "10.73.0.254"
+
+[metadata.pygtk-atem-switcher.atem.settings.inputs] # these are defaults
+input1 = "Laptop Buehne"
+input2 = "Doku Kamera"
+input3 = "Laptop JH"
+input4 = "x"