diff --git a/Source/Core/DolphinQt/GBAWidget.cpp b/Source/Core/DolphinQt/GBAWidget.cpp index 0a7ba2b84d..b355efddd3 100644 --- a/Source/Core/DolphinQt/GBAWidget.cpp +++ b/Source/Core/DolphinQt/GBAWidget.cpp @@ -106,7 +106,7 @@ void GBAWidget::GameChanged(const HW::GBA::CoreInfo& info) update(); } -void GBAWidget::SetVideoBuffer(std::vector video_buffer) +void GBAWidget::SetVideoBuffer(std::span video_buffer) { m_previous_frame = std::move(m_last_frame); if (video_buffer.size() == static_cast(m_core_info.width * m_core_info.height)) @@ -608,7 +608,7 @@ void GBAWidgetController::GameChanged(const HW::GBA::CoreInfo& info) m_widget->GameChanged(info); } -void GBAWidgetController::FrameEnded(std::vector video_buffer) +void GBAWidgetController::FrameEnded(std::span video_buffer) { - m_widget->SetVideoBuffer(std::move(video_buffer)); + m_widget->SetVideoBuffer(video_buffer); } diff --git a/Source/Core/DolphinQt/GBAWidget.h b/Source/Core/DolphinQt/GBAWidget.h index 7d90aad37e..8244b77319 100644 --- a/Source/Core/DolphinQt/GBAWidget.h +++ b/Source/Core/DolphinQt/GBAWidget.h @@ -5,6 +5,7 @@ #include #include +#include #include #include #include @@ -34,10 +35,10 @@ class GBAWidget : public QWidget public: explicit GBAWidget(std::weak_ptr core, const HW::GBA::CoreInfo& info, const std::optional& netplay_pad); - ~GBAWidget(); + ~GBAWidget() override; void GameChanged(const HW::GBA::CoreInfo& info); - void SetVideoBuffer(std::vector video_buffer); + void SetVideoBuffer(std::span video_buffer); void SetVolume(int volume); void VolumeDown(); @@ -102,11 +103,11 @@ class GBAWidgetController : public QObject Q_OBJECT public: explicit GBAWidgetController() = default; - ~GBAWidgetController(); + ~GBAWidgetController() override; void Create(std::weak_ptr core, const HW::GBA::CoreInfo& info); void GameChanged(const HW::GBA::CoreInfo& info); - void FrameEnded(std::vector video_buffer); + void FrameEnded(std::span video_buffer); private: GBAWidget* m_widget{};