Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • justJanne/voctomix-config
1 result
Show changes
Commits on Source (2)
......@@ -42,7 +42,7 @@ live=true
videodecoder=vaapi
videoencoder=vaapi
videocodec=h264
videocaps=video/x-h264,width=1024,height=576,framerate=30/1
videocaps=video/x-h264,width=960,height=540,framerate=30/1
sources=cam1,slides
[blinder]
......@@ -67,7 +67,7 @@ blend-time=300
[mirrors]
; disable if not needed
enabled = true
;sources=cam1,slides
sources = mix,mix-blinded
[composites]
; fullscreen source A (B is full transparent)
......@@ -175,6 +175,29 @@ pip-pip_ = 750, |pip / sbs / |pip
; unique name = ms, from / [... /] to
def = 750, * / *
[toolbar]
; only evaluated in voctogui, but having it here means we don't have
; to configure two systems if we change configs.
fullscreen = false
ports = false
queues = false
presets = fs_cam1,fs_slides,lec_slides_cam1
[preset.fs_cam1]
name = CAM1
icon = speaker.svg
key = q
[preset.fs_slides]
name = SLIDES
icon = slides.svg
key = w
[preset.lec_slides_cam1]
name = CAM1|SLIDES
icon = side-by-side-preview.svg
key = e
[toolbar.sources.a]
buttons=cam1,slides
cam1.name = cam1
......
......@@ -50,8 +50,8 @@ live=true
videodecoder=vaapi
videoencoder=vaapi
videocodec=h264
videocaps=video/x-h264,width=1024,height=576,framerate=30/1
sources=cam1,cam2,slides
videocaps=video/x-h264,width=960,height=540,framerate=30/1
sources=cam1,cam2,slides,mix,mix-blinded
[blinder]
enabled=true
......@@ -75,7 +75,7 @@ blend-time=300
[mirrors]
; disable if not needed
enabled = true
;sources=cam1,cam2,slides
sources = mix,mix-blinded
[composites]
; fullscreen source A (B is full transparent)
......@@ -183,6 +183,44 @@ pip-pip_ = 750, |pip / sbs / |pip
; unique name = ms, from / [... /] to
def = 750, * / *
[toolbar]
; only evaluated in voctogui, but having it here means we don't have
; to configure two systems if we change configs.
fullscreen = false
ports = false
queues = false
presets = fs_cam1,fs_cam2,fs_slides,sbs_cam1_cam2,lec_slides_cam1,lec_slides_cam2
[preset.fs_cam1]
name = CAM1
icon = speaker.svg
key = q
[preset.fs_cam2]
name = CAM2
icon = speaker.svg
key = w
[preset.fs_slides]
name = SLIDES
icon = slides.svg
key = e
[preset.sbs_cam1_cam2]
name = CAM1|CAM2
icon = side-by-side.svg
key = r
[preset.lec_slides_cam1]
name = CAM1|SLIDES
icon = side-by-side-preview.svg
key = t
[preset.lec_slides_cam2]
name = CAM2|SLIDES
icon = side-by-side-preview.svg
key = z
[toolbar.sources.a]
buttons=cam1,cam2,slides
cam1.name = cam1
......