Skip to content

Make CameraManager request the camera access permission when using Qt 6 #2381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nadiaholmquist wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Make CameraManager request the camera access permission when using Qt 6 #2381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
56b52f4
Make CameraManager request the camera access permission when using Qt 6
nadiaholmquist Jul 23, 2025
01935d9
Add a version check for the permissions feature check
nadiaholmquist Jul 24, 2025
ab8696c
does it work if I put the check separately then
nadiaholmquist Jul 24, 2025
d7cc20e
Use QT_VERSION_CHECK properly
nadiaholmquist Jul 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/frontend/qt_sdl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,3 +260,5 @@ if (ENABLE_OGLRENDERER)
target_compile_definitions(melonDS PUBLIC MELONDS_GL_HEADER=${MELONDS_GL_HEADER})
target_compile_definitions(core PUBLIC MELONDS_GL_HEADER=${MELONDS_GL_HEADER})
endif()

qt_finalize_target(melonDS)
44 changes: 33 additions & 11 deletions src/frontend/qt_sdl/CameraManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ using namespace melonDS;
const char* kCamConfigPath[] = {"DSi.Camera0", "DSi.Camera1"};

#if QT_VERSION >= 0x060000
#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) && QT_CONFIG(permissions)
#include <QCoreApplication>
#include <QPermission>
#endif

CameraFrameDumper::CameraFrameDumper(QObject* parent) : QVideoSink(parent)
{
Expand Down Expand Up @@ -245,14 +249,6 @@ void CameraManager::init()
delete camDevice;
camDevice = nullptr;
}
else
{
camDumper = new CameraFrameDumper(this);

camSession = new QMediaCaptureSession(this);
camSession->setCamera(camDevice);
camSession->setVideoOutput(camDumper);
}
}
#else
camDevice = new QCamera(camDeviceName.toUtf8());
Expand Down Expand Up @@ -328,13 +324,14 @@ void CameraManager::deInit()

void CameraManager::start()
{
if (startNum == 1) return;
startNum = 1;

if (inputType == 2)
{
emit camStartSignal();
}
else
{
startNum = 1;
}
}

void CameraManager::stop()
Expand All @@ -356,7 +353,32 @@ bool CameraManager::isStarted()
void CameraManager::camStart()
{
if (camDevice)
{
#if QT_VERSION_MAJOR >= 6
#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) && QT_CONFIG(permissions)
QCameraPermission cameraPermission;
bool granted = false;
switch (qApp->checkPermission(cameraPermission)) {
case Qt::PermissionStatus::Undetermined:
qApp->requestPermission(cameraPermission, this, &CameraManager::camStart);;
return;
case Qt::PermissionStatus::Denied:
return;
case Qt::PermissionStatus::Granted:
break;
}
#endif

camDumper = new CameraFrameDumper(this);

camSession = new QMediaCaptureSession(this);
camSession->setCamera(camDevice);
camSession->setVideoOutput(camDumper);
#endif

camDevice->start();
}
startNum = 1;
}

void CameraManager::camStop()
Expand Down
Loading