code: Ignore warnings from external code

May need to find a better solution such as disabling all warnings on third party code.

.clang-format

@@ -2,11 +2,11 @@
 TabWidth: 4
 UseTab: ForContinuationAndIndentation
 ColumnLimit: 120
- 
+
 # Language
 Language: Cpp
 Standard: Cpp11
- 
+
 # Indentation
 AccessModifierOffset: 0
 ConstructorInitializerIndentWidth: 4
@@ -16,11 +16,11 @@ IndentCaseLabels: false
 IndentWidth: 4
 IndentWrappedFunctionNames: true
 NamespaceIndentation: All
- 
+
 # Includes
 #IncludeBlocks: Regroup
 IncludeCategories:
-  - Regex: '^(<|")(config.hpp|common.hpp|strings.hpp|version.hpp|obs.h)("|>)'
+  - Regex: '^(<|")(config.hpp|common.hpp|ui-common.hpp|strings.hpp|version.hpp|obs.h)("|>)'
     Priority: 100
   - Regex: '^<obs-'
     Priority: 150
@@ -33,7 +33,7 @@ IncludeCategories:
   - Regex: '.moc"$'
     Priority: 300
 SortIncludes: true
- 
+
 # Alignment
 AlignAfterOpenBracket: true
 AlignConsecutiveAssignments: true
@@ -43,7 +43,7 @@ AlignOperands: true
 AlignTrailingComments: true
 DerivePointerAlignment: false
 PointerAlignment: Left
- 
+
 # Wrapping and Breaking
 AllowAllParametersOfDeclarationOnNextLine: true
 AllowShortBlocksOnASingleLine: false
@@ -78,7 +78,7 @@ BreakConstructorInitializers: BeforeColon
 BreakStringLiterals: true
 ConstructorInitializerAllOnOneLineOrOnePerLine: false
 Cpp11BracedListStyle: true
- 
+
 # Spaces
 SpaceAfterCStyleCast: false
 SpaceAfterTemplateKeyword: false
@@ -95,7 +95,7 @@ SpacesInCStyleCastParentheses: false
 SpacesInContainerLiterals: false
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
- 
+
 # Other
 CommentPragmas: '^(!FIXME!|!TODO!|ToDo:)'
 CompactNamespaces: false

source/common.hpp

@@ -59,7 +59,13 @@
 extern "C" {
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4201)
+#pragma warning(disable : 4464)
+#pragma warning(disable : 4820)
+#pragma warning(disable : 5220)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
 #endif
 #include <obs.h>
 
@@ -79,13 +85,14 @@ extern "C" {
 #include <graphics/vec4.h>
 
 #include <util/platform.h>
+#ifdef _MSC_VER
+#pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
+#endif
 
 // Fix libOBS's global defines
 #undef strtoll
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
 }
 
 // Common Global defines

source/encoders/encoder-aom-av1.hpp

@@ -31,7 +31,24 @@
 #include "util/util-library.hpp"
 #include "util/util-profiler.hpp"
 
+extern "C" {
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4464)
+#pragma warning(disable : 4820)
+#pragma warning(disable : 5220)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
+#endif
 #include <aom/aomcx.h>
+#ifdef _MSC_VER
+#pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
+#endif
+};
 
 namespace streamfx::encoder::aom::av1 {
 	class aom_av1_factory;

source/encoders/encoder-ffmpeg.cpp

@@ -47,15 +47,43 @@
 #endif
 
 extern "C" {
+#ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4244)
+#pragma warning(disable : 4464)
+#pragma warning(disable : 4820)
+#pragma warning(disable : 5220)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
+#endif
 #include <obs-avc.h>
+#ifdef _MSC_VER
+#pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
+#endif
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4464)
+#pragma warning(disable : 4820)
+#pragma warning(disable : 5220)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
+#endif
 #include <libavcodec/avcodec.h>
 #include <libavutil/dict.h>
 #include <libavutil/frame.h>
 #include <libavutil/opt.h>
 #include <libavutil/pixdesc.h>
+#ifdef _MSC_VER
 #pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
+#endif
 }
 
 #ifdef WIN32

