summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorScott Mansell <phiren@gmail.com>2023-01-28 13:50:57 +1300
committerScott Mansell <phiren@gmail.com>2023-01-31 18:45:29 +1300
commite57eb04ed3b40e806fa081fc1bdaeaa0c03e4e66 (patch)
treec47db6dd4f9e8256764e5b9221dfd1dc3ae43651 /Source/Core
parent0d4537d60f695e50379c1542d6c4b1e643e8a5a0 (diff)
Rename FrameDump.{cpp,h} to FrameDumpFFMpeg.{cpp,h}
The name kind of conflicts with a new FrameDumper class
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Core/State.cpp2
-rw-r--r--Source/Core/DolphinLib.props4
-rw-r--r--Source/Core/VideoCommon/CMakeLists.txt4
-rw-r--r--Source/Core/VideoCommon/FrameDumpFFMpeg.cpp (renamed from Source/Core/VideoCommon/FrameDump.cpp)2
-rw-r--r--Source/Core/VideoCommon/FrameDumpFFMpeg.h (renamed from Source/Core/VideoCommon/FrameDump.h)0
-rw-r--r--Source/Core/VideoCommon/FrameDumper.h2
6 files changed, 7 insertions, 7 deletions
diff --git a/Source/Core/Core/State.cpp b/Source/Core/Core/State.cpp
index 405af72f4a..4392182a22 100644
--- a/Source/Core/Core/State.cpp
+++ b/Source/Core/Core/State.cpp
@@ -42,7 +42,7 @@
#include "Core/PowerPC/PowerPC.h"
#include "Core/System.h"
-#include "VideoCommon/FrameDump.h"
+#include "VideoCommon/FrameDumpFFMpeg.h"
#include "VideoCommon/OnScreenDisplay.h"
#include "VideoCommon/VideoBackendBase.h"
diff --git a/Source/Core/DolphinLib.props b/Source/Core/DolphinLib.props
index 69e8f2873e..80daf63a32 100644
--- a/Source/Core/DolphinLib.props
+++ b/Source/Core/DolphinLib.props
@@ -638,7 +638,7 @@
<ClInclude Include="VideoCommon\Fifo.h" />
<ClInclude Include="VideoCommon\FramebufferManager.h" />
<ClInclude Include="VideoCommon\FramebufferShaderGen.h" />
- <ClInclude Include="VideoCommon\FrameDump.h" />
+ <ClInclude Include="VideoCommon\FrameDumpFFMpeg.h" />
<ClInclude Include="VideoCommon\FrameDumper.h" />
<ClInclude Include="VideoCommon\FreeLookCamera.h" />
<ClInclude Include="VideoCommon\GeometryShaderGen.h" />
@@ -1234,7 +1234,7 @@
<ClCompile Include="VideoCommon\Fifo.cpp" />
<ClCompile Include="VideoCommon\FramebufferManager.cpp" />
<ClCompile Include="VideoCommon\FramebufferShaderGen.cpp" />
- <ClCompile Include="VideoCommon\FrameDump.cpp" />
+ <ClCompile Include="VideoCommon\FrameDumpFFMpeg.cpp" />
<ClCompile Include="VideoCommon\FrameDumper.cpp" />
<ClCompile Include="VideoCommon\FreeLookCamera.cpp" />
<ClCompile Include="VideoCommon\GeometryShaderGen.cpp" />
diff --git a/Source/Core/VideoCommon/CMakeLists.txt b/Source/Core/VideoCommon/CMakeLists.txt
index 1cc23ba7aa..20b3257082 100644
--- a/Source/Core/VideoCommon/CMakeLists.txt
+++ b/Source/Core/VideoCommon/CMakeLists.txt
@@ -36,6 +36,7 @@ add_library(videocommon
FramebufferShaderGen.h
FrameDumper.cpp
FrameDumper.h
+ FrameDumpFFMpeg.h
FreeLookCamera.cpp
FreeLookCamera.h
GeometryShaderGen.cpp
@@ -203,8 +204,7 @@ endif()
if(FFmpeg_FOUND)
target_sources(videocommon PRIVATE
- FrameDump.cpp
- FrameDump.h
+ FrameDumpFFMpeg.cpp
)
target_link_libraries(videocommon PRIVATE
FFmpeg::avcodec
diff --git a/Source/Core/VideoCommon/FrameDump.cpp b/Source/Core/VideoCommon/FrameDumpFFMpeg.cpp
index c5edffc04e..09fdf4dbac 100644
--- a/Source/Core/VideoCommon/FrameDump.cpp
+++ b/Source/Core/VideoCommon/FrameDumpFFMpeg.cpp
@@ -1,7 +1,7 @@
// Copyright 2009 Dolphin Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
-#include "VideoCommon/FrameDump.h"
+#include "VideoCommon/FrameDumpFFMpeg.h"
#if defined(__FreeBSD__)
#define __STDC_CONSTANT_MACROS 1
diff --git a/Source/Core/VideoCommon/FrameDump.h b/Source/Core/VideoCommon/FrameDumpFFMpeg.h
index 18c98c7720..18c98c7720 100644
--- a/Source/Core/VideoCommon/FrameDump.h
+++ b/Source/Core/VideoCommon/FrameDumpFFMpeg.h
diff --git a/Source/Core/VideoCommon/FrameDumper.h b/Source/Core/VideoCommon/FrameDumper.h
index 2051346ef9..f2c53a28b9 100644
--- a/Source/Core/VideoCommon/FrameDumper.h
+++ b/Source/Core/VideoCommon/FrameDumper.h
@@ -9,7 +9,7 @@
#include "Common/MathUtil.h"
#include "Common/Thread.h"
-#include "VideoCommon/FrameDump.h"
+#include "VideoCommon/FrameDumpFFMpeg.h"
class AbstractStagingTexture;
class AbstractTexture;