diff --git a/rpcs3/Emu/Io/Null/null_camera_handler.h b/rpcs3/Emu/Io/Null/null_camera_handler.h index 6f00301c8b..61e26a8d96 100644 --- a/rpcs3/Emu/Io/Null/null_camera_handler.h +++ b/rpcs3/Emu/Io/Null/null_camera_handler.h @@ -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 { diff --git a/rpcs3/rpcs3qt/qt_camera_handler.cpp b/rpcs3/rpcs3qt/qt_camera_handler.cpp index 71969abbf0..ed6e39b648 100644 --- a/rpcs3/rpcs3qt/qt_camera_handler.cpp +++ b/rpcs3/rpcs3qt/qt_camera_handler.cpp @@ -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());