early-access version 2915
This commit is contained in:
parent
c141471dce
commit
ab7b465bb0
@ -1,7 +1,7 @@
|
|||||||
yuzu emulator early access
|
yuzu emulator early access
|
||||||
=============
|
=============
|
||||||
|
|
||||||
This is the source code for early-access 2914.
|
This is the source code for early-access 2915.
|
||||||
|
|
||||||
## Legal Notice
|
## Legal Notice
|
||||||
|
|
||||||
|
@ -2146,12 +2146,18 @@ public:
|
|||||||
{324, nullptr, "GetUniquePadButtonSet"},
|
{324, nullptr, "GetUniquePadButtonSet"},
|
||||||
{325, nullptr, "GetUniquePadColor"},
|
{325, nullptr, "GetUniquePadColor"},
|
||||||
{326, nullptr, "GetUniquePadAppletDetailedUiType"},
|
{326, nullptr, "GetUniquePadAppletDetailedUiType"},
|
||||||
|
{327, nullptr, "GetAbstractedPadIdDataFromNpad"},
|
||||||
|
{328, nullptr, "AttachAbstractedPadToNpad"},
|
||||||
|
{329, nullptr, "DetachAbstractedPadAll"},
|
||||||
|
{330, nullptr, "CheckAbstractedPadConnection"},
|
||||||
{500, nullptr, "SetAppletResourceUserId"},
|
{500, nullptr, "SetAppletResourceUserId"},
|
||||||
{501, nullptr, "RegisterAppletResourceUserId"},
|
{501, nullptr, "RegisterAppletResourceUserId"},
|
||||||
{502, nullptr, "UnregisterAppletResourceUserId"},
|
{502, nullptr, "UnregisterAppletResourceUserId"},
|
||||||
{503, nullptr, "EnableAppletToGetInput"},
|
{503, nullptr, "EnableAppletToGetInput"},
|
||||||
{504, nullptr, "SetAruidValidForVibration"},
|
{504, nullptr, "SetAruidValidForVibration"},
|
||||||
{505, nullptr, "EnableAppletToGetSixAxisSensor"},
|
{505, nullptr, "EnableAppletToGetSixAxisSensor"},
|
||||||
|
{506, nullptr, "EnableAppletToGetPadInput"},
|
||||||
|
{507, nullptr, "EnableAppletToGetTouchScreen"},
|
||||||
{510, nullptr, "SetVibrationMasterVolume"},
|
{510, nullptr, "SetVibrationMasterVolume"},
|
||||||
{511, nullptr, "GetVibrationMasterVolume"},
|
{511, nullptr, "GetVibrationMasterVolume"},
|
||||||
{512, nullptr, "BeginPermitVibrationSession"},
|
{512, nullptr, "BeginPermitVibrationSession"},
|
||||||
|
@ -815,6 +815,12 @@ void GRenderWindow::InitializeCamera() {
|
|||||||
if (Settings::values.ir_sensor_device.GetValue() == cameraInfo.deviceName().toStdString() ||
|
if (Settings::values.ir_sensor_device.GetValue() == cameraInfo.deviceName().toStdString() ||
|
||||||
Settings::values.ir_sensor_device.GetValue() == "Auto") {
|
Settings::values.ir_sensor_device.GetValue() == "Auto") {
|
||||||
camera = std::make_unique<QCamera>(cameraInfo);
|
camera = std::make_unique<QCamera>(cameraInfo);
|
||||||
|
if (!camera->isCaptureModeSupported(QCamera::CaptureMode::CaptureViewfinder) &&
|
||||||
|
!camera->isCaptureModeSupported(QCamera::CaptureMode::CaptureStillImage)) {
|
||||||
|
LOG_ERROR(Frontend,
|
||||||
|
"Camera doesn't support CaptureViewfinder or CaptureStillImage");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
camera_found = true;
|
camera_found = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -825,10 +831,22 @@ void GRenderWindow::InitializeCamera() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
camera_capture = std::make_unique<QCameraImageCapture>(camera.get());
|
camera_capture = std::make_unique<QCameraImageCapture>(camera.get());
|
||||||
|
|
||||||
|
if (!camera_capture->isCaptureDestinationSupported(
|
||||||
|
QCameraImageCapture::CaptureDestination::CaptureToBuffer)) {
|
||||||
|
LOG_ERROR(Frontend, "Camera doesn't support saving to buffer");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
camera_capture->setCaptureDestination(QCameraImageCapture::CaptureDestination::CaptureToBuffer);
|
||||||
connect(camera_capture.get(), &QCameraImageCapture::imageCaptured, this,
|
connect(camera_capture.get(), &QCameraImageCapture::imageCaptured, this,
|
||||||
&GRenderWindow::OnCameraCapture);
|
&GRenderWindow::OnCameraCapture);
|
||||||
camera->unload();
|
camera->unload();
|
||||||
|
if (camera->isCaptureModeSupported(QCamera::CaptureMode::CaptureViewfinder)) {
|
||||||
camera->setCaptureMode(QCamera::CaptureViewfinder);
|
camera->setCaptureMode(QCamera::CaptureViewfinder);
|
||||||
|
} else if (camera->isCaptureModeSupported(QCamera::CaptureMode::CaptureStillImage)) {
|
||||||
|
camera->setCaptureMode(QCamera::CaptureStillImage);
|
||||||
|
}
|
||||||
camera->load();
|
camera->load();
|
||||||
camera->start();
|
camera->start();
|
||||||
|
|
||||||
|
@ -42,6 +42,12 @@ void ConfigureCamera::PreviewCamera() {
|
|||||||
LOG_INFO(Frontend, "Selected Camera {} {}", cameraInfo.description().toStdString(),
|
LOG_INFO(Frontend, "Selected Camera {} {}", cameraInfo.description().toStdString(),
|
||||||
cameraInfo.deviceName().toStdString());
|
cameraInfo.deviceName().toStdString());
|
||||||
camera = std::make_unique<QCamera>(cameraInfo);
|
camera = std::make_unique<QCamera>(cameraInfo);
|
||||||
|
if (!camera->isCaptureModeSupported(QCamera::CaptureMode::CaptureViewfinder) &&
|
||||||
|
!camera->isCaptureModeSupported(QCamera::CaptureMode::CaptureStillImage)) {
|
||||||
|
LOG_ERROR(Frontend,
|
||||||
|
"Camera doesn't support CaptureViewfinder or CaptureStillImage");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
camera_found = true;
|
camera_found = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -57,10 +63,22 @@ void ConfigureCamera::PreviewCamera() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
camera_capture = std::make_unique<QCameraImageCapture>(camera.get());
|
camera_capture = std::make_unique<QCameraImageCapture>(camera.get());
|
||||||
|
|
||||||
|
if (!camera_capture->isCaptureDestinationSupported(
|
||||||
|
QCameraImageCapture::CaptureDestination::CaptureToBuffer)) {
|
||||||
|
LOG_ERROR(Frontend, "Camera doesn't support saving to buffer");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
camera_capture->setCaptureDestination(QCameraImageCapture::CaptureDestination::CaptureToBuffer);
|
||||||
connect(camera_capture.get(), &QCameraImageCapture::imageCaptured, this,
|
connect(camera_capture.get(), &QCameraImageCapture::imageCaptured, this,
|
||||||
&ConfigureCamera::DisplayCapturedFrame);
|
&ConfigureCamera::DisplayCapturedFrame);
|
||||||
camera->unload();
|
camera->unload();
|
||||||
|
if (camera->isCaptureModeSupported(QCamera::CaptureMode::CaptureViewfinder)) {
|
||||||
camera->setCaptureMode(QCamera::CaptureViewfinder);
|
camera->setCaptureMode(QCamera::CaptureViewfinder);
|
||||||
|
} else if (camera->isCaptureModeSupported(QCamera::CaptureMode::CaptureStillImage)) {
|
||||||
|
camera->setCaptureMode(QCamera::CaptureStillImage);
|
||||||
|
}
|
||||||
camera->load();
|
camera->load();
|
||||||
camera->start();
|
camera->start();
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user