ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Get InputController compiling with Qt6 

Cameras still don't work though
This commit is contained in:
Vicki Pfau 2024-03-24 14:46:34 -07:00
parent a2587cb8cf
commit cf0d8fdc28
2 changed files with 53 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/platform/qt/InputController.cpp
View File

@ -16,8 +16,13 @@
#include <QTimer>
#include <QWidget>
#ifdef BUILD_QT_MULTIMEDIA
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
#include <QCameraInfo>
#include <QVideoSurfaceFormat>
#else
#include <QCameraDevice>
#include <QMediaDevices>
#endif
#endif
#include <mgba/core/interface.h>
@ -50,7 +55,9 @@ InputController::InputController(QWidget* topLevel, QObject* parent)
m_gamepadTimer.start();
#ifdef BUILD_QT_MULTIMEDIA
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
connect(&m_videoDumper, &VideoDumper::imageAvailable, this, &InputController::setCamImage);
#endif
#endif
mInputBindKey(&m_inputMap, KEYBOARD, Qt::Key_X, GBA_KEY_A);
@ -90,10 +97,20 @@ InputController::InputController(QWidget* topLevel, QObject* parent)
#ifdef BUILD_QT_MULTIMEDIA
image->p->m_cameraActive = true;
QByteArray camera = image->p->m_config->getQtOption("camera").toByteArray();
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
if (!camera.isNull()) {
image->p->m_cameraDevice = camera;
}
QMetaObject::invokeMethod(image->p, "setupCam");
#else
if (!camera.isNull()) {
for (const auto& cam : QMediaDevices::videoInputs()) {
if (cam.id() == camera) {
image->p->m_cameraDevice = cam;
}
}
}
#endif
#endif
};
@ -595,9 +612,13 @@ void InputController::setCamImage(const QImage& image) {
QList<QPair<QByteArray, QString>> InputController::listCameras() const {
QList<QPair<QByteArray, QString>> out;
#ifdef BUILD_QT_MULTIMEDIA
QList<QCameraInfo> cams = QCameraInfo::availableCameras();
for (const auto& cam : cams) {
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
for (const auto& cam : QCameraInfo::availableCameras()) {
out.append(qMakePair(cam.deviceName().toLatin1(), cam.description()));
#else
for (const auto& cam : QMediaDevices::videoInputs()) {
out.append(qMakePair(cam.id(), cam.description()));
#endif
}
#endif
return out;
@ -639,6 +660,7 @@ void InputController::setupCam() {
return;
}
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
if (!m_camera) {
m_camera = std::make_unique<QCamera>(m_cameraDevice);
connect(m_camera.get(), &QCamera::statusChanged, this, &InputController::prepareCamSettings, Qt::QueuedConnection);
@ -650,10 +672,16 @@ void InputController::setupCam() {
m_camera->setCaptureMode(QCamera::CaptureVideo);
m_camera->setViewfinder(&m_videoDumper);
m_camera->load();
#else
if (!m_camera) {
m_camera = std::make_unique<QCamera>(m_cameraDevice);
m_captureSession.setCamera(m_camera.get());
}
#endif
#endif
}
#ifdef BUILD_QT_MULTIMEDIA
#if defined(BUILD_QT_MULTIMEDIA) && (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
void InputController::prepareCamSettings(QCamera::Status status) {
if (status != QCamera::LoadedStatus || m_camera->state() == QCamera::ActiveState) {
return;
@ -697,7 +725,11 @@ void InputController::prepareCamSettings(QCamera::Status status) {
void InputController::teardownCam() {
#ifdef BUILD_QT_MULTIMEDIA
if (m_camera) {
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
m_camera->unload();
#else
m_captureSession.setCamera(nullptr);
#endif
m_camera.reset();
}
#endif
@ -705,6 +737,7 @@ void InputController::teardownCam() {
void InputController::setCamera(const QByteArray& name) {
#ifdef BUILD_QT_MULTIMEDIA
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
if (m_cameraDevice == name) {
return;
}
@ -715,5 +748,15 @@ void InputController::setCamera(const QByteArray& name) {
if (m_cameraActive) {
setupCam();
}
#else
if (m_cameraDevice.id() == name) {
return;
}
for (const auto& cam : QMediaDevices::videoInputs()) {
if (cam.id() == name) {
m_cameraDevice = cam;
}
}
#endif
#endif
}

9
src/platform/qt/InputController.h
View File

@ -27,6 +27,8 @@
#ifdef BUILD_QT_MULTIMEDIA
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
#include "VideoDumper.h"
#else
#include <QMediaCaptureSession>
#endif
#include <QCamera>
#endif
@ -126,7 +128,7 @@ public slots:
void setCamera(const QByteArray& id);
private slots:
#ifdef BUILD_QT_MULTIMEDIA
#if defined(BUILD_QT_MULTIMEDIA) && (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
void prepareCamSettings(QCamera::Status);
#endif
void setupCam();
@ -168,10 +170,13 @@ private:
#ifdef BUILD_QT_MULTIMEDIA
bool m_cameraActive = false;
QByteArray m_cameraDevice;
std::unique_ptr<QCamera> m_camera;
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
QByteArray m_cameraDevice;
VideoDumper m_videoDumper;
#else
QCameraDevice m_cameraDevice;
QMediaCaptureSession m_captureSession;
#endif
#endif