source/encoders/encoder-ffmpeg.hpp

@@ -37,13 +37,17 @@
 extern "C" {
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4242 4244 4365)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
 #endif
-#include <obs-properties.h>
 #include <libavcodec/avcodec.h>
 #include <libavutil/frame.h>
 #ifdef _MSC_VER
 #pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
 #endif
 }
 

source/encoders/handlers/amf_h264_handler.cpp

@@ -30,11 +30,19 @@
 extern "C" {
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4242 4244 4365)
+#pragma warning(disable : 4464)
+#pragma warning(disable : 4820)
+#pragma warning(disable : 5220)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
 #endif
 #include <libavutil/opt.h>
 #ifdef _MSC_VER
 #pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
 #endif
 }
 

source/encoders/handlers/amf_h264_handler.hpp

@@ -26,10 +26,22 @@
 #include "handler.hpp"
 
 extern "C" {
+#ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4244)
+#pragma warning(disable : 4464)
+#pragma warning(disable : 4820)
+#pragma warning(disable : 5220)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
+#endif
 #include <libavcodec/avcodec.h>
+#ifdef _MSC_VER
 #pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
+#endif
 }
 
 namespace streamfx::encoder::ffmpeg::handler {

source/encoders/handlers/amf_hevc_handler.cpp

@@ -22,6 +22,7 @@
 //--------------------------------------------------------------------------------//
 
 #include "amf_hevc_handler.hpp"
+#include "common.hpp"
 #include "strings.hpp"
 #include "../codecs/hevc.hpp"
 #include "../encoder-ffmpeg.hpp"
@@ -30,11 +31,19 @@
 #include "plugin.hpp"
 
 extern "C" {
-#include <obs-module.h>
+#ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4242 4244 4365)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
+#endif
 #include <libavutil/opt.h>
+#ifdef _MSC_VER
 #pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
+#endif
 }
 
 // Settings

source/encoders/handlers/amf_hevc_handler.hpp

@@ -25,10 +25,22 @@
 #include "handler.hpp"
 
 extern "C" {
+#ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4244)
+#pragma warning(disable : 4464)
+#pragma warning(disable : 4820)
+#pragma warning(disable : 5220)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
+#endif
 #include <libavcodec/avcodec.h>
+#ifdef _MSC_VER
 #pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
+#endif
 }
 
 namespace streamfx::encoder::ffmpeg::handler {

source/encoders/handlers/amf_shared.cpp

@@ -27,10 +27,22 @@
 #include "ffmpeg/tools.hpp"
 
 extern "C" {
+#ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4244)
+#pragma warning(disable : 4464)
+#pragma warning(disable : 4820)
+#pragma warning(disable : 5220)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
+#endif
 #include <libavutil/opt.h>
+#ifdef _MSC_VER
 #pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
+#endif
 }
 
 // Translation

source/encoders/handlers/amf_shared.hpp

@@ -28,11 +28,19 @@
 extern "C" {
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4242 4244 4365)
+#pragma warning(disable : 4464)
+#pragma warning(disable : 4820)
+#pragma warning(disable : 5220)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
 #endif
 #include <libavcodec/avcodec.h>
 #ifdef _MSC_VER
 #pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
 #endif
 }
 

source/encoders/handlers/debug_handler.cpp

@@ -20,6 +20,7 @@
 // SOFTWARE.
 
 #include "debug_handler.hpp"
+#include "common.hpp"
 #include <map>
 #include <string>
 #include <utility>
@@ -28,11 +29,22 @@
 #include "plugin.hpp"
 
 extern "C" {
-#include <obs-properties.h>
+#ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4244)
+#pragma warning(disable : 4464)
+#pragma warning(disable : 4820)
+#pragma warning(disable : 5220)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
+#endif
 #include <libavutil/opt.h>
+#ifdef _MSC_VER
 #pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
+#endif
 }
 
 using namespace streamfx::encoder::ffmpeg::handler;

source/encoders/handlers/dnxhd_handler.cpp

@@ -1,13 +1,10 @@
 #include "dnxhd_handler.hpp"
+#include "common.hpp"
 #include <array>
 #include "../codecs/dnxhr.hpp"
 #include "ffmpeg/tools.hpp"
 #include "plugin.hpp"
 
-extern "C" {
-#include <obs-module.h>
-}
-
 using namespace streamfx::encoder::ffmpeg::handler;
 using namespace streamfx::encoder::codec::dnxhr;
 

source/encoders/handlers/dnxhd_handler.hpp

@@ -24,10 +24,22 @@
 #include "handler.hpp"
 
 extern "C" {
+#ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4244)
+#pragma warning(disable : 4464)
+#pragma warning(disable : 4820)
+#pragma warning(disable : 5220)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
+#endif
 #include <libavcodec/avcodec.h>
+#ifdef _MSC_VER
 #pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
+#endif
 }
 
 namespace streamfx::encoder::ffmpeg::handler {

source/encoders/handlers/handler.hpp

@@ -24,10 +24,22 @@
 #include "ffmpeg/hwapi/base.hpp"
 
 extern "C" {
+#ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4242 4244 4365)
+#pragma warning(disable : 4464)
+#pragma warning(disable : 4820)
+#pragma warning(disable : 5220)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
+#endif
 #include <libavcodec/avcodec.h>
+#ifdef _MSC_VER
 #pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
+#endif
 }
 
 namespace streamfx::encoder::ffmpeg {

source/encoders/handlers/nvenc_h264_handler.cpp

@@ -20,6 +20,7 @@
 // SOFTWARE.
 
 #include "nvenc_h264_handler.hpp"
+#include "common.hpp"
 #include "strings.hpp"
 #include "../codecs/h264.hpp"
 #include "../encoder-ffmpeg.hpp"
@@ -30,12 +31,19 @@
 extern "C" {
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4242 4244 4365)
+#pragma warning(disable : 4464)
+#pragma warning(disable : 4820)
+#pragma warning(disable : 5220)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
 #endif
-#include <obs-module.h>
 #include <libavutil/opt.h>
 #ifdef _MSC_VER
 #pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
 #endif
 }
 

source/encoders/handlers/nvenc_h264_handler.hpp

@@ -23,10 +23,22 @@
 #include "handler.hpp"
 
 extern "C" {
+#ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4244)
+#pragma warning(disable : 4464)
+#pragma warning(disable : 4820)
+#pragma warning(disable : 5220)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
+#endif
 #include <libavcodec/avcodec.h>
+#ifdef _MSC_VER
 #pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
+#endif
 }
 
 namespace streamfx::encoder::ffmpeg::handler {

source/encoders/handlers/nvenc_hevc_handler.cpp

@@ -20,6 +20,7 @@
 // SOFTWARE.
 
 #include "nvenc_hevc_handler.hpp"
+#include "common.hpp"
 #include "strings.hpp"
 #include "../codecs/hevc.hpp"
 #include "../encoder-ffmpeg.hpp"
@@ -28,11 +29,22 @@
 #include "plugin.hpp"
 
 extern "C" {
-#include <obs-module.h>
+#ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4242 4244 4365)
+#pragma warning(disable : 4464)
+#pragma warning(disable : 4820)
+#pragma warning(disable : 5220)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
+#endif
 #include <libavutil/opt.h>
+#ifdef _MSC_VER
 #pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
+#endif
 }
 
 #define ST_KEY_PROFILE "H265.Profile"

source/encoders/handlers/nvenc_hevc_handler.hpp

@@ -23,10 +23,22 @@
 #include "handler.hpp"
 
 extern "C" {
+#ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4244)
+#pragma warning(disable : 4464)
+#pragma warning(disable : 4820)
+#pragma warning(disable : 5220)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
+#endif
 #include <libavcodec/avcodec.h>
+#ifdef _MSC_VER
 #pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
+#endif
 }
 
 namespace streamfx::encoder::ffmpeg::handler {

source/encoders/handlers/nvenc_shared.cpp

@@ -24,10 +24,22 @@
 #include "ffmpeg/tools.hpp"
 
 extern "C" {
+#ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4244)
+#pragma warning(disable : 4464)
+#pragma warning(disable : 4820)
+#pragma warning(disable : 5220)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
+#endif
 #include <libavutil/opt.h>
+#ifdef _MSC_VER
 #pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
+#endif
 }
 
 #define ST_I18N_PRESET "Encoder.FFmpeg.NVENC.Preset"

source/encoders/handlers/prores_aw_handler.cpp

@@ -20,15 +20,12 @@
 // SOFTWARE.
 
 #include "prores_aw_handler.hpp"
+#include "common.hpp"
 #include <array>
 #include "../codecs/prores.hpp"
 #include "ffmpeg/tools.hpp"
 #include "plugin.hpp"
 
-extern "C" {
-#include <obs-module.h>
-}
-
 using namespace streamfx::encoder::ffmpeg::handler;
 using namespace streamfx::encoder::codec::prores;
 

source/encoders/handlers/prores_aw_handler.hpp

@@ -23,10 +23,22 @@
 #include "handler.hpp"
 
 extern "C" {
+#ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4244)
+#pragma warning(disable : 4464)
+#pragma warning(disable : 4820)
+#pragma warning(disable : 5220)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
+#endif
 #include <libavcodec/avcodec.h>
+#ifdef _MSC_VER
 #pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
+#endif
 }
 
 namespace streamfx::encoder::ffmpeg::handler {

source/ffmpeg/avframe-queue.hpp

@@ -27,11 +27,16 @@
 extern "C" {
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4242 4244 4365)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
 #endif
 #include <libavutil/frame.h>
 #ifdef _MSC_VER
 #pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
 #endif
 }
 

source/ffmpeg/hwapi/base.hpp

@@ -27,12 +27,17 @@
 extern "C" {
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4242 4244 4365)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
 #endif
 #include <libavutil/frame.h>
 #include <libavutil/hwcontext.h>
 #ifdef _MSC_VER
 #pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
 #endif
 }
 

source/ffmpeg/hwapi/d3d11.cpp

@@ -27,14 +27,19 @@
 #include "obs/gs/gs-helper.hpp"
 
 extern "C" {
+#ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4191)
-#pragma warning(disable : 4242)
-#pragma warning(disable : 4244)
-#pragma warning(disable : 4365)
-#pragma warning(disable : 4986)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
+#endif
 #include <libavutil/hwcontext_d3d11va.h>
+#ifdef _MSC_VER
 #pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
+#endif
 }
 
 using namespace streamfx::ffmpeg::hwapi;

source/ffmpeg/hwapi/d3d11.hpp

@@ -24,7 +24,10 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4191 4242 4244 4365 4777 4986 5039 5204)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
 #endif
 #include <atlutil.h>
 #include <d3d11.h>
@@ -32,6 +35,8 @@
 #include <dxgi.h>
 #ifdef _MSC_VER
 #pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
 #endif
 
 namespace streamfx::ffmpeg::hwapi {

source/ffmpeg/swscale.hpp

@@ -26,12 +26,17 @@
 extern "C" {
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4242 4244 4365)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
 #endif
 #include <libavutil/pixfmt.h>
 #include <libswscale/swscale.h>
 #ifdef _MSC_VER
 #pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
 #endif
 }
 

source/ffmpeg/tools.cpp

@@ -25,13 +25,22 @@
 #include "plugin.hpp"
 
 extern "C" {
+#ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4244)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
+#endif
 #include <libavcodec/avcodec.h>
 #include <libavutil/error.h>
 #include <libavutil/opt.h>
 #include <libavutil/pixdesc.h>
+#ifdef _MSC_VER
 #pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
+#endif
 }
 
 using namespace streamfx::ffmpeg;

source/ffmpeg/tools.hpp

@@ -26,13 +26,18 @@
 extern "C" {
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4242 4244 4365)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
 #endif
 #include <libavcodec/avcodec.h>
 #include <libavutil/opt.h>
 #include <libavutil/pixfmt.h>
 #ifdef _MSC_VER
 #pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
 #endif
 }
 

source/gfx/blur/gfx-blur-box-linear.cpp

@@ -16,22 +16,13 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 #include "gfx-blur-box-linear.hpp"
+#include "common.hpp"
 #include <cmath>
 #include <memory>
 #include <stdexcept>
 #include "obs/gs/gs-helper.hpp"
 #include "plugin.hpp"
 
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4201)
-#endif
-#include <obs.h>
-#include <obs-module.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
 #define ST_MAX_BLUR_SIZE 128 // Also change this in box-linear.effect if modified.
 
 streamfx::gfx::blur::box_linear_data::box_linear_data()

