RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-26 04:32:35 +01:00
Code Issues Releases Wiki Activity

cellCamera: silence some log errors

Browse Source
This commit is contained in:
Megamouse 2021-10-20 18:23:04 +02:00
parent 76c1681173
commit 5eabe9aa33
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rpcs3/Emu/Io/Null/null_camera_handler.h
View File

@ -7,10 +7,10 @@ class null_camera_handler final : public camera_handler_base
public:
null_camera_handler() : camera_handler_base() {}
void open_camera() override { m_state = camera_handler_state::open; };
void close_camera() override { m_state = camera_handler_state::closed; };
void start_camera() override { m_state = camera_handler_state::running; };
void stop_camera() override { m_state = camera_handler_state::open; };
void open_camera() override { m_state = camera_handler_state::open; }
void close_camera() override { m_state = camera_handler_state::closed; }
void start_camera() override { m_state = camera_handler_state::running; }
void stop_camera() override { m_state = camera_handler_state::open; }
void set_format(s32 format, u32 bytesize) override
{

13
rpcs3/rpcs3qt/qt_camera_handler.cpp
View File

@ -9,6 +9,11 @@ LOG_CHANNEL(camera_log, "Camera");
qt_camera_handler::qt_camera_handler() : camera_handler_base()
{
// List available cameras
for (const QCameraInfo& cameraInfo : QCameraInfo::availableCameras())
{
camera_log.success("Found camera: name=%s, description=%s", cameraInfo.deviceName().toStdString(), cameraInfo.description().toStdString());
}
}
qt_camera_handler::~qt_camera_handler()
@ -20,7 +25,7 @@ void qt_camera_handler::set_camera(const QCameraInfo& cameraInfo)
{
if (cameraInfo.isNull())
{
camera_log.error("No camera present");
camera_log.warning("No camera present");
return;
}
@ -67,12 +72,6 @@ void qt_camera_handler::set_camera(const QCameraInfo& cameraInfo)
void qt_camera_handler::open_camera()
{
// List available cameras
for (const QCameraInfo& cameraInfo : QCameraInfo::availableCameras())
{
camera_log.success("Found camera: name=%s, description=%s", cameraInfo.deviceName().toStdString(), cameraInfo.description().toStdString());
}
// Let's use the default camera for now
set_camera(QCameraInfo::defaultCamera());