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

merge qt_camera_error_handler into qt_camera_handler

Browse source
This commit is contained in:
oltolm 2024-01-11 16:41:19 +01:00 • committed by Megamouse
parent 11562c430a
commit 86f86f516a
8 changed files with 41 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

36
rpcs3/rpcs3qt/qt_camera_handler.cpp
View file

@ -3,7 +3,6 @@
#include "Emu/system_config.h"
#include "Emu/System.h"
#include "Emu/Io/camera_config.h"
#include "Emu/Cell/lv2/sys_event.h"
#include <QMediaDevices>
@ -35,7 +34,6 @@ qt_camera_handler::~qt_camera_handler()
void qt_camera_handler::reset()
{
m_camera.reset();
m_error_handler.reset();
m_video_sink.reset();
m_media_capture_session.reset();
}
@ -57,18 +55,9 @@ void qt_camera_handler::set_camera(const QCameraDevice& camera_info)
m_media_capture_session.reset(new QMediaCaptureSession(nullptr));
m_video_sink.reset(new qt_camera_video_sink(front_facing, nullptr));
m_camera.reset(new QCamera(camera_info));
m_error_handler.reset(new qt_camera_error_handler(m_camera,
[this](bool is_active)
{
if (is_active)
{
m_state = camera_handler_state::running;
}
else
{
m_state = camera_handler_state::closed;
}
}));
connect(m_camera.get(), &QCamera::activeChanged, this, &qt_camera_handler::handle_camera_active);
connect(m_camera.get(), &QCamera::errorOccurred, this, &qt_camera_handler::handle_camera_error);
// Setup video sink
m_media_capture_session->setCamera(m_camera.get());
@ -78,6 +67,25 @@ void qt_camera_handler::set_camera(const QCameraDevice& camera_info)
update_camera_settings();
}
void qt_camera_handler::handle_camera_active(bool is_active)
{
camera_log.notice("Camera active status changed to %d", is_active);
if (is_active)
{
m_state = camera_handler_state::running;
}
else
{
m_state = camera_handler_state::closed;
}
}
void qt_camera_handler::handle_camera_error(QCamera::Error error, const QString& errorString)
{
camera_log.error("Error event: \"%s\" (error=%d)", errorString, static_cast<int>(error));
}
void qt_camera_handler::open_camera()
{
camera_log.notice("Loading camera");