source/gfx/blur/gfx-blur-box.cpp

@@ -16,22 +16,13 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 #include "gfx-blur-box.hpp"
+#include "common.hpp"
 #include <cmath>
 #include <memory>
 #include <stdexcept>
 #include "obs/gs/gs-helper.hpp"
 #include "plugin.hpp"
 
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4201)
-#endif
-#include <obs.h>
-#include <obs-module.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
 #define ST_MAX_BLUR_SIZE 128 // Also change this in box.effect if modified.
 
 streamfx::gfx::blur::box_data::box_data()

source/gfx/blur/gfx-blur-dual-filtering.cpp

@@ -16,21 +16,12 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 #include "gfx-blur-dual-filtering.hpp"
+#include "common.hpp"
 #include <algorithm>
 #include <stdexcept>
 #include "obs/gs/gs-helper.hpp"
 #include "plugin.hpp"
 
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4201)
-#endif
-#include <obs.h>
-#include <obs-module.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
 // Dual Filtering Blur
 //
 // This type of Blur uses downsampling and upsampling and clever math. That makes it less

source/gfx/blur/gfx-blur-gaussian-linear.cpp

@@ -16,19 +16,10 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 #include "gfx-blur-gaussian-linear.hpp"
+#include "common.hpp"
 #include <stdexcept>
 #include "obs/gs/gs-helper.hpp"
 
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4201)
-#endif
-#include <obs.h>
-#include <obs-module.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
 // FIXME: This breaks when MAX_KERNEL_SIZE is changed, due to the way the Gaussian
 //  function first goes up at the point, and then once we pass the critical point
 //  will go down again and it is not handled well. This is a pretty basic

