mirrors/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-08-08 09:09:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into master

Browse source
This commit is contained in:
Megamouse 2025-04-16 09:53:18 +02:00 • committed by GitHub
commit 3b826db546
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rpcs3/rpcs3qt/game_list_grid.cpp
View file

@ -91,19 +91,19 @@ void game_list_grid::populate(
if (const QPixmap pixmap = item->get_movie_image(frame); item->get_active() && !pixmap.isNull()) if (const QPixmap pixmap = item->get_movie_image(frame); item->get_active() && !pixmap.isNull())
{ {
item->set_icon(gui::utils::get_centered_pixmap(pixmap, m_icon_size, 0, 0, 1.0, Qt::FastTransformation)); item->set_icon(gui::utils::get_centered_pixmap(pixmap, m_icon_size, 0, 0, 1.0, Qt::FastTransformation));
return;
} }
else
{
std::lock_guard lock(item->pixmap_mutex); std::lock_guard lock(item->pixmap_mutex);
if (!game->pxmap.isNull())
{
item->set_icon(game->pxmap); item->set_icon(game->pxmap);
if (!game->has_hover_gif && !game->has_hover_pam) if (!game->has_hover_gif && !game->has_hover_pam)
{ {
game->pxmap = {}; game->pxmap = {};
} }
item->stop_movie();
} }
}); });

8
rpcs3/rpcs3qt/game_list_table.cpp
View file

@ -252,19 +252,19 @@ void game_list_table::populate(
if (const QPixmap pixmap = icon_item->get_movie_image(frame); icon_item->get_active() && !pixmap.isNull()) if (const QPixmap pixmap = icon_item->get_movie_image(frame); icon_item->get_active() && !pixmap.isNull())
{ {
icon_item->setData(Qt::DecorationRole, pixmap.scaled(m_icon_size, Qt::KeepAspectRatio)); icon_item->setData(Qt::DecorationRole, pixmap.scaled(m_icon_size, Qt::KeepAspectRatio));
return;
} }
else
{
std::lock_guard lock(icon_item->pixmap_mutex); std::lock_guard lock(icon_item->pixmap_mutex);
if (!game->pxmap.isNull())
{
icon_item->setData(Qt::DecorationRole, game->pxmap); icon_item->setData(Qt::DecorationRole, game->pxmap);
if (!game->has_hover_gif && !game->has_hover_pam) if (!game->has_hover_gif && !game->has_hover_pam)
{ {
game->pxmap = {}; game->pxmap = {};
} }
icon_item->stop_movie();
} }
}); });

16
rpcs3/rpcs3qt/qt_video_source.cpp
View file

@ -34,11 +34,11 @@ void qt_video_source::set_active(bool active)
} }
} }
void qt_video_source::image_change_callback() const void qt_video_source::image_change_callback(const QVideoFrame& frame) const
{ {
if (m_image_change_callback) if (m_image_change_callback)
{ {
m_image_change_callback({}); m_image_change_callback(frame);
} }
} }
@ -65,7 +65,7 @@ void qt_video_source::init_movie()
if (lower.endsWith(".gif")) if (lower.endsWith(".gif"))
{ {
m_movie.reset(new QMovie(m_video_path)); m_movie = std::make_unique<QMovie>(m_video_path);
m_video_path.clear(); m_video_path.clear();
if (!m_movie->isValid()) if (!m_movie->isValid())
@ -76,7 +76,7 @@ void qt_video_source::init_movie()
QObject::connect(m_movie.get(), &QMovie::frameChanged, m_movie.get(), [this](int) QObject::connect(m_movie.get(), &QMovie::frameChanged, m_movie.get(), [this](int)
{ {
m_image_change_callback({}); image_change_callback();
m_has_new = true; m_has_new = true;
}); });
return; return;
@ -98,18 +98,18 @@ void qt_video_source::init_movie()
return; return;
} }
m_video_buffer.reset(new QBuffer(&m_video_data)); m_video_buffer = std::make_unique<QBuffer>(&m_video_data);
m_video_buffer->open(QIODevice::ReadOnly); m_video_buffer->open(QIODevice::ReadOnly);
} }
m_video_sink.reset(new QVideoSink()); m_video_sink = std::make_unique<QVideoSink>();
QObject::connect(m_video_sink.get(), &QVideoSink::videoFrameChanged, m_video_sink.get(), [this](const QVideoFrame& frame) QObject::connect(m_video_sink.get(), &QVideoSink::videoFrameChanged, m_video_sink.get(), [this](const QVideoFrame& frame)
{ {
m_image_change_callback(frame); image_change_callback(frame);
m_has_new = true; m_has_new = true;
}); });
m_media_player.reset(new QMediaPlayer()); m_media_player = std::make_unique<QMediaPlayer>();
m_media_player->setVideoSink(m_video_sink.get()); m_media_player->setVideoSink(m_video_sink.get());
m_media_player->setLoops(QMediaPlayer::Infinite); m_media_player->setLoops(QMediaPlayer::Infinite);

6
rpcs3/rpcs3qt/qt_video_source.h
View file

@ -31,7 +31,7 @@ public:
QPixmap get_movie_image(const QVideoFrame& frame) const; QPixmap get_movie_image(const QVideoFrame& frame) const;
void image_change_callback() const; void image_change_callback(const QVideoFrame& frame = {}) const;
void set_image_change_callback(const std::function<void(const QVideoFrame&)>& func); void set_image_change_callback(const std::function<void(const QVideoFrame&)>& func);
protected: protected:
@ -49,8 +49,8 @@ protected:
std::unique_ptr<QBuffer> m_video_buffer; std::unique_ptr<QBuffer> m_video_buffer;
std::unique_ptr<QMediaPlayer> m_media_player; std::unique_ptr<QMediaPlayer> m_media_player;
std::shared_ptr<QVideoSink> m_video_sink; std::unique_ptr<QVideoSink> m_video_sink;
std::shared_ptr<QMovie> m_movie; std::unique_ptr<QMovie> m_movie;
std::function<void(const QVideoFrame&)> m_image_change_callback = nullptr; std::function<void(const QVideoFrame&)> m_image_change_callback = nullptr;