From b96e41285c644afb8c6b73442070ac47ca279011 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Wed, 16 Apr 2025 02:41:33 +0200 Subject: [PATCH] Qt: use unique_ptr in qt_video_source --- rpcs3/rpcs3qt/qt_video_source.cpp | 8 ++++---- rpcs3/rpcs3qt/qt_video_source.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rpcs3/rpcs3qt/qt_video_source.cpp b/rpcs3/rpcs3qt/qt_video_source.cpp index ad5332d1bf..c56fb35bc7 100644 --- a/rpcs3/rpcs3qt/qt_video_source.cpp +++ b/rpcs3/rpcs3qt/qt_video_source.cpp @@ -65,7 +65,7 @@ void qt_video_source::init_movie() if (lower.endsWith(".gif")) { - m_movie.reset(new QMovie(m_video_path)); + m_movie = std::make_unique(m_video_path); m_video_path.clear(); if (!m_movie->isValid()) @@ -98,18 +98,18 @@ void qt_video_source::init_movie() return; } - m_video_buffer.reset(new QBuffer(&m_video_data)); + m_video_buffer = std::make_unique(&m_video_data); m_video_buffer->open(QIODevice::ReadOnly); } - m_video_sink.reset(new QVideoSink()); + m_video_sink = std::make_unique(); QObject::connect(m_video_sink.get(), &QVideoSink::videoFrameChanged, m_video_sink.get(), [this](const QVideoFrame& frame) { m_image_change_callback(frame); m_has_new = true; }); - m_media_player.reset(new QMediaPlayer()); + m_media_player = std::make_unique(); m_media_player->setVideoSink(m_video_sink.get()); m_media_player->setLoops(QMediaPlayer::Infinite); diff --git a/rpcs3/rpcs3qt/qt_video_source.h b/rpcs3/rpcs3qt/qt_video_source.h index 27f716f0d4..37fe5fa280 100644 --- a/rpcs3/rpcs3qt/qt_video_source.h +++ b/rpcs3/rpcs3qt/qt_video_source.h @@ -49,8 +49,8 @@ protected: std::unique_ptr m_video_buffer; std::unique_ptr m_media_player; - std::shared_ptr m_video_sink; - std::shared_ptr m_movie; + std::unique_ptr m_video_sink; + std::unique_ptr m_movie; std::function m_image_change_callback = nullptr;