source/gfx/blur/gfx-blur-gaussian.cpp

@@ -16,21 +16,12 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 #include "gfx-blur-gaussian.hpp"
+#include "common.hpp"
 #include <algorithm>
 #include <stdexcept>
 #include "obs/gs/gs-helper.hpp"
 #include "plugin.hpp"
 
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4201)
-#endif
-#include <obs.h>
-#include <obs-module.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
 // TODO: It may be possible to optimize to run much faster: https://rastergrid.com/blog/2010/09/efficient-gaussian-blur-with-linear-sampling/
 
 #define ST_KERNEL_SIZE 128u

source/gfx/gfx-opengl.cpp

@@ -24,6 +24,16 @@
 #include "util/util-logging.hpp"
 
 // OpenGL
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4464)
+#pragma warning(disable : 4820)
+#pragma warning(disable : 5220)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
+#endif
 #include "glad/gl.h"
 #ifdef D_PLATFORM_WINDOWS
 #include "glad/wgl.h"
@@ -31,6 +41,11 @@
 #ifdef D_PLATFORM_LINUX
 #include "glad/glx.h"
 #endif
+#ifdef _MSC_VER
+#pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
+#endif
 
 #ifdef _DEBUG
 #define ST_PREFIX "<%s> "

source/gfx/shader/gfx-shader-param-texture.hpp

