From 6b5cda2d98597bab6043086d974c1fa356c558bd Mon Sep 17 00:00:00 2001 From: Stefan Dej Date: Mon, 17 Jul 2023 22:50:24 +0200 Subject: [PATCH 1/3] fix: fix issue with webcams in farm printers all printers show the same webcam Signed-off-by: Stefan Dej --- src/components/panels/FarmPrinterPanel.vue | 2 +- src/components/webcams/Hlsstreamer.vue | 8 ++++++-- src/components/webcams/Ipstreamer.vue | 8 ++++++-- src/components/webcams/JMuxerStream.vue | 8 ++++++-- src/components/webcams/Mjpegstreamer.vue | 4 ++-- .../webcams/MjpegstreamerAdaptive.vue | 4 ++-- src/components/webcams/Uv4lMjpeg.vue | 4 ++-- src/components/webcams/WebcamWrapper.vue | 5 +++-- src/components/webcams/WebcamWrapperItem.vue | 19 ++++++++++--------- 9 files changed, 38 insertions(+), 24 deletions(-) diff --git a/src/components/panels/FarmPrinterPanel.vue b/src/components/panels/FarmPrinterPanel.vue index 377782f9e..00125b2c4 100644 --- a/src/components/panels/FarmPrinterPanel.vue +++ b/src/components/panels/FarmPrinterPanel.vue @@ -50,7 +50,7 @@ 'service' in currentWebcam " class="webcamContainer"> - + - + @@ -30,6 +30,7 @@ import WebcamWrapperItem from '@/components/webcams/WebcamWrapperItem.vue' export default class WebcamWrapper extends Mixins(BaseMixin) { @Prop({ type: Object, required: true }) webcam!: GuiWebcamStateWebcam @Prop({ type: Boolean, default: true }) showFps!: Boolean + @Prop({ type: String, default: null }) printerUrl!: string | null get webcams(): GuiWebcamStateWebcam[] { return this.$store.getters['gui/webcams/getWebcams'] diff --git a/src/components/webcams/WebcamWrapperItem.vue b/src/components/webcams/WebcamWrapperItem.vue index ec944e4e4..baee260c6 100644 --- a/src/components/webcams/WebcamWrapperItem.vue +++ b/src/components/webcams/WebcamWrapperItem.vue @@ -1,31 +1,31 @@