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

Qt: Fix non-Multimedia build

This commit is contained in:
Vicki Pfau 2024-03-24 22:07:31 -07:00
parent 04bbcdfdd1
commit 6940b424df
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,11 +54,13 @@ InputController::InputController(QWidget* topLevel, QObject* parent)
m_gamepadTimer.setInterval(15); m_gamepadTimer.setInterval(15);
m_gamepadTimer.start(); m_gamepadTimer.start();
#if defined(BUILD_QT_MULTIMEDIA) && (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) #ifdef BUILD_QT_MULTIMEDIA
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
m_captureSession.setVideoSink(&m_videoSink); m_captureSession.setVideoSink(&m_videoSink);
connect(&m_videoSink, &QVideoSink::videoFrameChanged, &m_videoDumper, &VideoDumper::present); connect(&m_videoSink, &QVideoSink::videoFrameChanged, &m_videoDumper, &VideoDumper::present);
#endif #endif
connect(&m_videoDumper, &VideoDumper::imageAvailable, this, &InputController::setCamImage); connect(&m_videoDumper, &VideoDumper::imageAvailable, this, &InputController::setCamImage);
#endif
mInputBindKey(&m_inputMap, KEYBOARD, Qt::Key_X, GBA_KEY_A); mInputBindKey(&m_inputMap, KEYBOARD, Qt::Key_X, GBA_KEY_A);
mInputBindKey(&m_inputMap, KEYBOARD, Qt::Key_Z, GBA_KEY_B); mInputBindKey(&m_inputMap, KEYBOARD, Qt::Key_Z, GBA_KEY_B);
@ -115,10 +117,12 @@ InputController::InputController(QWidget* topLevel, QObject* parent)
}; };
m_image.stopRequestImage = [](mImageSource* context) { m_image.stopRequestImage = [](mImageSource* context) {
InputControllerImage* image = static_cast<InputControllerImage*>(context);
#ifdef BUILD_QT_MULTIMEDIA #ifdef BUILD_QT_MULTIMEDIA
InputControllerImage* image = static_cast<InputControllerImage*>(context);
image->p->m_cameraActive = false; image->p->m_cameraActive = false;
QMetaObject::invokeMethod(image->p, "teardownCam"); QMetaObject::invokeMethod(image->p, "teardownCam");
#else
UNUSED(context);
#endif #endif
}; };
@ -785,5 +789,7 @@ void InputController::setCamera(const QByteArray& name) {
if (m_cameraActive) { if (m_cameraActive) {
setupCam(); setupCam();
} }
#else
UNUSED(name);
#endif #endif
} }