@@ -1,6 +1,6 @@
 
 #pragma once
-#include <obs.h>
+#include "common.hpp"
 #include <chrono>
 #include <mutex>
 #include "gfx-shader-param.hpp"

source/nvidia/ar/nvidia-ar.cpp

@@ -41,9 +41,24 @@
 #endif
 
 #ifdef WIN32
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4464)
+#pragma warning(disable : 4820)
+#pragma warning(disable : 5220)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
+#endif
 #include <KnownFolders.h>
 #include <ShlObj.h>
 #include <Windows.h>
+#ifdef _MSC_VER
+#pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
+#endif
 
 #define ST_LIBRARY_NAME "nvARPose.dll"
 #else

source/nvidia/cuda/nvidia-cuda-context.cpp

@@ -39,11 +39,19 @@
 #ifdef WIN32
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4191 4242 4244 4365 4777 4986 5039 5204)
+#pragma warning(disable : 4464)
+#pragma warning(disable : 4820)
+#pragma warning(disable : 5220)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
 #endif
 #include <atlutil.h>
 #ifdef _MSC_VER
 #pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
 #endif
 #endif
 

source/nvidia/cuda/nvidia-cuda.hpp

@@ -24,12 +24,23 @@
 #include "util/util-library.hpp"
 
 #ifdef WIN32
