From cc83e0a6006667d126a7a83dde23a7f8ae3af994 Mon Sep 17 00:00:00 2001
From: german77 <juangerman-13@hotmail.com>
Date: Sat, 18 Jun 2022 23:34:28 -0500
Subject: yuzu: Hook qt camera to camera driver

---
 src/yuzu/configuration/configure_camera.h | 52 +++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 src/yuzu/configuration/configure_camera.h

(limited to 'src/yuzu/configuration/configure_camera.h')

diff --git a/src/yuzu/configuration/configure_camera.h b/src/yuzu/configuration/configure_camera.h
new file mode 100644
index 000000000..af7551c03
--- /dev/null
+++ b/src/yuzu/configuration/configure_camera.h
@@ -0,0 +1,52 @@
+// Text : Copyright 2022 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#pragma once
+
+#include <memory>
+#include <QDialog>
+
+class QTimer;
+class QCamera;
+class QCameraImageCapture;
+
+namespace InputCommon {
+class InputSubsystem;
+} // namespace InputCommon
+
+namespace Ui {
+class ConfigureCamera;
+}
+
+class ConfigureCamera : public QDialog {
+    Q_OBJECT
+
+public:
+    explicit ConfigureCamera(QWidget* parent, InputCommon::InputSubsystem* input_subsystem_);
+    ~ConfigureCamera() override;
+
+    void ApplyConfiguration();
+
+private:
+    void changeEvent(QEvent* event) override;
+    void RetranslateUI();
+
+    /// Load configuration settings.
+    void LoadConfiguration();
+
+    /// Restore all buttons to their default values.
+    void RestoreDefaults();
+
+    void DisplayCapturedFrame(int requestId, const QImage& img);
+
+    /// Loads and signals the current selected camera to display a frame
+    void PreviewCamera();
+
+    InputCommon::InputSubsystem* input_subsystem;
+
+    std::unique_ptr<QCamera> camera;
+    std::unique_ptr<QCameraImageCapture> camera_capture;
+    std::unique_ptr<QTimer> camera_timer;
+    std::vector<std::string> input_devices;
+    std::unique_ptr<Ui::ConfigureCamera> ui;
+};
-- 
cgit v1.2.3


From 403bdc4dafe89a463f3d93b9a389a1010ca5ff16 Mon Sep 17 00:00:00 2001
From: Narr the Reg <juangerman-13@hotmail.com>
Date: Tue, 28 Jun 2022 19:35:51 -0500
Subject: yuzu: Add webcam support and rebase to latest master

---
 src/yuzu/configuration/configure_camera.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/yuzu/configuration/configure_camera.h')

diff --git a/src/yuzu/configuration/configure_camera.h b/src/yuzu/configuration/configure_camera.h
index af7551c03..db9833b5c 100644
--- a/src/yuzu/configuration/configure_camera.h
+++ b/src/yuzu/configuration/configure_camera.h
@@ -44,6 +44,8 @@ private:
 
     InputCommon::InputSubsystem* input_subsystem;
 
+    bool is_virtual_camera;
+    int pending_snapshots;
     std::unique_ptr<QCamera> camera;
     std::unique_ptr<QCameraImageCapture> camera_capture;
     std::unique_ptr<QTimer> camera_timer;
-- 
cgit v1.2.3