RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-04 14:08:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Qt6 port

Browse source
This commit is contained in:
Megamouse 2021-05-22 10:42:05 +02:00 • committed by Elad Ashkenazi
parent 9b3a878c18
commit d119cf6e96
54 changed files with 431 additions and 595 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rpcs3/rpcs3qt/settings_dialog.cpp
View file

@ -1,5 +1,6 @@
#include <QButtonGroup>
#include <QCameraInfo>
#include <QCameraDevice>
#include <QMediaDevices>
#include <QDialogButtonBox>
#include <QFontMetrics>
#include <QPushButton>
@ -10,7 +11,6 @@
#include <QSpinBox>
#include <QTimer>
#include <QScreen>
#include <QUrl>
#include "gui_settings.h"
#include "display_sleep_control.h"
@ -1191,10 +1191,10 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
const std::string selected_camera = m_emu_settings->GetSetting(emu_settings_type::CameraID);
ui->cameraIdBox->addItem(tr("None", "Camera Device"), "");
ui->cameraIdBox->addItem(tr("Default", "Camera Device"), qstr(default_camera));
for (const QCameraInfo& camera_info : QCameraInfo::availableCameras())
for (const QCameraDevice& camera_info : QMediaDevices::videoInputs())
{
if (!camera_info.isNull())
ui->cameraIdBox->addItem(camera_info.description(), camera_info.deviceName());
ui->cameraIdBox->addItem(camera_info.description(), camera_info.id());
}
if (const int index = ui->cameraIdBox->findData(qstr(selected_camera)); index >= 0)
{