+#ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4365)
-#pragma warning(disable : 5204)
+#pragma warning(disable : 4464)
+#pragma warning(disable : 4820)
+#pragma warning(disable : 5220)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
+#endif
 #include <d3d11.h>
 #include <dxgi.h>
+#ifdef _MSC_VER
 #pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
+#endif
 #endif
 
 #define P_CUDA_DEFINE_FUNCTION(name, ...)                             \

source/nvidia/cv/nvidia-cv.cpp

@@ -45,9 +45,24 @@
 #endif
 
 #if defined(WIN32)
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4464)
+#pragma warning(disable : 4820)
+#pragma warning(disable : 5220)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
+#endif
 #include <KnownFolders.h>
 #include <ShlObj.h>
 #include <Windows.h>
+#ifdef _MSC_VER
+#pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
+#endif
 
 #define LIB_NAME "NVCVImage.dll"
 #else

source/nvidia/cv/nvidia-cv.hpp

@@ -25,12 +25,23 @@
 #include "util/util-library.hpp"
 
 #ifdef WIN32
+#ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4365)
-#pragma warning(disable : 5204)
+#pragma warning(disable : 4464)
+#pragma warning(disable : 4820)
+#pragma warning(disable : 5220)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
+#endif
 #include <d3d11.h>
 #include <dxgi.h>
+#ifdef _MSC_VER
 #pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
+#endif
 #endif
 
 #define NVCVI_DEFINE_FUNCTION(name, ...)                                   \

source/nvidia/vfx/nvidia-vfx.cpp

@@ -41,9 +41,24 @@
 #endif
 
 #if defined(WIN32)
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4464)
+#pragma warning(disable : 4820)
+#pragma warning(disable : 5220)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
+#endif
 #include <KnownFolders.h>
 #include <ShlObj.h>
 #include <Windows.h>
+#ifdef _MSC_VER
+#pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
+#endif
 
 #define LIB_NAME "NVVideoEffects.dll"
 #else

source/obs/gs/gs-effect-parameter.cpp

@@ -25,11 +25,19 @@
 extern "C" {
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4201)
+#pragma warning(disable : 4464)
+#pragma warning(disable : 4820)
+#pragma warning(disable : 5220)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
 #endif
 #include <graphics/effect.h>
 #ifdef _MSC_VER
 #pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
 #endif
 }
 

