Correction index cam virtuelle

Author: Paullux

CMakeLists.txt

@@ -89,7 +89,7 @@ INSTALL(TARGETS ${PROJECT_NAME}
 
 set(CPACK_GENERATOR "DEB")
 set(CPACK_PACKAGE_NAME "Matrix")
-set(CPACK_PACKAGE_VERSION "1.0.0")
+set(CPACK_PACKAGE_VERSION "1.0.16")
 set(CPACK_PACKAGE_VENDOR "Bit-Scripts")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Video processing with Matrix effect")
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "Matrix")

PKGBUILD

@@ -1,24 +1,37 @@
-pkgname=matrix-app
-pkgver=1.0.13
+pkgname=Matrix_CPP
+pkgver=1.0.15
 pkgrel=1
 pkgdesc="Video processing with Matrix effect"
 arch=('x86_64')
 url="https://github.com/Bit-Scripts/Matrix_CPP"
 license=('MIT')
-depends=('qt6-base' 'opencv' 'ffmpeg' 'v4l2loopback-dkms' 'v4l2loopback-utils')
+depends=('linux-zen-headers' 'linux-lts-headers' 'linux-hardened-headers' 'linux-headers' 'dkms' 'qt6-base' 'qt6-multimedia' 'qt6-multimedia-ffmpeg' 'qt6-multimedia-gstreamer' 'qt6-wayland' 'opencv' 'ffmpeg' 'v4l2loopback-dkms' 'v4l2loopback-utils' 'v4l-utils')
 makedepends=('cmake')
 source=("v${pkgver}.tar.gz::https://github.com/Bit-Scripts/Matrix_CPP/archive/refs/tags/v${pkgver}.tar.gz")
-sha256sums=('3749c4694908ceca997a460943ae3551f59cc9e87fb8b63ceed6ea08019b01e5')
+sha256sums=('34bd309f6623aaeeb87bc6c99061a543b9b466e8fd8ff7a7d5764da01b5fcd5c')
 
 build() {
-  cd "${srcdir}/v${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   mkdir -p build
   cd build
   cmake ..
   make
 }
 
 package() {
-  cd "${srcdir}/v${pkgver}/build"
-  make DESTDIR="${pkgdir}/" install
-}
+  if [[ "$(uname -r)" == *linux-zen* ]]; then
+    depends+=('linux-zen-headers')
+  elif [[ "$(uname -r)" == *linux-lts* ]]; then
+    depends+=('linux-lts-headers')
+  elif [[ "$(uname -r)" == *linux-hardened* ]]; then
+    depends+=('linux-hardened-headers')
+  elif [[ "$(uname -r)" == *linux* ]]; then
+    depends+=('linux-headers')
+  fi
+  cd "${srcdir}/${pkgname}-${pkgver}/build"
+  mkdir -p "$pkgdir/usr/local/bin/matrixresources"
+  mkdir -p "$pkgdir/usr/bin"
+  ln -s "$pkgdir/usr/local/bin/Matrix" "$pkgdir/usr/bin/"
+  ln -s "$pkgdir/usr/local/bin/matrixresources" "$pkgdir/usr/bin/"
+  make DESTDIR="${pkgdir}" install
+}

virtualcamera.cpp

@@ -180,7 +180,8 @@ void VirtualCamera::configureVirtualCamera()
 
 void VirtualCamera::handleProcessOutput() {
     QProcess process;
-    process.start("v4l2-ctl", QStringList() << "--all" << "-d" << "/dev/video4");
+    QString qstr = QString::fromStdString(devicePath);
+    process.start("v4l2-ctl", QStringList() << "--all" << "-d" << qstr);
     process.waitForFinished();
     QString processOutput = process.readAllStandardOutput();
 
@@ -213,13 +214,20 @@ void VirtualCamera::handleProcessOutput() {
 
     if (width == "1280" && height == "720") {
         enabled = true;
-        QMessageBox::information(nullptr, "Configuration terminée",
-                                 "La caméra virtuelle est configurée avec succès.");
+        QMessageBox msgBoxSuccess;
+        msgBoxSuccess.setWindowIcon(iconMatrix);
+        msgBoxSuccess.setWindowTitle("Configuration terminée");
+        msgBoxSuccess.setText("La caméra virtuelle est configurée avec succès.");
+        msgBoxSuccess.setIcon(QMessageBox::Information);
+        msgBoxSuccess.exec();
         return;
     }
-    enabled = false;
-    QMessageBox::critical(nullptr, "Échec de la configuration",
-                          "La configuration de la caméra virtuelle est incorrecte. Vérifiez les dimensions de la caméra.");
+    QMessageBox msgBoxFailure;
+    msgBoxFailure.setWindowIcon(iconMatrix);
+    msgBoxFailure.setWindowTitle("Échec de la configuration");
+    msgBoxFailure.setText("La configuration de la caméra virtuelle est incorrecte. Vérifiez les dimensions de la caméra.");
+    msgBoxFailure.setIcon(QMessageBox::Critical);
+    msgBoxFailure.exec();
 }
 
 void VirtualCamera::killProcessByPath() {