diff -Nru webcamoid-9.0.0/debian/changelog webcamoid-9.0.0/debian/changelog --- webcamoid-9.0.0/debian/changelog 2022-07-19 13:11:04.000000000 +0000 +++ webcamoid-9.0.0/debian/changelog 2022-09-14 11:40:25.000000000 +0000 @@ -1,8 +1,9 @@ -webcamoid (9.0.0-4build1) kinetic; urgency=medium +webcamoid (9.0.0-5) unstable; urgency=medium - * No-change rebuild against libavcodec59 + * Track upstream mods (closes: #1017179, #1017317) + * Update standards version to 4.6.1, no changes needed. - -- Steve Langasek Tue, 19 Jul 2022 13:11:04 +0000 + -- Barak A. Pearlmutter Wed, 14 Sep 2022 12:40:25 +0100 webcamoid (9.0.0-4) unstable; urgency=medium diff -Nru webcamoid-9.0.0/debian/control webcamoid-9.0.0/debian/control --- webcamoid-9.0.0/debian/control 2022-07-19 13:11:04.000000000 +0000 +++ webcamoid-9.0.0/debian/control 2022-09-14 11:39:42.000000000 +0000 @@ -1,8 +1,7 @@ Source: webcamoid Section: video Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Barak A. Pearlmutter +Maintainer: Barak A. Pearlmutter Build-Depends: debhelper-compat (= 13), cmake, libasound2-dev, @@ -29,7 +28,7 @@ qtmultimedia5-dev, qtquickcontrols2-5-dev, qttools5-dev-tools -Standards-Version: 4.6.0 +Standards-Version: 4.6.1 Rules-Requires-Root: no Homepage: https://webcamoid.github.io/ Vcs-Git: https://salsa.debian.org/debian/webcamoid.git diff -Nru webcamoid-9.0.0/debian/patches/debian-changes webcamoid-9.0.0/debian/patches/debian-changes --- webcamoid-9.0.0/debian/patches/debian-changes 2022-05-06 09:58:49.000000000 +0000 +++ webcamoid-9.0.0/debian/patches/debian-changes 2022-09-14 11:40:25.000000000 +0000 @@ -184,6 +184,80 @@ share/qml/VideoFormatOptions.qml share/qml/VideoInputAddEdit.qml share/qml/VideoInputOptions.qml +--- webcamoid-9.0.0.orig/StandAlone/icons.qrc ++++ webcamoid-9.0.0/StandAlone/icons.qrc +@@ -14,6 +14,7 @@ + share/themes/WebcamoidTheme/icons/hicolor/128x128/mic.png + share/themes/WebcamoidTheme/icons/hicolor/128x128/minus.png + share/themes/WebcamoidTheme/icons/hicolor/128x128/no.png ++ share/themes/WebcamoidTheme/icons/hicolor/128x128/paperclip.png + share/themes/WebcamoidTheme/icons/hicolor/128x128/photo.png + share/themes/WebcamoidTheme/icons/hicolor/128x128/picture.png + share/themes/WebcamoidTheme/icons/hicolor/128x128/play.png +@@ -48,6 +49,7 @@ + share/themes/WebcamoidTheme/icons/hicolor/16x16/mic.png + share/themes/WebcamoidTheme/icons/hicolor/16x16/minus.png + share/themes/WebcamoidTheme/icons/hicolor/16x16/no.png ++ share/themes/WebcamoidTheme/icons/hicolor/16x16/paperclip.png + share/themes/WebcamoidTheme/icons/hicolor/16x16/photo.png + share/themes/WebcamoidTheme/icons/hicolor/16x16/picture.png + share/themes/WebcamoidTheme/icons/hicolor/16x16/play.png +@@ -82,6 +84,7 @@ + share/themes/WebcamoidTheme/icons/hicolor/22x22/mic.png + share/themes/WebcamoidTheme/icons/hicolor/22x22/minus.png + share/themes/WebcamoidTheme/icons/hicolor/22x22/no.png ++ share/themes/WebcamoidTheme/icons/hicolor/22x22/paperclip.png + share/themes/WebcamoidTheme/icons/hicolor/22x22/photo.png + share/themes/WebcamoidTheme/icons/hicolor/22x22/picture.png + share/themes/WebcamoidTheme/icons/hicolor/22x22/play.png +@@ -116,6 +119,7 @@ + share/themes/WebcamoidTheme/icons/hicolor/256x256/mic.png + share/themes/WebcamoidTheme/icons/hicolor/256x256/minus.png + share/themes/WebcamoidTheme/icons/hicolor/256x256/no.png ++ share/themes/WebcamoidTheme/icons/hicolor/256x256/paperclip.png + share/themes/WebcamoidTheme/icons/hicolor/256x256/photo.png + share/themes/WebcamoidTheme/icons/hicolor/256x256/picture.png + share/themes/WebcamoidTheme/icons/hicolor/256x256/play.png +@@ -150,6 +154,7 @@ + share/themes/WebcamoidTheme/icons/hicolor/32x32/mic.png + share/themes/WebcamoidTheme/icons/hicolor/32x32/minus.png + share/themes/WebcamoidTheme/icons/hicolor/32x32/no.png ++ share/themes/WebcamoidTheme/icons/hicolor/32x32/paperclip.png + share/themes/WebcamoidTheme/icons/hicolor/32x32/photo.png + share/themes/WebcamoidTheme/icons/hicolor/32x32/picture.png + share/themes/WebcamoidTheme/icons/hicolor/32x32/play.png +@@ -184,6 +189,7 @@ + share/themes/WebcamoidTheme/icons/hicolor/48x48/mic.png + share/themes/WebcamoidTheme/icons/hicolor/48x48/minus.png + share/themes/WebcamoidTheme/icons/hicolor/48x48/no.png ++ share/themes/WebcamoidTheme/icons/hicolor/48x48/paperclip.png + share/themes/WebcamoidTheme/icons/hicolor/48x48/photo.png + share/themes/WebcamoidTheme/icons/hicolor/48x48/picture.png + share/themes/WebcamoidTheme/icons/hicolor/48x48/play.png +@@ -218,6 +224,7 @@ + share/themes/WebcamoidTheme/icons/hicolor/64x64/mic.png + share/themes/WebcamoidTheme/icons/hicolor/64x64/minus.png + share/themes/WebcamoidTheme/icons/hicolor/64x64/no.png ++ share/themes/WebcamoidTheme/icons/hicolor/64x64/paperclip.png + share/themes/WebcamoidTheme/icons/hicolor/64x64/photo.png + share/themes/WebcamoidTheme/icons/hicolor/64x64/picture.png + share/themes/WebcamoidTheme/icons/hicolor/64x64/play.png +@@ -252,6 +259,7 @@ + share/themes/WebcamoidTheme/icons/hicolor/8x8/mic.png + share/themes/WebcamoidTheme/icons/hicolor/8x8/minus.png + share/themes/WebcamoidTheme/icons/hicolor/8x8/no.png ++ share/themes/WebcamoidTheme/icons/hicolor/8x8/paperclip.png + share/themes/WebcamoidTheme/icons/hicolor/8x8/photo.png + share/themes/WebcamoidTheme/icons/hicolor/8x8/picture.png + share/themes/WebcamoidTheme/icons/hicolor/8x8/play.png +@@ -287,6 +295,7 @@ + share/themes/WebcamoidTheme/icons/hicolor/scalable/mic.svg + share/themes/WebcamoidTheme/icons/hicolor/scalable/minus.svg + share/themes/WebcamoidTheme/icons/hicolor/scalable/no.svg ++ share/themes/WebcamoidTheme/icons/hicolor/scalable/paperclip.svg + share/themes/WebcamoidTheme/icons/hicolor/scalable/photo.svg + share/themes/WebcamoidTheme/icons/hicolor/scalable/picture.svg + share/themes/WebcamoidTheme/icons/hicolor/scalable/play.svg --- webcamoid-9.0.0.orig/StandAlone/share/qml/About.qml +++ webcamoid-9.0.0/StandAlone/share/qml/About.qml @@ -68,6 +68,10 @@ Page { @@ -209,7 +283,14 @@ } --- webcamoid-9.0.0.orig/StandAlone/share/qml/AboutDialog.qml +++ webcamoid-9.0.0/StandAlone/share/qml/AboutDialog.qml -@@ -31,6 +31,8 @@ Dialog { +@@ -26,11 +26,13 @@ import Webcamoid 1.0 + Dialog { + id: aboutDialog + standardButtons: Dialog.Close +- width: AkUnit.create(640 * AkTheme.controlScale, "dp").pixels +- height: AkUnit.create(400 * AkTheme.controlScale, "dp").pixels ++ width: wdgMainWidget.width * 0.75 ++ height: wdgMainWidget.height * 0.75 modal: true title: qsTr("About %1").arg(mediaTools.applicationName) @@ -1049,7 +1130,7 @@ } Button { text: qsTr("Search") -+ Accessible.description: qsTr("Search directory to save imagess") ++ Accessible.description: qsTr("Search directory to save images") onClicked: { mediaTools.makedirs(recording.imagesDirectory) @@ -1601,6 +1682,46 @@ onToggled: { if (checked) { +--- webcamoid-9.0.0.orig/StandAlone/share/qml/ThirdPartyLicenses.qml ++++ webcamoid-9.0.0/StandAlone/share/qml/ThirdPartyLicenses.qml +@@ -37,11 +37,13 @@ Page { + text: "The followings are the Licenses for 3rd-party work incorporated into Webcamoid. These Licenses DOES NOT applies to Webcamoid itself." + wrapMode: Text.WordWrap + Layout.fillWidth: true ++ Layout.maximumWidth: parent.width + } + Label { + text: "License for resources taken from openclipart.org:" + wrapMode: Text.WordWrap + Layout.fillWidth: true ++ Layout.maximumWidth: parent.width + } + TextArea { + text: mediaTools.readFile(":/Webcamoid/share/3rd-party/licenses/openclipart.txt") +@@ -52,6 +54,7 @@ Page { + text: "License for code taken from OpenCV:" + wrapMode: Text.WordWrap + Layout.fillWidth: true ++ Layout.maximumWidth: parent.width + } + TextArea { + text: mediaTools.readFile(":/Webcamoid/share/3rd-party/licenses/OpenCV.txt") +@@ -62,6 +65,7 @@ Page { + text: "License for code and algorithms used in Temperature plugin:" + wrapMode: Text.WordWrap + Layout.fillWidth: true ++ Layout.maximumWidth: parent.width + } + TextArea { + text: mediaTools.readFile(":/Webcamoid/share/3rd-party/licenses/TemperatureAlgorithm.txt") +@@ -72,6 +76,7 @@ Page { + text: "License for the usb.ids file:" + wrapMode: Text.WordWrap + Layout.fillWidth: true ++ Layout.maximumWidth: parent.width + } + TextArea { + text: mediaTools.readFile(":/Webcamoid/share/3rd-party/licenses/UsbIds.txt") --- webcamoid-9.0.0.orig/StandAlone/share/qml/UpdatesConfig.qml +++ webcamoid-9.0.0/StandAlone/share/qml/UpdatesConfig.qml @@ -80,28 +80,34 @@ Page { @@ -1848,6 +1969,15 @@ +} --- webcamoid-9.0.0.orig/StandAlone/share/qml/VideoEffectOptions.qml +++ webcamoid-9.0.0/StandAlone/share/qml/VideoEffectOptions.qml +@@ -33,7 +33,7 @@ ScrollView { + + function description(effectIndex) + { +- if (effectIndex < 0 || effectIndex >= videoEffects.effects.lenght) ++ if (effectIndex < 0 || effectIndex >= videoEffects.effects.length) + return "" + + let effect = videoEffects.effects[effectIndex] @@ -55,6 +55,7 @@ ScrollView { flat: true Layout.leftMargin: AkUnit.create(16 * AkTheme.controlScale, "dp").pixels @@ -1856,6 +1986,15 @@ onClicked: { videoEffects.removeInterface("itmEffectControls") +@@ -74,7 +75,7 @@ ScrollView { + onEffectIndexChanged: { + videoEffects.removeInterface("itmEffectControls") + +- if (effectIndex < 0 || effectIndex >= videoEffects.effects.lenght) ++ if (effectIndex < 0 || effectIndex >= videoEffects.effects.length) + return + + videoEffects.embedControls("itmEffectControls", effectIndex) --- webcamoid-9.0.0.orig/StandAlone/share/qml/VideoEffectsDialog.qml +++ webcamoid-9.0.0/StandAlone/share/qml/VideoEffectsDialog.qml @@ -51,6 +51,24 @@ Dialog { @@ -2606,8 +2745,8 @@ + let element = vcamFormats.itemAt(index) + let caps = + AkVideoCaps.create(element.format, -+ element.width, -+ element.height, ++ element.formatWidth, ++ element.formatHeight, + AkFrac.create(element.fps, + 1).toVariant()) + addEdit.openOutputFormatDialog(index, caps) @@ -3055,10 +3194,43 @@ import Webcamoid 1.0 ApplicationWindow { -@@ -76,6 +77,16 @@ ApplicationWindow { - Component.onCompleted: chkFlash.updateVisibility() +@@ -33,8 +34,6 @@ ApplicationWindow { + + " - " + + videoLayer.description(videoLayer.videoInput) + visible: true +- x: (Screen.width - mediaTools.windowWidth) / 2 +- y: (Screen.height - mediaTools.windowHeight) / 2 + width: mediaTools.windowWidth + height: mediaTools.windowHeight + +@@ -62,6 +61,15 @@ ApplicationWindow { + photoPreviewSaveAnimation.start() + } + ++ function snapshotToClipboard() ++ { ++ var success = false ++ snapToClipboard.focus = false ++ recording.takePhoto() ++ success = recording.copyToClipboard() ++ console.debug("Capture snapshot to Clipboard ", success ? "successful" : "failed") ++ } ++ + function pathToUrl(path) + { + if (path.length < 1) +@@ -73,7 +81,21 @@ ApplicationWindow { + onWidthChanged: mediaTools.windowWidth = width + onHeightChanged: mediaTools.windowHeight = height - Connections { +- Component.onCompleted: chkFlash.updateVisibility() ++ Component.onCompleted: { ++ x = (Screen.width - mediaTools.windowWidth) / 2 ++ y = (Screen.height - mediaTools.windowHeight) / 2 ++ chkFlash.updateVisibility() ++ } ++ ++ Connections { + target: mediaTools + + function onNewInstanceOpened() @@ -3067,38 +3239,42 @@ + wdgMainWidget.requestActivate() + } + } -+ -+ Connections { - target: videoLayer - function onVideoInputChanged() -@@ -127,7 +138,6 @@ ApplicationWindow { + Connections { + target: videoLayer +@@ -127,10 +149,9 @@ ApplicationWindow { property real k: 0 } - ColumnLayout { id: leftControls - width: AkUnit.create(150 * AkTheme.controlScale, "dp").pixels -@@ -141,6 +151,8 @@ ApplicationWindow { +- width: AkUnit.create(150 * AkTheme.controlScale, "dp").pixels ++ width: AkUnit.create(childrenRect.width * AkTheme.controlScale, "dp").pixels + anchors.top: parent.top + anchors.topMargin: AkUnit.create(16 * AkTheme.controlScale, "dp").pixels + anchors.left: parent.left +@@ -141,6 +162,8 @@ ApplicationWindow { icon.source: "image://icons/video-effects" display: AbstractButton.IconOnly flat: true + Accessible.name: qsTr("Video effects") -+ Accessible.description: qsTr("Open video effects pannel") ++ Accessible.description: qsTr("Open video effects panel") onClicked: videoEffectsPanel.open() } -@@ -150,6 +162,8 @@ ApplicationWindow { +@@ -148,8 +171,9 @@ ApplicationWindow { + id: chkFlash + text: qsTr("Use flash") checked: true - Layout.fillWidth: true +- Layout.fillWidth: true visible: false + Accessible.name: text + Accessible.description: qsTr("Use flash when taking a photo") function updateVisibility() { -@@ -162,6 +176,8 @@ ApplicationWindow { +@@ -162,6 +186,8 @@ ApplicationWindow { textRole: "text" Layout.fillWidth: true visible: chkFlash.visible @@ -3107,7 +3283,30 @@ model: ListModel { id: lstTimeOptions -@@ -207,6 +223,8 @@ ApplicationWindow { +@@ -199,6 +225,22 @@ ApplicationWindow { + } + + Button { ++ id: snapToClipboard ++ icon.source: "image://icons/paperclip" ++ display: AbstractButton.IconOnly ++ flat: true ++ anchors.top: parent.top ++ anchors.topMargin: AkUnit.create(16 * AkTheme.controlScale, "dp").pixels ++ anchors.horizontalCenter: parent.horizontalCenter ++ Accessible.name: qsTr("Snapshot to Clipboard") ++ Accessible.description: qsTr("Captures a snapshot and copies it into the clipboard") ++ ToolTip.visible: hovered ++ ToolTip.text: qsTr("Capture Snapshot to Clipboard") ++ ++ onClicked: snapshotToClipboard() ++ } ++ ++ Button { + id: rightControls + icon.source: "image://icons/settings" + display: AbstractButton.IconOnly +@@ -207,6 +249,8 @@ ApplicationWindow { anchors.topMargin: AkUnit.create(16 * AkTheme.controlScale, "dp").pixels anchors.right: parent.right anchors.rightMargin: AkUnit.create(16 * AkTheme.controlScale, "dp").pixels @@ -3116,7 +3315,7 @@ onClicked: settings.popup() } -@@ -239,44 +257,48 @@ ApplicationWindow { +@@ -239,44 +283,48 @@ ApplicationWindow { height: AkUnit.create(64 * AkTheme.controlScale, "dp").pixels Layout.fillWidth: true @@ -3188,7 +3387,7 @@ focus: true enabled: recording.state == AkElement.ElementStateNull && (videoLayer.state == AkElement.ElementStatePlaying -@@ -320,12 +342,26 @@ ApplicationWindow { +@@ -320,12 +368,26 @@ ApplicationWindow { icon.source: recording.state == AkElement.ElementStateNull? "image://icons/video": "image://icons/record-stop" @@ -3218,7 +3417,7 @@ enabled: videoLayer.state == AkElement.ElementStatePlaying || cameraControls.state == "" -@@ -340,33 +376,25 @@ ApplicationWindow { +@@ -340,33 +402,25 @@ ApplicationWindow { } } } @@ -3263,7 +3462,7 @@ } } -@@ -382,20 +410,20 @@ ApplicationWindow { +@@ -382,20 +436,20 @@ ApplicationWindow { } PropertyChanges { target: photoButton @@ -3290,7 +3489,7 @@ visible: true } } -@@ -461,10 +489,10 @@ ApplicationWindow { +@@ -461,10 +515,10 @@ ApplicationWindow { id: photoPreviewSaveAnimation PropertyAnimation { @@ -3305,7 +3504,7 @@ } PropertyAnimation { target: photoPreview -@@ -561,25 +589,6 @@ ApplicationWindow { +@@ -561,25 +615,6 @@ ApplicationWindow { id: settingsDialog width: parent.width height: parent.height @@ -4079,6 +4278,64 @@ + } + } +} +--- /dev/null ++++ webcamoid-9.0.0/StandAlone/share/themes/WebcamoidTheme/icons/hicolor/scalable/paperclip.svg +@@ -0,0 +1,55 @@ ++ ++ ++ ++ --- webcamoid-9.0.0.orig/StandAlone/share/themes/WebcamoidTheme/qmldir +++ webcamoid-9.0.0/StandAlone/share/themes/WebcamoidTheme/qmldir @@ -11,6 +11,7 @@ DialogButtonBox 1.0 DialogButtonBox.qml @@ -7854,7 +8111,7 @@ A simple webcam application for picture and video capture. Eine einfache Webcam-Anwendung für die Bild- und Videoaufzeichnung. -@@ -43,25 +58,25 @@ +@@ -43,64 +58,64 @@ Über %1 @@ -7862,30 +8119,35 @@ + About - Information of the program, like name, description, vesion, etc.. +- Über + Information of the program, like name, description, version, etc.. - Über ++ Über - + Contributors List of people contributing to the project: software developers, translators, designers, etc.. - Beitragende +- Beitragende ++ Beitragende - + License Program license. - Lizenz +- Lizenz ++ Lizenz - + 3rd Party Licenses License for 3rd party components used in Webcamoid, like libraries and code snippets. - Drittanbieter-Lizenzen -@@ -70,37 +85,37 @@ +- Drittanbieter-Lizenzen ++ Drittanbieter-Lizenzen + + AddVideoFormat @@ -7981,7 +8243,7 @@ + + + Configure input -+ ++ Eingabe konfigurieren + + + @@ -7996,7 +8258,7 @@ + + + Configure output -+ ++ Ausgabe konfigurieren + + + @@ -8010,13 +8272,15 @@ - + From: %1 - +- ++ Von: %1 - + To: %1 - +- ++ An: %1 - @@ -8036,8 +8300,12 @@ Time remaining: %1 Zeit übrig: %1 -@@ -268,7 +299,7 @@ - +@@ -265,10 +296,10 @@ + + + Download ready +- ++ Herunterladen bereit - @@ -8099,12 +8367,12 @@ - + + Screen capture -+ ++ Bildschirmaufnahme + + + + Audio capture/playback -+ ++ Audioaufnahme/-wiedergabe + + + @@ -8117,7 +8385,7 @@ Root method The preferred method for executing commands with elevated privileges in the system. Admin-/Root-Methode -@@ -331,35 +362,48 @@ +@@ -331,37 +362,50 @@ ImageCapture @@ -8136,7 +8404,7 @@ - + + Search directory to save imagess -+ ++ Verzeichnis suchen, um Bilder zu speichern + + + @@ -8170,8 +8438,11 @@ - + PipeWire Screen - +- ++ PipeWire-Bildschirm + + @@ -377,76 +421,89 @@ Plugins @@ -8215,7 +8486,7 @@ + + + Remove -+ Entfernen ++ Entfernen + + + @@ -8250,21 +8521,23 @@ - + Send debug output to a file - +- ++ Debug-Ausgabe in eine Datei senden - + FILE - +- ++ DATEI ++ ++ ++ ++ Open a new instance of %1. ++ Eine neue Instanz von %1 öffnen. - -+ -+ Open a new instance of %1. -+ -+ -+ + Search in the specified plugins paths recursively. Rekursiv in den angegebenen Plugin-Pfaden suchen. @@ -8323,6 +8596,15 @@ Updates Aktualisierungen +@@ -521,7 +578,7 @@ + + + About +- Über ++ Über + + + @@ -532,80 +589,90 @@ TableColor @@ -8330,18 +8612,19 @@ - + Select the new color - Wählen Sie die neue Farbe aus - +- Wählen Sie die neue Farbe aus ++ Wählen Sie die neue Farbe aus ++ + + + Color %1 -+ ++ Farbe %1 + + + + Remove color %1 -+ -+ ++ Farbe %1 entfernen + UpdatesConfig @@ -8453,15 +8736,18 @@ Restart Webcamoid? Webcamoid neu starten? -@@ -657,7 +724,7 @@ +@@ -657,9 +724,9 @@ Kann neueste Version nicht finden - + Download the virtual camera manually? - +- ++ Die virtuelle Kamera manuell herunterladen? + + @@ -670,18 +737,18 @@ Videoformat-Optionen @@ -8492,7 +8778,7 @@ + + + Remove %1 video effect -+ ++ Videoeffekt %1 entfernen + @@ -8510,7 +8796,7 @@ - + + Search video effect -+ ++ Videoeffekt suchen + + + @@ -8608,7 +8894,7 @@ - + + Search file to use as source -+ ++ Datei suchen, um sie als Quelle zu verwenden + + + @@ -8631,40 +8917,38 @@ + + + VideoInputs - -- -- All Video Files -- Alle Videodateien ++ + + Add source + Quelle hinzufügen - - -- ++ ++ + + Configure source -+ ++ Quelle konfigurieren + -+ + +- +- All Video Files +- Alle Videodateien + + No webcams found + Keine Webcams gefunden -+ + + + + VideoLayer -+ + +- + 3GP Video -- 3GP-Video -+ 3GP-Video + 3GP-Video - + AVI Video -- AVI-Video -+ AVI-Video + AVI-Video - @@ -8681,15 +8965,13 @@ + Flash Video Adobe FLV Flash video -- Flash-Video -+ Flash-Video + Flash-Video - + Animated GIF -- Animiertes GIF -+ Animiertes GIF + Animiertes GIF - @@ -8715,50 +8997,45 @@ + + MKV Video -- MKV-Video -+ MKV-Video + MKV-Video - + Animated PNG -- Animiertes PNG -+ Animiertes PNG -+ -+ -+ -+ Multiple-image Network Graphics -+ + Animiertes PNG - ++ ++ Multiple-image Network Graphics ++ ++ ++ + QuickTime Video -- QuickTime-Video -+ QuickTime-Video + QuickTime-Video - + MP4 Video -- MP4-Video -+ MP4-Video + MP4-Video - + MPEG Video -- MPEG-Video -+ MPEG-Video + MPEG-Video - + Ogg Video -- Ogg-Video -+ Ogg-Video -+ -+ + Ogg-Video + + +- + + Portable Bitmap + @@ -8771,10 +9048,9 @@ + + + Portable Network Graphics -+ - - -- ++ Portable Netzwerkgrafik ++ ++ + + Portable Pixmap + @@ -8783,16 +9059,15 @@ + RealMedia Video Don't translate "RealMedia", leave it as is. -- RealMedia-Video -+ RealMedia-Video -+ -+ -+ -+ Scalable Vector Graphics -+ + RealMedia-Video - ++ ++ Scalable Vector Graphics ++ Skalierbare Vektorgrafik ++ ++ + + Truevision TGA + @@ -8805,8 +9080,7 @@ + + DVD Video -- DVD-Video -+ DVD-Video + DVD-Video - @@ -8817,26 +9091,27 @@ + + WebM Video -- WebM-Video -+ WebM-Video + WebM-Video - -- Windows Media Video -- Also known as WMV, is a video file format. -- Windows Media-Video + + WebP -+ ++ WebP ++ ++ ++ + Windows Media Video + Also known as WMV, is a video file format. + Windows Media-Video - - All Files - Alle Dateien -+ -+ Windows Media Video -+ Also known as WMV, is a video file format. -+ Windows Media-Video ++ ++ X11 Bitmap ++ - - @@ -8845,17 +9120,17 @@ - - Edit - Bearbeiten -+ -+ X11 Bitmap ++ ++ X11 Pixmap + - - Remove - Entfernen -+ -+ X11 Pixmap -+ ++ ++ All Image and Video Files ++ Alle Bild- und Videodateien - - @@ -8864,17 +9139,14 @@ - - Add source - Quelle hinzufügen -+ -+ All Image and Video Files -+ - - +- +- - - No webcams found - Keine Webcams gefunden + + All Files -+ Alle Dateien ++ Alle Dateien - - @@ -8981,14 +9253,15 @@ - - Can't set virtual camera picture +- + + Search image to use as default output picture - ++ Bild suchen, das als Standardausgabebild verwendet werden soll + Can't set virtual camera picture -+ ++ Virtuelles Kamerabild kann nicht festgelegt werden + + + @@ -9001,14 +9274,15 @@ Please choose an image file Bitte wählen Sie eine Bilddatei aus -@@ -1067,53 +1249,64 @@ +@@ -1067,98 +1249,129 @@ VideoOutputs - + The virtual camera is outdated (%1), install the latest version (%2)? - +- ++ Die virtuelle Kamera ist veraltet (%1), installieren Sie die neueste Version (%2)? - @@ -9016,68 +9290,77 @@ + + Install - +- ++ Installieren - + + + Install virtual camera -+ ++ Virtuelle Kamera installieren + + + + Configure output -+ ++ Ausgabe konfigurieren + + + Add output - +- ++ Ausgabe hinzufügen - + Error Creating Virtual Camera - +- ++ Fehler beim Erstellen einer virtuellen Kamera - + Remove all outputs - +- ++ Alle Ausgaben entfernen - + Error removing virtual cameras - +- ++ Fehler beim Entfernen virtueller Kameras - + Error Removing Virtual Cameras - Fehler beim Entfernen virtueller Kameras +- Fehler beim Entfernen virtueller Kameras ++ Fehler beim Entfernen virtueller Kameras - + Set output picture - +- ++ Ausgabebild festlegen - + The virtual camera is not installed, do you want to install it? - +- ++ Die virtuelle Kamera ist nicht installiert, möchten Sie sie installieren? - + The virtual camera is not supported in this platform - +- ++ Die virtuelle Kamera wird auf dieser Plattform nicht unterstützt -@@ -1121,44 +1314,64 @@ + VideoRecording @@ -9096,7 +9379,7 @@ - + + Search directory to save videos -+ ++ Verzeichnis zum Speichern von Videos suchen + + + @@ -9122,7 +9405,7 @@ + Configure file format -+ ++ Dateiformat konfigurieren + + + @@ -9133,7 +9416,7 @@ - + + Configure video codec -+ ++ Videocodec konfigurieren + + + @@ -9144,7 +9427,7 @@ - + + Configure audio codec -+ ++ Audiocodec konfigurieren + + + @@ -9179,10 +9462,9 @@ - - N° of colors -- Anzahl der Farben + + Number of colors -+ + Anzahl der Farben - @@ -9246,7 +9528,7 @@ + + + Column 0, Row 0 -+ ++ Spalte 0, Zeile 0 + + + @@ -9254,7 +9536,7 @@ + + + Column 1, Row 0 -+ ++ Spalte 1, Zeile 0 + + + @@ -9262,13 +9544,13 @@ + + + Column 2, Row 0 -+ ++ Spalte 2, Zeile 0 + + + + + Column 3, Row 0 -+ ++ Spalte 3, Zeile 0 + + + @@ -9276,7 +9558,7 @@ + + + Column 0, Row 1 -+ ++ Spalte 0, Zeile 1 + + + @@ -9284,7 +9566,7 @@ + + + Column 1, Row 1 -+ ++ Spalte 1, Zeile 1 + + + @@ -9292,40 +9574,40 @@ + + + Column 2, Row 1 -+ ++ Spalte 2, Zeile 1 + + + + + Column 3, Row 1 -+ ++ Spalte 3, Zeile 1 + + + + + + Column 0, Row 2 -+ ++ Spalte 0, Zeile 2 + + + + + + Column 1, Row 2 -+ ++ Spalte 1, Zeile 2 + + + + + + Column 2, Row 2 -+ ++ Spalte 2, Zeile 2 + + + + + Column 3, Row 2 -+ ++ Spalte 3, Zeile 2 + + + @@ -9390,7 +9672,7 @@ - + Search the font to be used -+ ++ Zu verwendende Schriftart suchen + + + @@ -9738,12 +10020,12 @@ - + + Image file to use as palette -+ ++ Als Palette zu verwendende Bilddatei + + + + Search the image file to use as palette -+ ++ Bilddatei suchen, die als Palette verwendet werden soll + + + @@ -9839,7 +10121,6 @@ - - - N° of frames -- Anzahl der Bilder + + + @@ -9851,7 +10132,7 @@ + + + Number of frames -+ + Anzahl der Bilder - @@ -9903,7 +10184,7 @@ Grid size Rastergröße -@@ -1664,885 +1980,926 @@ +@@ -1664,885 +1980,927 @@ Geschwindigkeit @@ -10177,7 +10458,8 @@ - + Blur Outer - +- ++ Unschärfe außen - @@ -10481,33 +10763,33 @@ - Hintergründe + + Search the image to put into the detected rectangle -+ ++ Bild suchen, das in das erkannte Rechteck eingefügt werden soll ++ ++ ++ ++ Background ++ Hintergrund - -+ -+ Background -+ -+ -+ + + Horizontal Offset -+ ++ Horizontaler Versatz + + + + Vertical Offset -+ ++ Vertikaler Versatz + + + + Horizontal Radius % -+ ++ Horizontaler Radius % + + + + Vertical Radius % -+ ++ Vertikaler Radius % + + + @@ -10531,7 +10813,7 @@ - + + Search the image to use as background -+ ++ Bild suchen, das als Hintergrund verwendet werden soll + + + @@ -10558,7 +10840,9 @@ + Advanced face area settings for background blur or image below. - +- ++ Erweiterte Gesichtsbereichseinstellungen ++für Hintergrundunschärfe oder Bild unten. - @@ -10590,7 +10874,8 @@ - + Round Area - +- ++ Runder Bereich - @@ -10770,12 +11055,12 @@ - + + Image to use as pattern -+ ++ Als Muster zu verwendendes Bild + + + + Search the image to use as pattern -+ ++ Bild suchen, das als Muster verwendet werden soll + + + @@ -10869,7 +11154,7 @@ + + + Number of drops -+ ++ Anzahl der Tropfen - @@ -10881,7 +11166,7 @@ - + + Select font -+ ++ Schriftart auswählen + + + @@ -10899,7 +11184,7 @@ - + + Minimum drop length -+ ++ Minimale Tropfenlänge + + + @@ -10911,7 +11196,7 @@ - + + Maximum drop length -+ ++ Maximale Tropfenlänge + + + @@ -10923,7 +11208,7 @@ - + + Minimum speed -+ ++ Mindestgeschwindigkeit + + + @@ -10935,7 +11220,7 @@ - + + Maximum speed -+ ++ Höchstgeschwindigkeit + + + @@ -11073,7 +11358,7 @@ Choose the hide color Wählen Sie die Ausblendfarbe -@@ -2552,23 +2909,23 @@ background blur or image below. +@@ -2552,23 +2910,23 @@ background blur or image below. Vertikale Synchronisation @@ -11102,7 +11387,7 @@ Temperature Temperatur -@@ -2578,204 +2935,347 @@ background blur or image below. +@@ -2578,204 +2936,347 @@ background blur or image below. Videoformat @@ -11127,7 +11412,7 @@ - + + Reset to default values -+ ++ Auf Standardwerte zurücksetzen + + + @@ -11212,17 +11497,17 @@ - + + Video effects -+ ++ Videoeffekte + + + + Open video effects pannel -+ ++ Videoeffekte-Panel öffnen + + + + Use flash when taking a photo -+ ++ Beim Fotografieren Blitzlicht verwenden + + + @@ -11232,42 +11517,42 @@ + + + The time to wait before the photo is taken -+ ++ Wartezeit bis zur Aufnahme des Fotos + + + + Sources and outputs settings -+ ++ Einstellungen für Quellen und Ausgaben + + + + Open sources and outputs settings menu -+ ++ Einstellungsmenü für Quellen und Ausgaben öffnen + + + + Open last photo -+ ++ Letztes Foto öffnen + + + + Open last photo taken -+ ++ Zuletzt aufgenommenes Foto öffnen + + + + Image capture mode -+ ++ Bildaufnahmemodus + + + + Make a capture and save it to an image file -+ ++ Eine Aufnahme machen und sie in einer Bilddatei speichern + + + + Put %1 in image capture mode -+ ++ %1 in den Bildaufnahmemodus versetzen + + + @@ -11280,37 +11565,37 @@ + + + Stop video recording -+ ++ Videoaufzeichnung stoppen + + + + Video capture mode -+ ++ Videoaufnahmemodus + + + + Put %1 in video recording mode -+ ++ %1 in den Videoaufnahmemodus versetzen + + + + Start recording to a video file -+ ++ Aufnahme in eine Videodatei starten + + + + Stop current video recording -+ ++ Aktuelle Videoaufnahme stoppen + + + + Open last video -+ ++ Letztes Video öffnen + + + + Open last recorded video -+ ++ Zuletzt aufgenommenes Video öffnen + + + @@ -11435,7 +11720,8 @@ - + Aspect ratio width - +- ++ Seitenverhältnisbreite - @@ -11449,7 +11735,8 @@ - + Aspect ratio height - +- ++ Seitenverhältnishöhe - @@ -11493,53 +11780,66 @@ Expanding -@@ -2785,17 +3285,17 @@ duration (seconds) +@@ -2785,20 +3286,20 @@ duration (seconds) - + Add color - +- ++ Farbe hinzufügen - + Clear all colors - +- ++ Alle Farben löschen - + Select the color to add Select the color to add to the color table - -@@ -2811,19 +3311,24 @@ duration (seconds) - +- ++ Hinzufügende Farbe auswählen + + + +@@ -2808,22 +3309,27 @@ duration (seconds) + + + Gamma +- ++ Gamma - + Hue - +- ++ Farbton - + Saturation - +- ++ Sättigung - + Luminance - - +- ++ Luminanz ++ + + + Force frame rate -+ -+ ++ Bildrate erzwingen + --- webcamoid-9.0.0.orig/StandAlone/share/ts/el.ts @@ -75068,27 +75368,32 @@ --- webcamoid-9.0.0.orig/StandAlone/share/ts/ru.ts +++ webcamoid-9.0.0/StandAlone/share/ts/ru.ts -@@ -15,22 +15,37 @@ - +@@ -12,27 +12,42 @@ + + Built from + Built from "short commit hash" +- ++ Собрана из - +- Using Qt %1 +- Используется Qt + + Built from %1 -+ ++ Собрана из %1 + + + + Open the commit in your web browser -+ -+ -+ -+ - Using Qt %1 - Используется Qt ++ Открыть коммит в браузере -- + ++ Using Qt %1 ++ С использованием Qt %1 ++ ++ + Website Сайт @@ -75097,7 +75402,7 @@ - + + Go to %1 website -+ ++ Перейти на сайт %1 + + + @@ -75108,40 +75413,52 @@ - + A simple webcam application for picture and video capture. - Простое приложение веб-камеры для захвата изображения и видео. +- Простое приложение веб-камеры для захвата изображения и видео. ++ Простое приложение для захвата изображения и видео с веб-камеры. -@@ -43,25 +58,25 @@ - + + +@@ -40,67 +55,67 @@ + + + About %1 +- ++ О %1 - + About - Information of the program, like name, description, vesion, etc.. +- О программе + Information of the program, like name, description, version, etc.. - О программе ++ О программе - + Contributors List of people contributing to the project: software developers, translators, designers, etc.. - Авторы +- Авторы ++ Авторы - + License Program license. - Лицензия +- Лицензия ++ Лицензия - + 3rd Party Licenses License for 3rd party components used in Webcamoid, like libraries and code snippets. - Лицензии третьих лиц -@@ -70,37 +85,37 @@ +- Лицензии третьих лиц ++ Лицензии сторонних компонентов + + AddVideoFormat @@ -75186,7 +75503,7 @@ Frame rate Частота кадров -@@ -113,12 +128,12 @@ +@@ -113,14 +128,14 @@ Параметры аудиокодека @@ -75199,8 +75516,11 @@ - + Bitrate (bits/secs) - Битрат (бит/сек) +- Битрат (бит/сек) ++ Битрейт (бит/сек) + + @@ -131,30 +146,38 @@ Параметры аудиоустройства @@ -75237,7 +75557,7 @@ + + + Configure input -+ ++ Настроить ввод + + + @@ -75252,13 +75572,22 @@ + + + Configure output -+ ++ Настроть выход + + + AudioVideoPanel +@@ -203,7 +234,7 @@ + + + The virtual camera is in use by the following applications: +- Виртуальная камера используется в следующих приложениях: ++ Виртуальная камера используется приложениями: + + + @@ -227,27 +258,27 @@ Скачивание %1 @@ -75266,13 +75595,15 @@ - + From: %1 - +- ++ Из: %1 - + To: %1 - +- ++ В: %1 - @@ -75292,8 +75623,12 @@ Time remaining: %1 Оставшееся время: %1 -@@ -268,7 +299,7 @@ - +@@ -265,10 +296,10 @@ + + + Download ready +- ++ Успешно загружено - @@ -75301,7 +75636,7 @@ Install the virtual camera? Установить виртуальную камеру? -@@ -276,53 +307,53 @@ +@@ -276,92 +307,105 @@ GeneralConfig @@ -75355,25 +75690,28 @@ - + + Screen capture -+ ++ Захват экрана + + + + Audio capture/playback -+ ++ Захват/воспроизведение аудио + + + Video record - Видеозапись +- Видеозапись ++ Запись видео - + Root method The preferred method for executing commands with elevated privileges in the system. - Корневой метод -@@ -331,35 +362,48 @@ +- Корневой метод ++ Повышение привилегий + + ImageCapture @@ -75386,15 +75724,16 @@ - + Search - Поиск +- Поиск ++ Обзор ++ ++ ++ ++ Search directory to save imagess ++ Выбрать каталог для сохранения изображений - -+ -+ Search directory to save imagess -+ -+ -+ + File format Формат файла @@ -75417,7 +75756,7 @@ + + + Close %1 panel -+ ++ Закрыть панель %1 + + + @@ -75426,16 +75765,20 @@ - + PipeWire Screen - +- ++ Экран PipeWire -@@ -377,76 +421,89 @@ + + +@@ -377,85 +421,98 @@ Плагины - + Search plugins in subfolders - Поиск плагинов в подпапках +- Поиск плагинов в подпапках ++ Искать плагины в подкаталогах - @@ -75447,20 +75790,20 @@ - - Remove - Удалить -- -- -- + - Update - Обновление ++ Update ++ Обновить -- +- +- Update +- Обновление + + Update plugins list -+ -+ -+ ++ Обновить список плагинов + + +- + Add plugins search path Добавить путь поиска плагинов @@ -75471,7 +75814,7 @@ + + + Remove -+ Удалить ++ Удалить + + + @@ -75486,13 +75829,15 @@ - + Load settings from PATH. If PATH is empty, load configs from application directory. - Загрузить настройки из PATH. Если PATH пуст, загрузите конфиги из каталога приложения. +- Загрузить настройки из PATH. Если PATH пуст, загрузите конфиги из каталога приложения. ++ Загрузить настройки из PATH. Если PATH пуст, загрузить конфиги из каталога приложения. - + PATH - ПУТЬ +- ПУТЬ ++ PATH - @@ -75500,44 +75845,51 @@ + + PATH1;PATH2;PATH3;... - ПУТЬ1;ПУТЬ2;ПУТЬ3;... +- ПУТЬ1;ПУТЬ2;ПУТЬ3;... ++ PATH1;PATH2;PATH3;... - + Send debug output to a file - +- ++ Сохранить отладочный вывод в файл - + FILE - ФАЙЛ +- ФАЙЛ ++ FILE ++ ++ ++ ++ Open a new instance of %1. ++ Открыть новый экземпляр %1. - -+ -+ Open a new instance of %1. -+ -+ -+ + Search in the specified plugins paths recursively. - Рекурсивный поиск по указанным путям подключаемых плагинов. +- Рекурсивный поиск по указанным путям подключаемых плагинов. ++ Рекурсивный поиск плагинов по указанным путям. - + Semi-colon separated list of paths to search for plugins. - Список путей для поиска плагинов разделен точкой с запятой. +- Список путей для поиска плагинов разделен точкой с запятой. ++ Список путей для поиска плагинов, разделённых точкой с запятой. - + Semi-colon separated list of paths to avoid loading. Blacklist of plugins that could have conflicts when loading in Webcamoid. - Список путей, чтобы избежать нагрузки разделен точкой с запятой. -@@ -455,7 +512,7 @@ +- Список путей, чтобы избежать нагрузки разделен точкой с запятой. ++ Список игнорируемых при поиске путей, разделённых точкой с запятой. + + Recording @@ -75579,6 +75931,21 @@ Updates Обновления +@@ -516,12 +573,12 @@ + + + Donate +- ++ Пожертвовать + + + + About +- О программе ++ О программе + + + @@ -532,80 +589,90 @@ TableColor @@ -75586,18 +75953,19 @@ - + Select the new color - Выберите новый цвет - +- Выберите новый цвет ++ Выберите новый цвет ++ + + + Color %1 -+ ++ Цвет %1 + + + + Remove color %1 -+ -+ ++ Убрать цвет %1 + UpdatesConfig @@ -75611,13 +75979,15 @@ - + Show updates dialog - Показать диалоговое окно обновления +- Показать диалоговое окно обновления ++ Показать диалог обновления - + Check new versions - Проверка новых версий +- Проверка новых версий ++ Проверять новые версии - @@ -75659,7 +76029,8 @@ - + Last updated - Последнее обновление +- Последнее обновление ++ Последняя проверка - @@ -75685,7 +76056,7 @@ Report a Bug Сообщить об ошибке -@@ -618,12 +685,12 @@ +@@ -618,14 +685,14 @@ Доступна новая версия! @@ -75698,8 +76069,11 @@ - + Show this dialog next time - Показать это диалоговое окно в следующий раз +- Показать это диалоговое окно в следующий раз ++ Показать это окно в следующий раз + + @@ -644,7 +711,7 @@ Установка прошла успешно @@ -75709,15 +76083,22 @@ Restart Webcamoid? Перезапустить Webcamoid? -@@ -657,7 +724,7 @@ - +@@ -654,12 +721,12 @@ + + + Can't get latest version +- ++ Не удалось скачать последнюю версию - + Download the virtual camera manually? - +- ++ Скачать виртуальную камеру вручную? + + @@ -670,18 +737,18 @@ Параметры видеокодека @@ -75731,7 +76112,8 @@ - + Bitrate (bits/secs) - Битрат (бит/сек) +- Битрат (бит/сек) ++ Битрейт (бит/сек) - @@ -75741,20 +76123,23 @@ Keyframes stride Ключевые кадры -@@ -693,6 +760,11 @@ +@@ -693,35 +760,45 @@ Remove Удалить + + + Remove %1 video effect -+ ++ Удалить %1 видеоэффект + VideoEffectsDialog -@@ -702,12 +774,17 @@ - Добавить видео эффект + + + Add video effect +- Добавить видео эффект ++ Добавить видеоэффект - @@ -75766,14 +76151,16 @@ - + + Search video effect -+ ++ Искать видеоэффект + + + Chain effect Apply the effect over the other effects. - Цепной эффект -@@ -716,12 +793,12 @@ +- Цепной эффект ++ Добавить в список + + VideoEffectsList @@ -75788,6 +76175,15 @@ Remove all effects Удалить все эффекты +@@ -736,7 +813,7 @@ + + + %1 options +- %1 опции ++ %1 настройки + + + @@ -747,7 +824,7 @@ Параметры формата видео @@ -75858,15 +76254,16 @@ - + Search - Поиск +- Поиск ++ Обзор ++ ++ ++ ++ Search file to use as source ++ Выбрать файл для использования в качестве источника - -+ -+ Search file to use as source -+ -+ -+ + Choose the file to add as source Выберите файл для добавления в качестве источника @@ -75879,29 +76276,29 @@ + Edit + Редактировать + -+ + +- +- All Video Files +- Все Видеофайлы + + Remove + Удалить -+ + + + + VideoInputs -+ + +- + + Add source + Добавить источник + - -- -- All Video Files -- Все Видеофайлы ++ + + Configure source -+ - - -- ++ Настроить источник ++ ++ + + No webcams found + Веб-камеры не найдены @@ -75913,24 +76310,24 @@ + 3GP Video - Видео 3GP -+ Видео 3GP ++ 3GP видео - + AVI Video - Видео AVI -+ Видео AVI ++ AVI видео + + + + Windows Bitmap -+ ++ Точечный рисунок Windows + + + + Microsoft Windows Cursor -+ ++ Курсор Microsoft Windows - @@ -75938,172 +76335,170 @@ Flash Video Adobe FLV Flash video - Flash Video -+ Flash Video ++ Flash видео - + Animated GIF -- Анимированный GIF -+ Анимированный GIF + Анимированный GIF - + + Graphic Interchange Format -+ ++ Graphic Interchange Format + + + + Apple Icon Image -+ ++ Иконка Apple + + + + Microsoft Windows Icon -+ ++ Иконка Microsoft Windows + + + + Joint Photographic Experts Group -+ ++ Joint Photographic Experts Group + + + MKV Video - Видео MKV -+ Видео MKV ++ MKV видео - + Animated PNG -- Анимированный PNG -+ Анимированный PNG + Анимированный PNG - + + Multiple-image Network Graphics -+ ++ Multiple-image Network Graphics + + + QuickTime Video - Видео QuickTime -+ Видео QuickTime ++ QuickTime видео - + MP4 Video - Видео MP4 -+ Видео MP4 ++ MP4 видео - + MPEG Video - Видео MPEG -+ Видео MPEG ++ MPEG видео - + Ogg Video - Видео Ogg -+ Видео Ogg ++ Ogg видео + + + + Portable Bitmap -+ - - -- ++ Portable Bitmap ++ ++ + + Portable Graymap -+ ++ Portable Graymap + + + + Portable Network Graphics -+ ++ Portable Network Graphics + + + + Portable Pixmap -+ -+ -+ ++ Portable Pixmap + + +- + RealMedia Video Don't translate "RealMedia", leave it as is. - Видео RealMedia -+ Видео RealMedia -+ -+ ++ RealMedia видео + + +- + + Scalable Vector Graphics -+ ++ Scalable Vector Graphics + + + + Truevision TGA -+ - - -- ++ Truevision TGA ++ ++ + + Tagged Image File Format -+ ++ Tagged Image File Format + + + DVD Video - Видео DVD -+ Видео DVD ++ DVD видео ++ ++ ++ ++ Wireless Bitmap ++ Wireless Bitmap - -+ -+ Wireless Bitmap -+ -+ -+ + WebM Video - Видео WebM -+ Видео WebM ++ WebM видео - -- Windows Media Video -- Also known as WMV, is a video file format. -- Видео Windows Media + + WebP -+ ++ WebP ++ ++ ++ + Windows Media Video + Also known as WMV, is a video file format. +- Видео Windows Media ++ Windows Media видео - - All Files - Все файлы -+ -+ Windows Media Video -+ Also known as WMV, is a video file format. -+ Видео Windows Media - +- - - - VideoInputOptions - +- - - Edit - Редактировать + + X11 Bitmap -+ ++ Точечный рисунок X11 - @@ -76111,7 +76506,7 @@ - Удалить + + X11 Pixmap -+ ++ X11 Pixmap - - @@ -76122,7 +76517,7 @@ - Добавить источник + + All Image and Video Files -+ ++ Все картинки и видео - @@ -76130,7 +76525,7 @@ - Веб-камеры не найдены + + All Files -+ Все файлы ++ Все файлы - - @@ -76140,7 +76535,8 @@ + No Output Disable video output, don't send the video to the output device. - Нет выхода +- Нет выхода ++ Выхода нет - @@ -76232,19 +76628,21 @@ - + Search - Поиск +- Поиск ++ Обзор - - Can't set virtual camera picture +- + + Search image to use as default output picture - ++ Выбрать изображение для записи по умолчанию + Can't set virtual camera picture -+ ++ Не удалось выбрать картинку по умолчанию + + + @@ -76264,7 +76662,8 @@ - + The virtual camera is outdated (%1), install the latest version (%2)? - +- ++ Виртуальная камера %1 устарела, установить последнюю версию %1? - @@ -76279,17 +76678,18 @@ + + + Install virtual camera -+ ++ Установить виртуальную камеру + + + + Configure output -+ ++ Настроить вывод + + + Add output - +- ++ Добавить вывод - @@ -76301,7 +76701,8 @@ - + Remove all outputs - +- ++ Удалить все выводы - @@ -76319,13 +76720,15 @@ - + Set output picture - +- ++ Выбрать картинку для вывода - + The virtual camera is not installed, do you want to install it? - +- ++ Виртуальная камера не установлены, хотите её установить? - @@ -76346,13 +76749,14 @@ - + Search - Поиск +- Поиск ++ Обзор - + + Search directory to save videos -+ ++ Выбрать каталог для сохранения видео + + + @@ -76373,34 +76777,37 @@ + + Configure - Конфигурирация +- Конфигурирация ++ Настройка + Configure file format -+ ++ Настроить формат файла + + + Video codec - Видео кодек +- Видео кодек ++ Видеокодек ++ ++ ++ ++ Configure video codec ++ Настроить видеокодек - -+ -+ Configure video codec -+ -+ -+ + Audio codec - Аудио кодек +- Аудио кодек ++ Аудиокодек - + + Configure audio codec -+ ++ Настроить аудиокодек + + + @@ -76438,7 +76845,7 @@ - N° цвета + + Number of colors -+ ++ Количество цветов - @@ -76480,7 +76887,8 @@ + + Choose a color - Выберите цвет +- Выберите цвет ++ Выбрать цвет - @@ -76502,7 +76910,7 @@ + + + Column 0, Row 0 -+ ++ Столбец 0, строка 0 + + + @@ -76510,7 +76918,7 @@ + + + Column 1, Row 0 -+ ++ Столбец 1, строка 0 + + + @@ -76518,13 +76926,13 @@ + + + Column 2, Row 0 -+ ++ Столбец 2, строка 0 + + + + + Column 3, Row 0 -+ ++ Столбец 3, строка 0 + + + @@ -76532,7 +76940,7 @@ + + + Column 0, Row 1 -+ ++ Столбец 0, строка 1 + + + @@ -76540,7 +76948,7 @@ + + + Column 1, Row 1 -+ ++ Столбец 1, строка 1 + + + @@ -76548,40 +76956,40 @@ + + + Column 2, Row 1 -+ ++ Столбец 2, строка 1 + + + + + Column 3, Row 1 -+ ++ Столбец 3, строка 1 + + + + + + Column 0, Row 2 -+ ++ Столбец 0, строка 2 + + + + + + Column 1, Row 2 -+ ++ Столбец 1, строка 2 + + + + + + Column 2, Row 2 -+ ++ Столбец 2, строка 2 + + + + + Column 3, Row 2 -+ ++ Столбец 3, строка 2 + + + @@ -76596,7 +77004,8 @@ - + Natural - Натуральный +- Натуральный ++ Естественный - @@ -76640,13 +77049,14 @@ + + Search - Поиск +- Поиск ++ Выбрать - + Search the font to be used -+ ++ Выбрать шрифт + + + @@ -76769,7 +77179,8 @@ + + Compatible with OpenGL - Совместимость с OpenGL +- Совместимость с OpenGL ++ Совместимость с OpenGL - @@ -76785,7 +77196,8 @@ + + No subpixel antialias - Нет субпиксельного сглаживания +- Нет субпиксельного сглаживания ++ Нет субпиксельного сглаживания - @@ -76793,7 +77205,8 @@ + + No font merging - Нет слияния шрифтов +- Нет слияния шрифтов ++ Нет слияния шрифтов - @@ -76817,7 +77230,8 @@ - + Reversed - Реверсивный +- Реверсивный ++ Реверсивный - @@ -76961,7 +77375,8 @@ - + X-Ray - X-Ray +- X-Ray ++ X-Ray - @@ -76994,12 +77409,12 @@ - + + Image file to use as palette -+ ++ Выбрать файл для палитры + + + + Search the image file to use as palette -+ ++ Выбрать файл для палитры + + + @@ -77009,8 +77424,12 @@ Please choose an image file Пожалуйста, выберите файл изображения -@@ -1554,107 +1869,108 @@ - Свернутая матрица +@@ -1551,110 +1866,111 @@ + + Convolve matrix + https://en.wikipedia.org/wiki/Kernel_(image_processing) +- Свернутая матрица ++ Матрица свертки - @@ -77029,7 +77448,8 @@ + + Factor - Фактор +- Фактор ++ Коэффициент - @@ -77039,7 +77459,8 @@ + + Bias - Смещение +- Смещение ++ Смещение - @@ -77069,7 +77490,8 @@ - + Rings increase - Кольца увеличиваются +- Кольца увеличиваются ++ Радиальное увеличение - @@ -77107,7 +77529,7 @@ + + + Number of frames -+ ++ Количество кадров - @@ -77159,14 +77581,15 @@ Grid size Размер сетки -@@ -1664,886 +1980,927 @@ +@@ -1664,888 +1980,929 @@ Скорость - + Zoom rate - Кратность зума +- Кратность зума ++ Увеличение - @@ -77185,7 +77608,8 @@ - + Canny threshold - Порог Canny +- Порог Canny ++ Порог Кэнни - @@ -77433,7 +77857,8 @@ - + Blur Outer - Размытие внешнего +- Размытие внешнего ++ Размытие фона - @@ -77451,19 +77876,22 @@ - + Solid - Твердый +- Твердый ++ Линия - + Dash - Тире +- Тире ++ Пунктир - + Dot - Точка +- Точка ++ Точки - @@ -77603,7 +78031,8 @@ - + Gnu - Антилопа +- Антилопа ++ Антилопа гну - @@ -77729,7 +78158,8 @@ - + Replace face with this picture - Заменять лицо этой картинкой +- Заменять лицо этой картинкой ++ Заменить лицо этой картинкой - @@ -77737,33 +78167,33 @@ - Фоны + + Search the image to put into the detected rectangle -+ ++ Выбрать картинку, которой будет заменено лицо - + + Background -+ ++ Фон + + + + Horizontal Offset -+ ++ Горизонтальное смещение + + + + Vertical Offset -+ ++ Вертикальное смещение + + + + Horizontal Radius % -+ ++ Горизонтальный радиус, % + + + + Vertical Radius % -+ ++ Вертикальный радиус, % + + + @@ -77780,14 +78210,15 @@ - + Replace background with this picture - Заменять фон этой картинкой +- Заменять фон этой картинкой ++ Заменить фон этой картинкой - - + + Search the image to use as background -+ ++ Выбрать картинку для фона + + + @@ -77815,9 +78246,9 @@ Advanced face area settings for background blur or image below. Расширенные настройки области лица для - размытия фона или изображения ниже. - - +-размытия фона или изображения ниже. +- +- - - H-Offset - @@ -77826,14 +78257,16 @@ - - V-Offset - -- -- ++размытия фона или изображения снизу. + + - - + + Width Adjust % - Регулировка ширины % +- Регулировка ширины % ++ Изменение ширины, % - @@ -77841,15 +78274,16 @@ + + Height Adjust % - Регулировка высоты % +- Регулировка высоты % ++ Регулировка высоты, % - + Round Area - - - +- +- +- - - H-Radius % - @@ -77858,8 +78292,9 @@ - - V-Radius % - -- -- ++ Область скругления + + - + Select marker color @@ -77869,13 +78304,15 @@ - + Hard - Тяжелый +- Тяжелый ++ Сильное - + Cooling - Охлаждение +- Охлаждение ++ Температура - @@ -77895,7 +78332,8 @@ + + Zoom - Зум +- Зум ++ Зум - @@ -77940,7 +78378,8 @@ + Alpha variation Alpha channel, also known as the transparency component of a pixel in an image. - Альфа-вариация +- Альфа-вариация ++ Альфа-вариация - @@ -77948,7 +78387,8 @@ + + Stride - Шаг +- Шаг ++ Шаг - @@ -78002,19 +78442,22 @@ - + Ordered 4x4 - Упорядоченно 4x4 +- Упорядоченно 4x4 ++ Упорядоченно 4x4 - + Ordered 6x6 - Упорядоченно 6x6 +- Упорядоченно 6x6 ++ Упорядоченно 6x6 - + Ordered 8x8 - Упорядоченно 8x8 +- Упорядоченно 8x8 ++ Упорядоченно 8x8 - @@ -78027,12 +78470,12 @@ - + + Image to use as pattern -+ ++ Изображение для шаблона + + + + Search the image to use as pattern -+ ++ Выбрать изображение для шаблона + + + @@ -78054,7 +78497,8 @@ + + Slope - Склон +- Склон ++ Наклон - @@ -78062,7 +78506,8 @@ + + Intercept - Перехват +- Перехват ++ Перехват - @@ -78094,7 +78539,8 @@ + + Speed increment - Прирост скорости +- Прирост скорости ++ Прирост скорости - @@ -78126,7 +78572,7 @@ + + + Number of drops -+ ++ Число струй - @@ -78138,7 +78584,7 @@ - + + Select font -+ ++ Выбрать шрифт + + + @@ -78149,58 +78595,63 @@ - + Choose the cursor color - Выберите цвет курсора +- Выберите цвет курсора ++ Выбрать цвет курсора ++ ++ ++ ++ Minimum drop length ++ Минимальная длина струи - - -+ -+ Minimum drop length -+ -+ -+ + Min. drop length - Минимальная длина капли +- Минимальная длина капли ++ Мин. длина капли - - + + Maximum drop length -+ ++ Максимальная длина струи + + + Max. drop length - Максимальная длина капли +- Максимальная длина капли ++ Макс. длина капли - - +- Min. speed + + Minimum speed -+ -+ -+ -+ - Min. speed Минимальная скорость - - -+ -+ Maximum speed -+ +- Max. speed ++ ++ Min. speed ++ Мин. скорость + + -+ - Max. speed ++ ++ Maximum speed Максимальная скорость - ++ ++ Max. speed ++ Макс. скорость ++ ++ + Show cursor Показать курсор @@ -78328,8 +78779,11 @@ - + Choose the hide color - Выберите скрытый цвет +- Выберите скрытый цвет ++ Выберите цвет для скрытия + + @@ -2553,23 +2910,23 @@ background blur or image below. Вертикальная синхронизация @@ -78351,7 +78805,8 @@ - + Degrees - Степени +- Степени ++ Степени - @@ -78359,7 +78814,7 @@ Temperature Температура -@@ -2579,205 +2936,348 @@ background blur or image below. +@@ -2579,228 +2936,371 @@ background blur or image below. Формат видео @@ -78384,7 +78839,7 @@ - + + Reset to default values -+ ++ Сброс на настройки по умолчанию + + + @@ -78469,57 +78924,57 @@ - + + Video effects -+ ++ Видеоэффекты + + + + Open video effects pannel -+ ++ Открыть панель с видеоэффектами + + + + Use flash when taking a photo -+ ++ Использовать вспышку при фото + + + + Photo timer -+ ++ Таймер фото + + + + The time to wait before the photo is taken -+ ++ Задержка перед съёмкой фото + + + + Sources and outputs settings -+ ++ Настройки входов и выходов + + + + Open sources and outputs settings menu -+ ++ Открыть меню входов и выходов + + + + Open last photo -+ ++ Открыть последнее фото + + + + Open last photo taken -+ ++ Открыть последнее снятое фото + + + + Image capture mode -+ ++ Режим захвата картинки + + + + Make a capture and save it to an image file -+ ++ Захватить картинку и сохранить её в файл + + + @@ -78537,12 +78992,12 @@ + + + Stop video recording -+ ++ Остановить запись видео + + + + Video capture mode -+ ++ Режим захвата видео + + + @@ -78552,22 +79007,22 @@ + + + Start recording to a video file -+ ++ Начать запись видео в файл + + + + Stop current video recording -+ ++ Остановить запись текущего видео + + + + Open last video -+ ++ Открыть последнее видео + + + + Open last recorded video -+ ++ Открыть последнее записанное видео + + + @@ -78592,13 +79047,15 @@ - + Zoom out rate - Скорость уменьшения зума +- Скорость уменьшения зума ++ Скорость уменьшения зума - + Zoom in rate - Скорость увеличения зума +- Скорость увеличения зума ++ Скорость увеличения зума - @@ -78610,22 +79067,22 @@ - + + Padding top -+ ++ Отступ сверху + + + + Padding left -+ ++ Отступ слева + + + + Padding right -+ ++ Отступ справа + + + + Padding bottom -+ ++ Отступ снизу + + + @@ -78635,27 +79092,28 @@ + + Margin top -+ ++ Граница сверху + + + + Margin left -+ ++ Граница слева + + + + Margin right -+ ++ Граница справа + + + Margin bottom -+ ++ Граница снизу + + + e.g. 16:9, 4:3 - например 16:9, 4:3 +- например 16:9, 4:3 ++ например, 16:9, 4:3 - @@ -78693,7 +79151,8 @@ - + Aspect ratio width - +- ++ Соотношение по ширине - @@ -78707,7 +79166,8 @@ - + Aspect ratio height - +- ++ Соотношение по высоте - @@ -78749,55 +79209,72 @@ - + Expanding - Расширение +- Расширение ++ Расширение -@@ -2787,17 +3287,17 @@ duration (seconds) - + + + Levels +- ++ Уровни - + Add color - +- ++ Добавить цвет - + Clear all colors - +- ++ Очистить все цвета - + Select the color to add Select the color to add to the color table - -@@ -2813,19 +3313,24 @@ duration (seconds) - +- ++ Выберите цвет для добавления + + + +@@ -2810,22 +3310,27 @@ duration (seconds) + + + Gamma +- ++ Гамма - + Hue - +- ++ Оттенок - + Saturation - +- ++ Насыщенность - + Luminance - - +- ++ Яркость ++ + + + Force frame rate -+ -+ ++ Принудительная частота кадров + --- webcamoid-9.0.0.orig/StandAlone/share/ts/si.ts @@ -104822,6 +105299,16 @@ + +--- webcamoid-9.0.0.orig/StandAlone/src/CMakeLists.txt ++++ webcamoid-9.0.0/StandAlone/src/CMakeLists.txt +@@ -142,7 +142,6 @@ endif () + add_definitions(-DCOMMONS_TARGET="webcamoid" + -DCOMMONS_APPNAME="Webcamoid" + -DCOMMONS_VERSION="${VERSION}") +-set(QML_IMPORT_PATH ../../libAvKys/Lib/share/qml) + + if (APPLE) + install(TARGETS StandAlone DESTINATION ${CMAKE_INSTALL_PREFIX}) --- webcamoid-9.0.0.orig/StandAlone/src/clioptions.cpp +++ webcamoid-9.0.0/StandAlone/src/clioptions.cpp @@ -17,7 +17,7 @@ @@ -105429,7 +105916,32 @@ #include #include #include -@@ -795,9 +796,11 @@ void Recording::thumbnailUpdated(const A +@@ -32,6 +33,8 @@ + #include + #include + #include ++#include ++#include + #include + #include + #include +@@ -761,6 +764,15 @@ void Recording::savePhoto(const QString + } + } + ++bool Recording::copyToClipboard() ++{ ++ if (!this->d->m_photo.isNull()) { ++ QApplication::clipboard()->setImage(this->d->m_photo, QClipboard::Clipboard); ++ return true; ++ } ++ return false; ++} ++ + AkPacket Recording::iStream(const AkPacket &packet) + { + if (packet.caps().mimeType() == "video/x-raw") { +@@ -795,9 +807,11 @@ void Recording::thumbnailUpdated(const A return; this->d->m_thumbnail = thumbnail; @@ -105444,7 +105956,7 @@ } void Recording::mediaLoaded(const QString &media) -@@ -834,13 +837,44 @@ void Recording::mediaLoaded(const QStrin +@@ -834,13 +848,44 @@ void Recording::mediaLoaded(const QStrin RecordingPrivate::RecordingPrivate(Recording *self): self(self) { @@ -105469,13 +105981,13 @@ + {"webp", "WebP (WEBP)" }, + {"xbm" , "X11 Bitmap (XBM)" }, + {"xpm" , "X11 Pixmap (XPM)" }, - }; - ++ }; ++ + static const QMap formatsMapping { + {"jpeg", "jpg" }, + {"tif" , "tiff"}, -+ }; -+ + }; + + for (auto &format: QImageWriter::supportedImageFormats()) { + QString fmt = format; + @@ -105494,6 +106006,16 @@ this->m_mediaWriterImpl = akPluginManager->defaultPlugin("MultimediaSink/MultiSink/Impl/*", {"MultiSinkImpl"}).id(); +--- webcamoid-9.0.0.orig/StandAlone/src/recording.h ++++ webcamoid-9.0.0/StandAlone/src/recording.h +@@ -263,6 +263,7 @@ class Recording: public QObject + void resetImageSaveQuality(); + void takePhoto(); + void savePhoto(const QString &fileName); ++ bool copyToClipboard(); + AkPacket iStream(const AkPacket &packet); + void setQmlEngine(QQmlApplicationEngine *engine=nullptr); + --- webcamoid-9.0.0.orig/StandAlone/src/videodisplay.h +++ webcamoid-9.0.0/StandAlone/src/videodisplay.h @@ -38,7 +38,7 @@ class VideoDisplay: public QQuickItem @@ -109309,6 +109831,16 @@ void resetMirror(); void resetAsynchronous(); void resetMipmap(); +--- webcamoid-9.0.0.orig/libAvKys/Plugins/AdjustHSL/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/AdjustHSL/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(AdjustHSL + target_compile_definitions(AdjustHSL PRIVATE AVKYS_PLUGIN_ADJUSTHSL) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(AdjustHSL avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS AdjustHSL RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/AdjustHSL/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/AdjustHSL/share/qml/main.qml @@ -48,6 +48,7 @@ GridLayout { @@ -109377,6 +109909,16 @@ onValueChanged: AdjustHSL.luminance = Number(value) } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Aging/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Aging/CMakeLists.txt +@@ -60,7 +60,6 @@ target_include_directories(Aging + target_compile_definitions(Aging PRIVATE AVKYS_PLUGIN_AGING) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Aging avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Aging RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/Aging/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/Aging/share/qml/main.qml @@ -45,6 +45,7 @@ GridLayout { @@ -109410,6 +109952,16 @@ onCheckedChanged: Aging.addDust = checked } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/AspectRatio/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/AspectRatio/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(AspectRatio + target_compile_definitions(AspectRatio PRIVATE AVKYS_PLUGIN_ASPECTRATIO) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(AspectRatio avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS AspectRatio RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/AspectRatio/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/AspectRatio/share/qml/main.qml @@ -25,11 +25,13 @@ GridLayout { @@ -110042,6 +110594,26 @@ -}; - -#endif // JACKSERVER_H +--- webcamoid-9.0.0.orig/libAvKys/Plugins/AudioGen/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/AudioGen/CMakeLists.txt +@@ -56,7 +56,6 @@ target_include_directories(AudioGen + target_compile_definitions(AudioGen PRIVATE AVKYS_PLUGIN_AUDIOGEN) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(AudioGen avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS AudioGen RUNTIME DESTINATION ${PLUGINSDIR}) +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Blur/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Blur/CMakeLists.txt +@@ -59,7 +59,6 @@ target_include_directories(Blur + target_compile_definitions(Blur PRIVATE AVKYS_PLUGIN_BLUR) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Blur avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Blur RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/Blur/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/Blur/share/qml/main.qml @@ -45,6 +45,7 @@ GridLayout { @@ -110070,6 +110642,16 @@ add_subdirectory(Multiplex) add_subdirectory(MultiSink) add_subdirectory(MultiSrc) +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Cartoon/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Cartoon/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(Cartoon + target_compile_definitions(Cartoon PRIVATE AVKYS_PLUGIN_CARTOON) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Cartoon avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Cartoon RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/Cartoon/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/Cartoon/share/qml/main.qml @@ -69,7 +69,7 @@ GridLayout { @@ -110182,6 +110764,16 @@ onTextChanged: Cartoon.scanSize = strToSize(text) } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/ChangeHSL/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/ChangeHSL/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(ChangeHSL + target_compile_definitions(ChangeHSL PRIVATE AVKYS_PLUGIN_CHANGEHSL) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(ChangeHSL avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS ChangeHSL RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/ChangeHSL/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/ChangeHSL/share/qml/main.qml @@ -33,6 +33,7 @@ ColumnLayout { @@ -110288,6 +110880,16 @@ onTextChanged: updateKernel(11, text) } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Charify/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Charify/CMakeLists.txt +@@ -61,7 +61,6 @@ target_include_directories(Charify + target_compile_definitions(Charify PRIVATE AVKYS_PLUGIN_CHARIFY) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Charify avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Charify RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/Charify/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/Charify/share/qml/main.qml @@ -41,6 +41,7 @@ GridLayout { @@ -110418,6 +111020,16 @@ onCheckedChanged: Charify.reversed = checked } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Cinema/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Cinema/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(Cinema + target_compile_definitions(Cinema PRIVATE AVKYS_PLUGIN_CINEMA) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Cinema avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Cinema RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/Cinema/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/Cinema/share/qml/main.qml @@ -47,6 +47,7 @@ GridLayout { @@ -110452,6 +111064,16 @@ onCurrentColorChanged: Cinema.stripColor = AkUtils.toRgba(currentColor) } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/ColorFilter/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/ColorFilter/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(ColorFilter + target_compile_definitions(ColorFilter PRIVATE AVKYS_PLUGIN_COLORFILTER) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(ColorFilter avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS ColorFilter RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/ColorFilter/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/ColorFilter/share/qml/main.qml @@ -38,6 +38,7 @@ GridLayout { @@ -110494,6 +111116,16 @@ onCheckedChanged: ColorFilter.soft = checked } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/ColorReplace/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/ColorReplace/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(ColorReplace + target_compile_definitions(ColorReplace PRIVATE AVKYS_PLUGIN_COLORREPLACE) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(ColorReplace avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS ColorReplace RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/ColorReplace/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/ColorReplace/share/qml/main.qml @@ -38,6 +38,7 @@ GridLayout { @@ -110544,6 +111176,16 @@ onValueChanged: ColorReplace.radius = Number(value) } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/ColorTap/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/ColorTap/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(ColorTap + target_compile_definitions(ColorTap PRIVATE AVKYS_PLUGIN_COLORTAP) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(ColorTap avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS ColorTap RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/ColorTap/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/ColorTap/share/qml/main.qml @@ -33,12 +33,14 @@ ColumnLayout { @@ -110577,6 +111219,16 @@ onClicked: fileDialog.open() } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/ColorTransform/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/ColorTransform/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(ColorTransfor + target_compile_definitions(ColorTransform PRIVATE AVKYS_PLUGIN_COLORTRANSFORM) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(ColorTransform avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS ColorTransform RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/ColorTransform/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/ColorTransform/share/qml/main.qml @@ -48,6 +48,7 @@ ColumnLayout { @@ -110675,6 +111327,16 @@ onTextChanged: updateKernel(11, text) } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Contrast/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Contrast/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(Contrast + target_compile_definitions(Contrast PRIVATE AVKYS_PLUGIN_CONTRAST) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Contrast avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Contrast RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/Contrast/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/Contrast/share/qml/main.qml @@ -46,6 +46,7 @@ GridLayout { @@ -110693,6 +111355,16 @@ onValueChanged: Contrast.contrast = Number(value) } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Convolve/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Convolve/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(Convolve + target_compile_definitions(Convolve PRIVATE AVKYS_PLUGIN_CONVOLVE) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Convolve avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Convolve RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/Convolve/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/Convolve/share/qml/main.qml @@ -59,6 +59,7 @@ ColumnLayout { @@ -110805,6 +111477,16 @@ onValueChanged: Convolve.bias = Number(value) } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/DelayGrab/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/DelayGrab/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(DelayGrab + target_compile_definitions(DelayGrab PRIVATE AVKYS_PLUGIN_DELAYGRAB) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(DelayGrab avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS DelayGrab RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/DelayGrab/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/DelayGrab/share/qml/main.qml @@ -39,6 +39,7 @@ GridLayout { @@ -110858,6 +111540,16 @@ onTextChanged: DelayGrab.nFrames = Number(text) } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Denoise/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Denoise/CMakeLists.txt +@@ -61,7 +61,6 @@ target_include_directories(Denoise + target_compile_definitions(Denoise PRIVATE AVKYS_PLUGIN_DENOISE) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Denoise avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Denoise RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/Denoise/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/Denoise/share/qml/main.qml @@ -42,6 +42,7 @@ GridLayout { @@ -110978,6 +111670,16 @@ currentIndex: 10 Layout.fillWidth: true model: [300, +--- webcamoid-9.0.0.orig/libAvKys/Plugins/DesktopCapture/src/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/DesktopCapture/src/CMakeLists.txt +@@ -61,7 +61,6 @@ target_include_directories(DesktopCaptur + target_compile_definitions(DesktopCaptureSrc PRIVATE AVKYS_PLUGIN_DESKTOPCAPTURE) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(DesktopCaptureSrc avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../../Lib/share/qml) + + if (WIN32) + install(TARGETS DesktopCaptureSrc RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/DesktopCapture/src/androidscreen/src/androidscreendev.cpp +++ webcamoid-9.0.0/libAvKys/Plugins/DesktopCapture/src/androidscreen/src/androidscreendev.cpp @@ -18,7 +18,6 @@ @@ -111282,6 +111984,16 @@ void screenAdded(QScreen *screen); void screenRemoved(QScreen *screen); void srceenResized(int screen); +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Dice/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Dice/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(Dice + target_compile_definitions(Dice PRIVATE AVKYS_PLUGIN_DICE) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Dice avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Dice RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/Dice/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/Dice/share/qml/main.qml @@ -45,6 +45,7 @@ GridLayout { @@ -111300,6 +112012,16 @@ onValueChanged: Dice.diceSize = value } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Distort/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Distort/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(Distort + target_compile_definitions(Distort PRIVATE AVKYS_PLUGIN_DISTORT) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Distort avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Distort RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/Distort/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/Distort/share/qml/main.qml @@ -26,6 +26,7 @@ GridLayout { @@ -111348,6 +112070,16 @@ onTextChanged: Distort.gridSizeLog = Number(text) } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Dizzy/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Dizzy/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(Dizzy + target_compile_definitions(Dizzy PRIVATE AVKYS_PLUGIN_DIZZY) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Dizzy avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Dizzy RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/Dizzy/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/Dizzy/share/qml/main.qml @@ -57,6 +57,7 @@ GridLayout { @@ -111398,6 +112130,16 @@ readonly property int decimals: 2 readonly property int multiplier: Math.pow(10, decimals) +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Edge/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Edge/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(Edge + target_compile_definitions(Edge PRIVATE AVKYS_PLUGIN_EDGE) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Edge avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Edge RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/Edge/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/Edge/share/qml/main.qml @@ -42,6 +42,7 @@ GridLayout { @@ -111480,6 +112222,16 @@ onCheckedChanged: Edge.invert = checked } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Emboss/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Emboss/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(Emboss + target_compile_definitions(Emboss PRIVATE AVKYS_PLUGIN_EMBOSS) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Emboss avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Emboss RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/Emboss/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/Emboss/share/qml/main.qml @@ -26,6 +26,7 @@ GridLayout { @@ -111513,6 +112265,26 @@ onTextChanged: Emboss.bias = Number(text) } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Equalize/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Equalize/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(Equalize + target_compile_definitions(Equalize PRIVATE AVKYS_PLUGIN_EQUALIZE) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Equalize avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Equalize RUNTIME DESTINATION ${PLUGINSDIR}) +--- webcamoid-9.0.0.orig/libAvKys/Plugins/FaceDetect/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/FaceDetect/CMakeLists.txt +@@ -71,7 +71,6 @@ target_include_directories(FaceDetect + target_compile_definitions(FaceDetect PRIVATE AVKYS_PLUGIN_FACEDETECT) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(FaceDetect avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS FaceDetect RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/FaceDetect/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/FaceDetect/share/qml/main.qml @@ -89,6 +89,7 @@ GridLayout { @@ -112022,6 +112794,16 @@ } threadPool.waitForDone(); +--- webcamoid-9.0.0.orig/libAvKys/Plugins/FaceTrack/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/FaceTrack/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(FaceTrack + target_compile_definitions(FaceTrack PRIVATE AVKYS_PLUGIN_FACETRACK) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(FaceTrack avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS FaceTrack RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/FaceTrack/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/FaceTrack/share/qml/main.qml @@ -55,6 +55,7 @@ GridLayout { @@ -112247,6 +113029,16 @@ onCheckedChanged: FaceTrack.debugModeEnabled = checked } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/FalseColor/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/FalseColor/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(FalseColor + target_compile_definitions(FalseColor PRIVATE AVKYS_PLUGIN_FALSECOLOR) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(FalseColor avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS FalseColor RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/FalseColor/share/qml/TableColor.qml +++ webcamoid-9.0.0/libAvKys/Plugins/FalseColor/share/qml/TableColor.qml @@ -25,6 +25,7 @@ import AkControls 1.0 as AK @@ -112289,6 +113081,16 @@ onCheckedChanged: FalseColor.soft = checked } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Fire/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Fire/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(Fire + target_compile_definitions(Fire PRIVATE AVKYS_PLUGIN_FIRE) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Fire avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Fire RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/Fire/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/Fire/share/qml/main.qml @@ -79,6 +79,7 @@ GridLayout { @@ -112494,6 +113296,16 @@ onValueChanged: Fire.nColors = value } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Flip/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Flip/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(Flip + target_compile_definitions(Flip PRIVATE AVKYS_PLUGIN_FLIP) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Flip avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Flip RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/Flip/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/Flip/share/qml/main.qml @@ -25,20 +25,24 @@ GridLayout { @@ -112521,6 +113333,16 @@ onCheckedChanged: Flip.verticalFlip = checked } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/FrameOverlap/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/FrameOverlap/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(FrameOverlap + target_compile_definitions(FrameOverlap PRIVATE AVKYS_PLUGIN_FRAMEOVERLAP) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(FrameOverlap avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS FrameOverlap RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/FrameOverlap/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/FrameOverlap/share/qml/main.qml @@ -26,22 +26,25 @@ GridLayout { @@ -112559,6 +113381,16 @@ onTextChanged: FrameOverlap.stride = Number(text) } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Gamma/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Gamma/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(Gamma + target_compile_definitions(Gamma PRIVATE AVKYS_PLUGIN_GAMMA) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Gamma avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Gamma RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/Gamma/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/Gamma/share/qml/main.qml @@ -46,6 +46,7 @@ GridLayout { @@ -112577,6 +113409,16 @@ onValueChanged: Gamma.gamma = Number(value) } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/GrayScale/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/GrayScale/CMakeLists.txt +@@ -57,7 +57,6 @@ target_include_directories(GrayScale + target_compile_definitions(GrayScale PRIVATE AVKYS_PLUGIN_GRAYSCALE) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(GrayScale avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS GrayScale RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/GrayScale/src/grayscaleelement.cpp +++ webcamoid-9.0.0/libAvKys/Plugins/GrayScale/src/grayscaleelement.cpp @@ -29,7 +29,7 @@ GrayScaleElement::GrayScaleElement(): Ak @@ -112588,6 +113430,16 @@ akSend(oPacket) } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Halftone/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Halftone/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(Halftone + target_compile_definitions(Halftone PRIVATE AVKYS_PLUGIN_HALFTONE) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Halftone avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Halftone RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/Halftone/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/Halftone/share/qml/main.qml @@ -47,12 +47,14 @@ GridLayout { @@ -112686,6 +113538,16 @@ onTextChanged: Halftone.intercept = Number(text) } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Hypnotic/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Hypnotic/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(Hypnotic + target_compile_definitions(Hypnotic PRIVATE AVKYS_PLUGIN_HYPNOTIC) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Hypnotic avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Hypnotic RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/Hypnotic/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/Hypnotic/share/qml/main.qml @@ -49,6 +49,7 @@ GridLayout { @@ -112744,7 +113606,7 @@ } --- /dev/null +++ webcamoid-9.0.0/libAvKys/Plugins/ImageSrc/CMakeLists.txt -@@ -0,0 +1,68 @@ +@@ -0,0 +1,67 @@ +# Webcamoid, webcam capture application. +# Copyright (C) 2022 Gonzalo Exequiel Pedone +# @@ -112806,7 +113668,6 @@ +target_compile_definitions(ImageSrc PRIVATE AVKYS_PLUGIN_IMAGESRC) +list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) +target_link_libraries(ImageSrc avkys ${QT_LIBS}) -+set(QML_IMPORT_PATH ../../Lib/share/qml) + +if (WIN32) + install(TARGETS ImageSrc RUNTIME DESTINATION ${PLUGINSDIR}) @@ -113557,6 +114418,16 @@ +}; + +#endif // IMAGESRCELEMENT_H +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Implode/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Implode/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(Implode + target_compile_definitions(Implode PRIVATE AVKYS_PLUGIN_IMPLODE) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Implode avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Implode RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/Implode/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/Implode/share/qml/main.qml @@ -25,6 +25,7 @@ GridLayout { @@ -113575,6 +114446,26 @@ onTextChanged: Implode.amount = Number(text) } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Invert/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Invert/CMakeLists.txt +@@ -57,7 +57,6 @@ target_include_directories(Invert + target_compile_definitions(Invert PRIVATE AVKYS_PLUGIN_INVERT) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Invert avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Invert RUNTIME DESTINATION ${PLUGINSDIR}) +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Life/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Life/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(Life + target_compile_definitions(Life PRIVATE AVKYS_PLUGIN_LIFE) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Life avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Life RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/Life/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/Life/share/qml/main.qml @@ -43,6 +43,7 @@ GridLayout { @@ -113631,6 +114522,16 @@ onValueChanged: Life.lumaThreshold = value } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Matrix/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Matrix/CMakeLists.txt +@@ -62,7 +62,6 @@ target_include_directories(Matrix + target_compile_definitions(Matrix PRIVATE AVKYS_PLUGIN_MATRIX) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Matrix avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Matrix RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/Matrix/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/Matrix/share/qml/main.qml @@ -41,20 +41,23 @@ GridLayout { @@ -113839,6 +114740,16 @@ onCheckedChanged: Matrix.showCursor = checked } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/MatrixTransform/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/MatrixTransform/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(MatrixTransfo + target_compile_definitions(MatrixTransform PRIVATE AVKYS_PLUGIN_MATRIXTRANSFORM) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(MatrixTransform avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS MatrixTransform RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/MatrixTransform/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/MatrixTransform/share/qml/main.qml @@ -47,6 +47,7 @@ ColumnLayout { @@ -114147,7 +115058,7 @@ text: qsTr("Subtitles track") } ComboBox { -@@ -153,6 +160,8 @@ GridLayout { +@@ -153,6 +160,16 @@ GridLayout { id: lstSubtitlesTracks } Layout.fillWidth: true @@ -114155,10 +115066,18 @@ + onCurrentIndexChanged: updateStreams() } ++ ++ CheckBox { ++ id: cbSynchronise ++ text: qsTr("Synchronise") ++ Layout.fillWidth: true ++ checked: MultiSrc.sync ++ onToggled:MultiSrc.setSync(checked) ++ } } --- webcamoid-9.0.0.orig/libAvKys/Plugins/MultiSrc/src/ffmpeg/src/mediasourceffmpeg.cpp +++ webcamoid-9.0.0/libAvKys/Plugins/MultiSrc/src/ffmpeg/src/mediasourceffmpeg.cpp -@@ -18,14 +18,14 @@ +@@ -18,17 +18,22 @@ */ #include @@ -114177,7 +115096,15 @@ #include #include -@@ -512,9 +512,10 @@ bool MediaSourceFFmpeg::setState(AkEleme ++extern "C" ++{ ++ #include ++} ++ + #ifdef HAVE_LIBAVDEVICE + extern "C" + { +@@ -512,9 +517,10 @@ bool MediaSourceFFmpeg::setState(AkEleme this->d->m_run = true; this->d->m_paused = state == AkElement::ElementStatePaused; this->d->m_eos = false; @@ -114191,7 +115118,7 @@ this->d->m_state = state; emit this->stateChanged(state); -@@ -616,9 +617,10 @@ void MediaSourceFFmpeg::doLoop() +@@ -616,9 +622,10 @@ void MediaSourceFFmpeg::doLoop() void MediaSourceFFmpeg::packetConsumed() { @@ -114205,7 +115132,7 @@ } void MediaSourceFFmpeg::log() -@@ -686,9 +688,9 @@ bool MediaSourceFFmpeg::initContext() +@@ -686,9 +693,9 @@ bool MediaSourceFFmpeg::initContext() inputFormat = av_find_input_format("v4l2"); } else if (QRegExp(R"(:\d+\.\d+(?:\+\d+,\d+)?)").exactMatch(uri)) { inputFormat = av_find_input_format("x11grab"); @@ -114369,6 +115296,26 @@ } void MediaSourceVLCPrivate::mediaPlayerTimeChanged(const libvlc_event_t *event, void *userData) +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Multiplex/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Multiplex/CMakeLists.txt +@@ -56,7 +56,6 @@ target_include_directories(Multiplex + target_compile_definitions(Multiplex PRIVATE AVKYS_PLUGIN_MULTIPLEX) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Multiplex avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Multiplex RUNTIME DESTINATION ${PLUGINSDIR}) +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Nervous/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Nervous/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(Nervous + target_compile_definitions(Nervous PRIVATE AVKYS_PLUGIN_NERVOUS) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Nervous avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Nervous RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/Nervous/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/Nervous/share/qml/main.qml @@ -25,21 +25,24 @@ GridLayout { @@ -114406,6 +115353,26 @@ onCheckedChanged: Nervous.simple = checked } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Normalize/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Normalize/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(Normalize + target_compile_definitions(Normalize PRIVATE AVKYS_PLUGIN_NORMALIZE) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Normalize avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Normalize RUNTIME DESTINATION ${PLUGINSDIR}) +--- webcamoid-9.0.0.orig/libAvKys/Plugins/OilPaint/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/OilPaint/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(OilPaint + target_compile_definitions(OilPaint PRIVATE AVKYS_PLUGIN_OILPAINT) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(OilPaint avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS OilPaint RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/OilPaint/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/OilPaint/share/qml/main.qml @@ -25,6 +25,7 @@ GridLayout { @@ -114424,6 +115391,16 @@ onTextChanged: OilPaint.radius = Number(text) } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Otsu/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Otsu/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(Otsu + target_compile_definitions(Otsu PRIVATE AVKYS_PLUGIN_OTSU) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Otsu avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Otsu RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/Otsu/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/Otsu/share/qml/main.qml @@ -46,6 +46,7 @@ GridLayout { @@ -114442,6 +115419,16 @@ onValueChanged: Otsu.levels = Number(value) } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Photocopy/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Photocopy/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(Photocopy + target_compile_definitions(Photocopy PRIVATE AVKYS_PLUGIN_PHOTOCOPY) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Photocopy avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Photocopy RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/Photocopy/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/Photocopy/share/qml/main.qml @@ -25,6 +25,7 @@ GridLayout { @@ -114473,6 +115460,16 @@ onTextChanged: Photocopy.contrast = Number(text) } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Pixelate/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Pixelate/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(Pixelate + target_compile_definitions(Pixelate PRIVATE AVKYS_PLUGIN_PIXELATE) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Pixelate avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Pixelate RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/Pixelate/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/Pixelate/share/qml/main.qml @@ -38,6 +38,7 @@ GridLayout { @@ -114491,6 +115488,16 @@ onTextChanged: Pixelate.blockSize = strToSize(text) } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/PrimariesColors/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/PrimariesColors/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(PrimariesColo + target_compile_definitions(PrimariesColors PRIVATE AVKYS_PLUGIN_PRIMARIESCOLORS) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(PrimariesColors avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS PrimariesColors RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/PrimariesColors/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/PrimariesColors/share/qml/main.qml @@ -25,6 +25,7 @@ GridLayout { @@ -114509,6 +115516,16 @@ onTextChanged: PrimariesColors.factor = Number(text) } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Quark/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Quark/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(Quark + target_compile_definitions(Quark PRIVATE AVKYS_PLUGIN_QUARK) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Quark avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Quark RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/Quark/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/Quark/share/qml/main.qml @@ -25,16 +25,18 @@ GridLayout { @@ -114532,6 +115549,16 @@ onTextChanged: Quark.nFrames = Number(text) } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Radioactive/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Radioactive/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(Radioactive + target_compile_definitions(Radioactive PRIVATE AVKYS_PLUGIN_RADIOACTIVE) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Radioactive avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Radioactive RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/Radioactive/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/Radioactive/share/qml/main.qml @@ -40,6 +40,7 @@ GridLayout { @@ -114622,6 +115649,16 @@ onCurrentColorChanged: Radioactive.radColor = AkUtils.toRgba(currentColor) } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Ripple/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Ripple/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(Ripple + target_compile_definitions(Ripple PRIVATE AVKYS_PLUGIN_RIPPLE) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Ripple avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Ripple RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/Ripple/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/Ripple/share/qml/main.qml @@ -38,6 +38,7 @@ GridLayout { @@ -114705,6 +115742,16 @@ onTextChanged: Ripple.lumaThreshold = Number(text) } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Scale/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Scale/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(Scale + target_compile_definitions(Scale PRIVATE AVKYS_PLUGIN_SCALE) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Scale avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Scale RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/Scale/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/Scale/share/qml/main.qml @@ -39,6 +39,7 @@ GridLayout { @@ -114757,6 +115804,16 @@ textRole: "text" currentIndex: optionIndex(this, Scaling.aspectRatio) Layout.fillWidth: true +--- webcamoid-9.0.0.orig/libAvKys/Plugins/ScanLines/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/ScanLines/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(ScanLines + target_compile_definitions(ScanLines PRIVATE AVKYS_PLUGIN_SCANLINES) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(ScanLines avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS ScanLines RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/ScanLines/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/ScanLines/share/qml/main.qml @@ -31,6 +31,7 @@ GridLayout { @@ -114801,6 +115858,16 @@ onCurrentColorChanged: ScanLines.hideColor = AkUtils.toRgba(currentColor) } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Scroll/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Scroll/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(Scroll + target_compile_definitions(Scroll PRIVATE AVKYS_PLUGIN_SCROLL) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Scroll avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Scroll RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/Scroll/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/Scroll/share/qml/main.qml @@ -51,6 +51,7 @@ GridLayout { @@ -114835,6 +115902,16 @@ readonly property int decimals: 2 readonly property int multiplier: Math.pow(10, decimals) +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Shagadelic/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Shagadelic/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(Shagadelic + target_compile_definitions(Shagadelic PRIVATE AVKYS_PLUGIN_SHAGADELIC) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Shagadelic avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Shagadelic RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/Shagadelic/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/Shagadelic/share/qml/main.qml @@ -30,6 +30,7 @@ GridLayout { @@ -114853,6 +115930,26 @@ onTextChanged: Shagadelic.mask = hexToInt(text) } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/SwapRB/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/SwapRB/CMakeLists.txt +@@ -57,7 +57,6 @@ target_include_directories(SwapRB + target_compile_definitions(SwapRB PRIVATE AVKYS_PLUGIN_SWAPRB) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(SwapRB avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS SwapRB RUNTIME DESTINATION ${PLUGINSDIR}) +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Swirl/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Swirl/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(Swirl + target_compile_definitions(Swirl PRIVATE AVKYS_PLUGIN_SWIRL) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Swirl avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Swirl RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/Swirl/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/Swirl/share/qml/main.qml @@ -35,6 +35,7 @@ GridLayout { @@ -114879,6 +115976,16 @@ onValueChanged: Swirl.degrees = value } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Temperature/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Temperature/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(Temperature + target_compile_definitions(Temperature PRIVATE AVKYS_PLUGIN_TEMPERATURE) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Temperature avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Temperature RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/Temperature/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/Temperature/share/qml/main.qml @@ -35,6 +35,7 @@ GridLayout { @@ -114991,6 +116098,16 @@ property int minimumWidth: 75 +--- webcamoid-9.0.0.orig/libAvKys/Plugins/VideoCapture/src/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/VideoCapture/src/CMakeLists.txt +@@ -71,7 +71,6 @@ if (WIN32) + target_link_libraries(VideoCaptureSrc ole32) + endif () + +-set(QML_IMPORT_PATH ../../../Lib/share/qml) + + if (WIN32) + install(TARGETS VideoCaptureSrc RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/VideoCapture/src/capture/avfoundation/src/captureavfoundation.h +++ webcamoid-9.0.0/libAvKys/Plugins/VideoCapture/src/capture/avfoundation/src/captureavfoundation.h @@ -47,7 +47,6 @@ class CaptureAvFoundation: public Captur @@ -115302,6 +116419,16 @@ gst_element_set_state(this->d->m_pipeline, GST_STATE_PLAYING); return true; +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Vignette/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Vignette/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(Vignette + target_compile_definitions(Vignette PRIVATE AVKYS_PLUGIN_VIGNETTE) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Vignette avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Vignette RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/Vignette/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/Vignette/share/qml/main.qml @@ -49,6 +49,7 @@ GridLayout { @@ -115420,6 +116547,30 @@ onCurrentIndexChanged: { if (visible) +--- webcamoid-9.0.0.orig/libAvKys/Plugins/VirtualCamera/src/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/VirtualCamera/src/CMakeLists.txt +@@ -62,7 +62,6 @@ target_include_directories(VirtualCamera + target_compile_definitions(VirtualCameraSrc PRIVATE AVKYS_PLUGIN_VIRTUALCAMERA) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(VirtualCameraSrc avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../../Lib/share/qml) + + if (WIN32) + install(TARGETS VirtualCameraSrc RUNTIME DESTINATION ${PLUGINSDIR}) +--- webcamoid-9.0.0.orig/libAvKys/Plugins/VirtualCamera/src/akvcam/src/vcamak.cpp ++++ webcamoid-9.0.0/libAvKys/Plugins/VirtualCamera/src/akvcam/src/vcamak.cpp +@@ -1963,9 +1963,10 @@ bool VCamAkPrivate::sudo(const QString & + } + + QProcess su; +- su.start(sudoBin, QStringList {}); ++ su.start(sudoBin, QStringList {"sh"}); + + if (su.waitForStarted()) { ++ qDebug() << "executing shell script with 'sh'" << Qt::endl << script.toUtf8(); + su.write(script.toUtf8()); + su.closeWriteChannel(); + } --- webcamoid-9.0.0.orig/libAvKys/Plugins/VirtualCamera/src/cmio/src/vcamcmio.cpp +++ webcamoid-9.0.0/libAvKys/Plugins/VirtualCamera/src/cmio/src/vcamcmio.cpp @@ -1051,12 +1051,14 @@ QVariantList VCamCMIOPrivate::controls(c @@ -115495,6 +116646,20 @@ curFormat = {}; break; +--- webcamoid-9.0.0.orig/libAvKys/Plugins/VirtualCamera/src/v4l2lb/src/vcamv4l2lb.cpp ++++ webcamoid-9.0.0/libAvKys/Plugins/VirtualCamera/src/v4l2lb/src/vcamv4l2lb.cpp +@@ -1201,9 +1201,10 @@ bool VCamV4L2LoopBackPrivate::sudo(const + } + + QProcess su; +- su.start(sudoBin, QStringList {}); ++ su.start(sudoBin, QStringList {"sh"}); + + if (su.waitForStarted()) { ++ qDebug() << "executing shell script with 'sh'" << Qt::endl << script.toUtf8(); + su.write(script.toUtf8()); + su.closeWriteChannel(); + } --- webcamoid-9.0.0.orig/libAvKys/Plugins/VirtualCamera/src/virtualcameraelement.cpp +++ webcamoid-9.0.0/libAvKys/Plugins/VirtualCamera/src/virtualcameraelement.cpp @@ -24,8 +24,8 @@ @@ -115858,6 +117023,16 @@ AkVideoCaps videoCaps; QString rootMethod; +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Warhol/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Warhol/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(Warhol + target_compile_definitions(Warhol PRIVATE AVKYS_PLUGIN_WARHOL) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Warhol avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Warhol RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/Warhol/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/Warhol/share/qml/main.qml @@ -25,16 +25,18 @@ GridLayout { @@ -115881,6 +117056,16 @@ onTextChanged: Warhol.nFrames = Number(text) } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Warp/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Warp/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(Warp + target_compile_definitions(Warp PRIVATE AVKYS_PLUGIN_WARP) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Warp avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Warp RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/Warp/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/Warp/share/qml/main.qml @@ -25,6 +25,7 @@ GridLayout { @@ -115899,6 +117084,16 @@ onTextChanged: Warp.ripples = Number(text) } +--- webcamoid-9.0.0.orig/libAvKys/Plugins/Wave/CMakeLists.txt ++++ webcamoid-9.0.0/libAvKys/Plugins/Wave/CMakeLists.txt +@@ -58,7 +58,6 @@ target_include_directories(Wave + target_compile_definitions(Wave PRIVATE AVKYS_PLUGIN_WAVE) + list(TRANSFORM QT_COMPONENTS PREPEND Qt${QT_VERSION_MAJOR}:: OUTPUT_VARIABLE QT_LIBS) + target_link_libraries(Wave avkys ${QT_LIBS}) +-set(QML_IMPORT_PATH ../../Lib/share/qml) + + if (WIN32) + install(TARGETS Wave RUNTIME DESTINATION ${PLUGINSDIR}) --- webcamoid-9.0.0.orig/libAvKys/Plugins/Wave/share/qml/main.qml +++ webcamoid-9.0.0/libAvKys/Plugins/Wave/share/qml/main.qml @@ -52,13 +52,13 @@ GridLayout { @@ -116011,6 +117206,11 @@ # Force prefix and suffix. This fix broken MinGW builds in CI environments. if (WIN32 AND NOT MSVC) +@@ -156,3 +157,4 @@ set(GST_PLUGINS_SCANNER_PATH "${GST_PLUG + # Sudoer tool search directory + + set(EXTRA_SUDOER_TOOL_DIR "" CACHE PATH "Additional sudoer tool search directory") ++set(QML_IMPORT_PATH "${CMAKE_SOURCE_DIR}/libAvKys/Lib/share/qml" CACHE STRING "additional libraries" FORCE) --- webcamoid-9.0.0.orig/ports/ci/android/build.sh +++ webcamoid-9.0.0/ports/ci/android/build.sh @@ -61,7 +61,7 @@ for arch_ in $(echo "${TARGET_ARCH}" | t diff -Nru webcamoid-9.0.0/debian/source/include-binaries webcamoid-9.0.0/debian/source/include-binaries --- webcamoid-9.0.0/debian/source/include-binaries 2022-05-06 09:58:49.000000000 +0000 +++ webcamoid-9.0.0/debian/source/include-binaries 2022-09-14 11:40:25.000000000 +0000 @@ -1,3 +1,11 @@ +StandAlone/share/themes/WebcamoidTheme/icons/hicolor/128x128/paperclip.png +StandAlone/share/themes/WebcamoidTheme/icons/hicolor/16x16/paperclip.png +StandAlone/share/themes/WebcamoidTheme/icons/hicolor/22x22/paperclip.png +StandAlone/share/themes/WebcamoidTheme/icons/hicolor/256x256/paperclip.png +StandAlone/share/themes/WebcamoidTheme/icons/hicolor/32x32/paperclip.png +StandAlone/share/themes/WebcamoidTheme/icons/hicolor/48x48/paperclip.png +StandAlone/share/themes/WebcamoidTheme/icons/hicolor/64x64/paperclip.png +StandAlone/share/themes/WebcamoidTheme/icons/hicolor/8x8/paperclip.png StandAlone/share/ts/ca.qm StandAlone/share/ts/de.qm StandAlone/share/ts/es.qm Binary files /tmp/tmp6l_vawof/Geum2tJ96h/webcamoid-9.0.0/StandAlone/share/themes/WebcamoidTheme/icons/hicolor/128x128/paperclip.png and /tmp/tmp6l_vawof/IH0hb8kom9/webcamoid-9.0.0/StandAlone/share/themes/WebcamoidTheme/icons/hicolor/128x128/paperclip.png differ Binary files /tmp/tmp6l_vawof/Geum2tJ96h/webcamoid-9.0.0/StandAlone/share/themes/WebcamoidTheme/icons/hicolor/16x16/paperclip.png and /tmp/tmp6l_vawof/IH0hb8kom9/webcamoid-9.0.0/StandAlone/share/themes/WebcamoidTheme/icons/hicolor/16x16/paperclip.png differ Binary files /tmp/tmp6l_vawof/Geum2tJ96h/webcamoid-9.0.0/StandAlone/share/themes/WebcamoidTheme/icons/hicolor/22x22/paperclip.png and /tmp/tmp6l_vawof/IH0hb8kom9/webcamoid-9.0.0/StandAlone/share/themes/WebcamoidTheme/icons/hicolor/22x22/paperclip.png differ Binary files /tmp/tmp6l_vawof/Geum2tJ96h/webcamoid-9.0.0/StandAlone/share/themes/WebcamoidTheme/icons/hicolor/256x256/paperclip.png and /tmp/tmp6l_vawof/IH0hb8kom9/webcamoid-9.0.0/StandAlone/share/themes/WebcamoidTheme/icons/hicolor/256x256/paperclip.png differ Binary files /tmp/tmp6l_vawof/Geum2tJ96h/webcamoid-9.0.0/StandAlone/share/themes/WebcamoidTheme/icons/hicolor/32x32/paperclip.png and /tmp/tmp6l_vawof/IH0hb8kom9/webcamoid-9.0.0/StandAlone/share/themes/WebcamoidTheme/icons/hicolor/32x32/paperclip.png differ Binary files /tmp/tmp6l_vawof/Geum2tJ96h/webcamoid-9.0.0/StandAlone/share/themes/WebcamoidTheme/icons/hicolor/48x48/paperclip.png and /tmp/tmp6l_vawof/IH0hb8kom9/webcamoid-9.0.0/StandAlone/share/themes/WebcamoidTheme/icons/hicolor/48x48/paperclip.png differ Binary files /tmp/tmp6l_vawof/Geum2tJ96h/webcamoid-9.0.0/StandAlone/share/themes/WebcamoidTheme/icons/hicolor/64x64/paperclip.png and /tmp/tmp6l_vawof/IH0hb8kom9/webcamoid-9.0.0/StandAlone/share/themes/WebcamoidTheme/icons/hicolor/64x64/paperclip.png differ Binary files /tmp/tmp6l_vawof/Geum2tJ96h/webcamoid-9.0.0/StandAlone/share/themes/WebcamoidTheme/icons/hicolor/8x8/paperclip.png and /tmp/tmp6l_vawof/IH0hb8kom9/webcamoid-9.0.0/StandAlone/share/themes/WebcamoidTheme/icons/hicolor/8x8/paperclip.png differ