Skip to content

Commit 98826e3

Browse files
committed
bw/bundles/voctocore: Add option to disable SBS
The side-by-side composite mode is always used in the wrong places. So just try to remove it everywhere by default and see who complains.
1 parent d96a1b4 commit 98826e3

6 files changed

Lines changed: 22 additions & 2 deletions

File tree

bundlewrap/bundles/voctocore/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ parallel_slide_streaming = true
2323

2424
# Enable side-by-side presets if sources are present. In the default
2525
# configuration, all side-by-side presets are disabled.
26+
enable_sbs = false # enable SBS composite mode
2627
enable_sbs_presets_for_multi_camera = false # enable multi-camera presets (e. g. cam1+cam2)
2728
enable_sbs_presets_with_slides = false # enable slides+camera presets (like lecture mode)
2829
```

bundlewrap/bundles/voctocore/files/voctocore-config-by-version/2.0-rc1.ini

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,17 +285,23 @@ ${sname}.tip = Select source ${sname} on channel B
285285
% endif
286286
% endfor
287287
[toolbar.composites]
288+
% if enable_sbs:
288289
buttons = fs,sbs,lec
290+
% else:
291+
buttons = fs,lec
292+
% endif
289293

290294
fs.name = FULL SCREEN
291295
fs.key = ${keyboard_shortcuts['scene_fs'][0]}
292296
fs.tip = Show channel A on full screen
293297
fs.icon = speaker.svg
294298

299+
% if enable_sbs:
295300
sbs.name = SIDE BY SIDE
296301
sbs.key = ${keyboard_shortcuts['scene_sbs'][0]}
297302
sbs.tip = Put channel A beside channel B
298303
sbs.icon = side-by-side.svg
304+
% endif
299305

300306
lec.name = LECTURE
301307
lec.key = ${keyboard_shortcuts['scene_lec'][0]}

bundlewrap/bundles/voctocore/files/voctocore-config-by-version/2.2.ini

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,17 +316,23 @@ ${sname}.tip = Select source ${sname} on channel B
316316
% endif
317317
% endfor
318318
[toolbar.composites]
319+
% if enable_sbs:
319320
buttons = fs,sbs,lec
321+
% else:
322+
buttons = fs,lec
323+
% endif
320324

321325
fs.name = FULL SCREEN
322326
fs.key = ${keyboard_shortcuts['scene_fs'][0]}
323327
fs.tip = Show channel A on full screen
324328
fs.icon = speaker.svg
325329

330+
% if enable_sbs:
326331
sbs.name = SIDE BY SIDE
327332
sbs.key = ${keyboard_shortcuts['scene_sbs'][0]}
328333
sbs.tip = Put channel A beside channel B
329334
sbs.icon = side-by-side.svg
335+
% endif
330336

331337
lec.name = LECTURE
332338
lec.key = ${keyboard_shortcuts['scene_lec'][0]}

bundlewrap/bundles/voctocore/files/voctocore-config-by-version/voctomix2.ini

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,15 +261,21 @@ ${sname}.tip = Select source ${sname} on channel B
261261
% endif
262262
% endfor
263263
[toolbar.composites]
264+
% if enable_sbs:
264265
buttons = fs,sbs,lec
266+
% else:
267+
buttons = fs,lec
268+
% endif
265269

266270
fs.name = FULL SCREEN
267271
fs.key = ${keyboard_shortcuts['scene_fs'][0]}
268272
fs.tip = Show channel A on full screen
269273

274+
% if enable_sbs:
270275
sbs.name = SIDE BY SIDE
271276
sbs.key = ${keyboard_shortcuts['scene_sbs'][0]}
272277
sbs.tip = Put channel A beside channel B
278+
% endif
273279

274280
lec.name = LECTURE
275281
lec.key = ${keyboard_shortcuts['scene_lec'][0]}

bundlewrap/bundles/voctocore/items.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
except IndexError:
6868
pass
6969

70-
if 'slides' in sources and node.metadata.get('voctocore/enable_sbs_presets_with_slides'):
70+
if node.metadata.get("voctocore/enable_sbs") and 'slides' in sources and node.metadata.get('voctocore/enable_sbs_presets_with_slides'):
7171
for source in sorted(preset_camera_sources):
7272
icon = None
7373
source_kind = sources[source]["kind"]
@@ -83,7 +83,7 @@
8383
except IndexError:
8484
pass
8585

86-
if len(preset_camera_sources) > 2 and node.metadata.get(
86+
if node.metadata.get("voctocore/enable_sbs") and len(preset_camera_sources) > 2 and node.metadata.get(
8787
"voctocore/enable_sbs_presets_for_multi_camera"
8888
):
8989
# We have a (atleast) three-camera setup. We assume last camera is

bundlewrap/bundles/voctocore/metadata.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
},
3030
},
3131
'voctocore': {
32+
'enable_sbs': False,
3233
'enable_sbs_presets_for_multi_camera': False,
3334
'enable_sbs_presets_with_slides': False,
3435
'mirror_view': False, # automatically mirrors SBS/LEC views

0 commit comments

Comments
 (0)