diff --git a/configs/voctocore-cam1.ini b/configs/voctocore-cam1.ini index 31301930e2bdcfb2a509df58f501d150e27eff99..fc05bd4ae342242509d639e29bb20dc81fa05abb 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 7ea61fb03d0a8f0583531c476cb70af499eb828a..c332c4e1448e3de4a5e5c85a64260d1477aabb9e 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 d318cabf782682c77bd2ea78a47f5da633b7d873..0000000000000000000000000000000000000000 --- 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 0ca02482b279674d1d8045b2759a517dafbfd5ee..0000000000000000000000000000000000000000 --- 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