From a08bb4fbae42cb79cd5233bd02bd2964ad362a00 Mon Sep 17 00:00:00 2001 From: Janne Mareike Koschinski <mail@justjanne.de> Date: Wed, 8 Jan 2025 20:45:31 +0100 Subject: [PATCH] use new builtin program out --- configs/voctocore-cam1.ini | 5 +++++ configs/voctocore-cam2.ini | 4 ++++ services/voctomix2-playout-mix.service | 16 ---------------- services/voctomix2-playout-premix.service | 16 ---------------- 4 files changed, 9 insertions(+), 32 deletions(-) delete mode 100644 services/voctomix2-playout-mix.service delete mode 100644 services/voctomix2-playout-premix.service diff --git a/configs/voctocore-cam1.ini b/configs/voctocore-cam1.ini index 3130193..fc05bd4 100644 --- a/configs/voctocore-cam1.ini +++ b/configs/voctocore-cam1.ini @@ -5,6 +5,11 @@ audiocaps=audio/x-raw,format=S16LE,channels=2,layout=interleaved,rate=48000 sources=cam1,slides,usbaudio livesources=slides +[programoutput] +enabled = true +videosink = kmssink + + [source.usbaudio] kind = alsa volume = 1.0 diff --git a/configs/voctocore-cam2.ini b/configs/voctocore-cam2.ini index 7ea61fb..c332c4e 100644 --- a/configs/voctocore-cam2.ini +++ b/configs/voctocore-cam2.ini @@ -5,6 +5,10 @@ audiocaps=audio/x-raw,format=S16LE,channels=2,layout=interleaved,rate=48000 sources=cam1,cam2,slides,usbaudio livesources=slides +[programoutput] +enabled = true +videosink = kmssink + [source.usbaudio] kind = alsa volume = 1.0 diff --git a/services/voctomix2-playout-mix.service b/services/voctomix2-playout-mix.service deleted file mode 100644 index d318cab..0000000 --- a/services/voctomix2-playout-mix.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=voctomix2 playout mix -After=voctomix2-voctocore.service -Requires=voctomix2-voctocore.service - -[Service] -User=voc -Group=voc -Type=simple -ExecStart=/opt/voc/scripts/playout-fb.sh 11000 -Restart=always -RestartSec=1s -StartLimitInterval=0 - -[Install] -WantedBy=voctomix2-voctocore.service diff --git a/services/voctomix2-playout-premix.service b/services/voctomix2-playout-premix.service deleted file mode 100644 index 0ca0248..0000000 --- a/services/voctomix2-playout-premix.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=voctomix2 playout premix -After=voctomix2-voctocore.service -Requires=voctomix2-voctocore.service - -[Service] -User=voc -Group=voc -Type=simple -ExecStart=/opt/voc/scripts/playout-fb.sh 21000 -Restart=always -RestartSec=1s -StartLimitInterval=0 - -[Install] -WantedBy=voctomix2-voctocore.service -- GitLab