From 161f10a921947bdb06b69925ae45fffd9f1da6b4 Mon Sep 17 00:00:00 2001
From: Michael Fabian 'Xaymar' Dirks <info@xaymar.com>
Date: Sun, 14 Jun 2020 22:22:44 +0200
Subject: [PATCH] encoders/ffmpeg: Rename files to match naming scheme

---
 CMakeLists.txt                                             | 4 ++--
 source/encoders/{ffmpeg-encoder.cpp => encoder-ffmpeg.cpp} | 2 +-
 source/encoders/{ffmpeg-encoder.hpp => encoder-ffmpeg.hpp} | 0
 source/encoders/handlers/handler.cpp                       | 2 +-
 source/encoders/handlers/nvenc_h264_handler.cpp            | 2 +-
 source/encoders/handlers/nvenc_hevc_handler.cpp            | 2 +-
 source/encoders/handlers/nvenc_shared.cpp                  | 2 +-
 source/plugin.cpp                                          | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)
 rename source/encoders/{ffmpeg-encoder.cpp => encoder-ffmpeg.cpp} (99%)
 rename source/encoders/{ffmpeg-encoder.hpp => encoder-ffmpeg.hpp} (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ead38f9..ef74a5a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -598,8 +598,8 @@ if(${PropertyPrefix}ENABLE_ENCODER_FFMPEG)
 		"source/ffmpeg/hwapi/d3d11.cpp"
 	
 		# Encoders
-		"source/encoders/ffmpeg-encoder.hpp"
-		"source/encoders/ffmpeg-encoder.cpp"
+		"source/encoders/encoder-ffmpeg.hpp"
+		"source/encoders/encoder-ffmpeg.cpp"
 
 		# Encoders/Codecs
 		"source/encoders/codecs/hevc.hpp"
diff --git a/source/encoders/ffmpeg-encoder.cpp b/source/encoders/encoder-ffmpeg.cpp
similarity index 99%
rename from source/encoders/ffmpeg-encoder.cpp
rename to source/encoders/encoder-ffmpeg.cpp
index 97ddd12..dff3807 100644
--- a/source/encoders/ffmpeg-encoder.cpp
+++ b/source/encoders/encoder-ffmpeg.cpp
@@ -19,7 +19,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-#include "ffmpeg-encoder.hpp"
+#include "encoder-ffmpeg.hpp"
 #include "strings.hpp"
 #include <sstream>
 #include "codecs/hevc.hpp"
diff --git a/source/encoders/ffmpeg-encoder.hpp b/source/encoders/encoder-ffmpeg.hpp
similarity index 100%
rename from source/encoders/ffmpeg-encoder.hpp
rename to source/encoders/encoder-ffmpeg.hpp
diff --git a/source/encoders/handlers/handler.cpp b/source/encoders/handlers/handler.cpp
index 0dbc316..4eae21b 100644
--- a/source/encoders/handlers/handler.cpp
+++ b/source/encoders/handlers/handler.cpp
@@ -20,7 +20,7 @@
 // SOFTWARE.
 
 #include "handler.hpp"
-#include "../ffmpeg-encoder.hpp"
+#include "../encoder-ffmpeg.hpp"
 
 using namespace streamfx::encoder::ffmpeg;
 
diff --git a/source/encoders/handlers/nvenc_h264_handler.cpp b/source/encoders/handlers/nvenc_h264_handler.cpp
index 86550f1..fa79179 100644
--- a/source/encoders/handlers/nvenc_h264_handler.cpp
+++ b/source/encoders/handlers/nvenc_h264_handler.cpp
@@ -22,7 +22,7 @@
 #include "nvenc_h264_handler.hpp"
 #include "strings.hpp"
 #include "../codecs/h264.hpp"
-#include "../ffmpeg-encoder.hpp"
+#include "../encoder-ffmpeg.hpp"
 #include "ffmpeg/tools.hpp"
 #include "nvenc_shared.hpp"
 #include "plugin.hpp"
diff --git a/source/encoders/handlers/nvenc_hevc_handler.cpp b/source/encoders/handlers/nvenc_hevc_handler.cpp
index 8b34bb0..d40696a 100644
--- a/source/encoders/handlers/nvenc_hevc_handler.cpp
+++ b/source/encoders/handlers/nvenc_hevc_handler.cpp
@@ -22,7 +22,7 @@
 #include "nvenc_hevc_handler.hpp"
 #include "strings.hpp"
 #include "../codecs/hevc.hpp"
-#include "../ffmpeg-encoder.hpp"
+#include "../encoder-ffmpeg.hpp"
 #include "ffmpeg/tools.hpp"
 #include "nvenc_shared.hpp"
 #include "plugin.hpp"
diff --git a/source/encoders/handlers/nvenc_shared.cpp b/source/encoders/handlers/nvenc_shared.cpp
index 66dce2d..5eaec52 100644
--- a/source/encoders/handlers/nvenc_shared.cpp
+++ b/source/encoders/handlers/nvenc_shared.cpp
@@ -23,7 +23,7 @@
 #include "strings.hpp"
 #include <algorithm>
 #include "../codecs/hevc.hpp"
-#include "../ffmpeg-encoder.hpp"
+#include "../encoder-ffmpeg.hpp"
 #include "ffmpeg/tools.hpp"
 #include "plugin.hpp"
 #include "utility.hpp"
diff --git a/source/plugin.cpp b/source/plugin.cpp
index 56664ca..8087d9b 100644
--- a/source/plugin.cpp
+++ b/source/plugin.cpp
@@ -24,7 +24,7 @@
 #include "obs/obs-source-tracker.hpp"
 
 #ifdef ENABLE_ENCODER_FFMPEG
-#include "encoders/ffmpeg-encoder.hpp"
+#include "encoders/encoder-ffmpeg.hpp"
 #endif
 
 #ifdef ENABLE_FILTER_BLUR