source/obs/gs/gs-effect-pass.cpp

@@ -23,11 +23,19 @@
 extern "C" {
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4201)
+#pragma warning(disable : 4464)
+#pragma warning(disable : 4820)
+#pragma warning(disable : 5220)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
 #endif
 #include <graphics/effect.h>
 #ifdef _MSC_VER
 #pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
 #endif
 }
 

source/obs/gs/gs-effect-technique.cpp

@@ -24,11 +24,19 @@
 extern "C" {
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4201)
+#pragma warning(disable : 4464)
+#pragma warning(disable : 4820)
+#pragma warning(disable : 5220)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
 #endif
 #include <graphics/effect.h>
 #ifdef _MSC_VER
 #pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
 #endif
 }
 

source/sources/source-mirror.cpp

@@ -48,11 +48,19 @@
 // OBS
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4201)
+#pragma warning(disable : 4464)
+#pragma warning(disable : 4820)
+#pragma warning(disable : 5220)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
 #endif
 #include <media-io/audio-io.h>
 #ifdef _MSC_VER
 #pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
 #endif
 
 #define ST_I18N "Source.Mirror"

source/ui/ui-about-entry.hpp

@@ -18,18 +18,24 @@
  */
 
 #pragma once
+#include "ui-common.hpp"
 #include <chrono>
 #include "ui-about.hpp"
-#include "ui-common.hpp"
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4251 4365 4371 4619 4946)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
 #endif
 #include <QMouseEvent>
 #include "ui_about-entry.h"
+
 #ifdef _MSC_VER
 #pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
 #endif
 
 namespace streamfx::ui {

source/ui/ui-about.cpp

@@ -18,26 +18,32 @@
  */
 
 #include "ui-about.hpp"
+#include "ui-common.hpp"
 #include <algorithm>
 #include <deque>
 #include <fstream>
 #include <map>
 #include <random>
-
-#include <obs-frontend-api.h>
-#include <nlohmann/json.hpp>
 #include "plugin.hpp"
 #include "ui-about-entry.hpp"
 #include "util/util-logging.hpp"
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4251 4365 4371 4619 4946)
+#pragma warning(disable : 4623)
+#pragma warning(disable : 4625)
+#pragma warning(disable : 4626)
+#pragma warning(disable : 5027)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
 #endif
-#include <QLayout>
-#include <QLayoutItem>
+#include <nlohmann/json.hpp>
 #ifdef _MSC_VER
 #pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
 #endif
 
 #ifdef _DEBUG

source/ui/ui-about.hpp

@@ -23,11 +23,16 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4251 4365 4371 4619 4946)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
 #endif
 #include "ui_about.h"
 #ifdef _MSC_VER
 #pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
 #endif
 
 namespace streamfx::ui {

source/ui/ui-common.hpp

@@ -18,15 +18,20 @@
  */
 
 #pragma once
+#include "common.hpp"
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4251 4365 4371 4619 4946)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
 #endif
-
 #include <QAction>
 #include <QDesktopServices>
 #include <QDialog>
+#include <QLayout>
+#include <QLayoutItem>
 #include <QMainWindow>
 #include <QMenu>
 #include <QMenuBar>
@@ -35,11 +40,27 @@
 #include <QTranslator>
 #include <QUrl>
 #include <QWidget>
-
-extern "C" {
-#include <obs-frontend-api.h>
-}
-
 #ifdef _MSC_VER
 #pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
 #endif
+
+extern "C" {
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4464)
+#pragma warning(disable : 4820)
+#pragma warning(disable : 5220)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
+#endif
+#include <obs-frontend-api.h>
+#ifdef _MSC_VER
+#pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
+#endif
+}

source/ui/ui-updater.hpp

@@ -24,9 +24,11 @@
 
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4251 4365 4371 4619 4946)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
 #endif
-
 #include <QAction>
 #include <QActionGroup>
 #include <QBoxLayout>
