Merge pull request #4423 from degasus/framedump

Framedump: Use an object for the framedumping state.

1 files changed, 3 insertions, 13 deletions

diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp
index 92817805e3..65f716ba9e 100644
--- a/Source/Core/VideoCommon/RenderBase.cpp
+++ b/Source/Core/VideoCommon/RenderBase.cpp
@@ -660,14 +660,14 @@ bool Renderer::IsFrameDumping()
     AVIDump::Stop();
     std::vector<u8>().swap(m_frame_data);
     m_AVI_dumping = false;
-    OSD::AddMessage("Stop dumping frames", 2000);
+    OSD::AddMessage("Stop dumping frames");
   }
   m_last_frame_dumped = false;
 #endif
   return false;
 }
 
-void Renderer::DumpFrameData(const u8* data, int w, int h, int stride, u64 ticks,
+void Renderer::DumpFrameData(const u8* data, int w, int h, int stride, const AVIDump::Frame& state,
                              bool swap_upside_down)
 {
   if (w == 0 || h == 0)
@@ -698,20 +698,10 @@ void Renderer::DumpFrameData(const u8* data, int w, int h, int stride, u64 ticks
     if (!m_last_frame_dumped)
     {
       m_AVI_dumping = AVIDump::Start(w, h);
-      if (!m_AVI_dumping)
-      {
-        OSD::AddMessage("AVIDump Start failed", 2000);
-      }
-      else
-      {
-        OSD::AddMessage(StringFromFormat("Dumping Frames to \"%sframedump0.avi\" (%dx%d RGB24)",
-                                         File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), w, h),
-                        2000);
-      }
     }
     if (m_AVI_dumping)
     {
-      AVIDump::AddFrame(m_frame_data.data(), w, h, stride, ticks);
+      AVIDump::AddFrame(m_frame_data.data(), w, h, stride, state);
     }
 
     m_last_frame_dumped = true;