@@ -41,6 +43,8 @@ Q_DECLARE_METATYPE(::streamfx::version_stage);
 
 #ifdef _MSC_VER
 #pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
 #endif
 
 namespace streamfx::ui {

source/ui/ui.cpp

@@ -18,15 +18,13 @@
  */
 
 #include "ui.hpp"
-#include "common.hpp"
 #include "strings.hpp"
+#include "ui-common.hpp"
 #include <string_view>
 #include "configuration.hpp"
 #include "obs/obs-tools.hpp"
 #include "plugin.hpp"
 
-#include <obs-frontend-api.h>
-
 // Translation Keys
 constexpr std::string_view _i18n_prefix       = "StreamFX::";
 constexpr std::string_view _i18n_menu         = "UI.Menu";

source/ui/ui.hpp

@@ -18,8 +18,8 @@
  */
 
 #pragma once
-#include "ui-about.hpp"
 #include "ui-common.hpp"
+#include "ui-about.hpp"
 
 #ifdef ENABLE_UPDATER
 #include "ui-updater.hpp"

source/updater.hpp

@@ -22,11 +22,28 @@
 #include <atomic>
 #include <chrono>
 #include <map>
-#include <nlohmann/json.hpp>
 #include "util/util-curl.hpp"
 #include "util/util-event.hpp"
 #include "util/util-threadpool.hpp"
 
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4623)
+#pragma warning(disable : 4625)
+#pragma warning(disable : 4626)
+#pragma warning(disable : 5027)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
+#endif
+#include <nlohmann/json.hpp>
+#ifdef _MSC_VER
+#pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
+#endif
+
 namespace streamfx {
 	enum class version_stage : uint8_t {
 		STABLE,    // A.B.C

source/util/util-curl.hpp

@@ -30,7 +30,22 @@ extern "C" {
 #ifndef NOMINMAX
 #define NOMINMAX
 #endif
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4464)
+#pragma warning(disable : 4820)
+#pragma warning(disable : 5220)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
+#endif
 #include <curl/curl.h>
+#ifdef _MSC_VER
+#pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
+#endif
 }
 
 namespace streamfx::util {

source/util/utility.cpp

@@ -18,22 +18,12 @@
 */
 
 #include "utility.hpp"
+#include "common.hpp"
 #include <sstream>
 #include <stdexcept>
 #include <unordered_map>
 #include "plugin.hpp"
 
-// OBS
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4201)
-#pragma warning(disable : 5039)
-#endif
-#include <obs.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
 obs_property_t* streamfx::util::obs_properties_add_tristate(obs_properties_t* props, const char* name, const char* desc)
 {
 	obs_property_t* p = obs_properties_add_list(props, name, desc, OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);

source/util/utility.hpp

@@ -27,7 +27,13 @@
 extern "C" {
 #ifdef _MSC_VER
 #pragma warning(push)
-#pragma warning(disable : 4201)
+#pragma warning(disable : 4464)
+#pragma warning(disable : 4820)
+#pragma warning(disable : 5220)
+#else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wall"
+#pragma GCC diagnostic ignored "-Wextra"
 #endif
 #include <obs.h>
 #include <graphics/vec2.h>
@@ -35,6 +41,8 @@ extern "C" {
 #include <graphics/vec4.h>
 #ifdef _MSC_VER
 #pragma warning(pop)
+#else
+#pragma GCC diagnostic pop
 #endif
 }
 

templates/module.cpp.in

@@ -1,12 +1,4 @@
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4201)
-#endif
-#include <obs.h>
-#include <obs-module.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
+#include "common.hpp"
 
 OBS_DECLARE_MODULE()
 OBS_MODULE_AUTHOR("@PROJECT_AUTHORS@")
@@ -21,3 +13,4 @@ MODULE_EXPORT const char* obs_module_description()
 {
 	return "@PROJECT_DESCRIPTION@";
 }
+