RomanNum3ral
/
obs-streamFX
mirror of https://github.com/RomanNum3ral/obs-StreamFX.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

code: Ignore warnings from external code 

May need to find a better solution such as disabling all warnings on third party code.
This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2022-08-28 14:28:37 +02:00
parent 4e41c5cf24
commit 8e52bbf88b
58 changed files with 552 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.clang-format
View File

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

17
source/common.hpp
View File

@ -59,7 +59,13 @@
extern "C" { extern "C" {
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(push) #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 #endif
#include <obs.h> #include <obs.h>
@ -79,13 +85,14 @@ extern "C" {
#include <graphics/vec4.h> #include <graphics/vec4.h>
#include <util/platform.h> #include <util/platform.h>
#ifdef _MSC_VER
#pragma warning(pop)
#else
#pragma GCC diagnostic pop
#endif
// Fix libOBS's global defines // Fix libOBS's global defines
#undef strtoll #undef strtoll
#ifdef _MSC_VER
#pragma warning(pop)
#endif
} }
// Common Global defines // Common Global defines

17
source/encoders/encoder-aom-av1.hpp
View File

@ -31,7 +31,24 @@
#include "util/util-library.hpp" #include "util/util-library.hpp"
#include "util/util-profiler.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> #include <aom/aomcx.h>
#ifdef _MSC_VER
#pragma warning(pop)
#else
#pragma GCC diagnostic pop
#endif
};
namespace streamfx::encoder::aom::av1 { namespace streamfx::encoder::aom::av1 {
class aom_av1_factory; class aom_av1_factory;

30
source/encoders/encoder-ffmpeg.cpp
View File

@ -47,15 +47,43 @@
#endif #endif
extern "C" { extern "C" {
#ifdef _MSC_VER
#pragma warning(push) #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> #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 <libavcodec/avcodec.h>
#include <libavutil/dict.h> #include <libavutil/dict.h>
#include <libavutil/frame.h> #include <libavutil/frame.h>
#include <libavutil/opt.h> #include <libavutil/opt.h>
#include <libavutil/pixdesc.h> #include <libavutil/pixdesc.h>
#ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#else
#pragma GCC diagnostic pop
#endif
} }
#ifdef WIN32 #ifdef WIN32

8
source/encoders/encoder-ffmpeg.hpp
View File

@ -37,13 +37,17 @@
extern "C" { extern "C" {
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(push) #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 #endif
#include <obs-properties.h>
#include <libavcodec/avcodec.h> #include <libavcodec/avcodec.h>
#include <libavutil/frame.h> #include <libavutil/frame.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#else
#pragma GCC diagnostic pop
#endif #endif
} }

10
source/encoders/handlers/amf_h264_handler.cpp
View File

@ -30,11 +30,19 @@
extern "C" { extern "C" {
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(push) #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 #endif
#include <libavutil/opt.h> #include <libavutil/opt.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#else
#pragma GCC diagnostic pop
#endif #endif
} }

14
source/encoders/handlers/amf_h264_handler.hpp
View File

@ -26,10 +26,22 @@
#include "handler.hpp" #include "handler.hpp"
extern "C" { extern "C" {
#ifdef _MSC_VER
#pragma warning(push) #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> #include <libavcodec/avcodec.h>
#ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#else
#pragma GCC diagnostic pop
#endif
} }
namespace streamfx::encoder::ffmpeg::handler { namespace streamfx::encoder::ffmpeg::handler {

13
source/encoders/handlers/amf_hevc_handler.cpp
View File

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

14
source/encoders/handlers/amf_hevc_handler.hpp
View File

@ -25,10 +25,22 @@
#include "handler.hpp" #include "handler.hpp"
extern "C" { extern "C" {
#ifdef _MSC_VER
#pragma warning(push) #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> #include <libavcodec/avcodec.h>
#ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#else
#pragma GCC diagnostic pop
#endif
} }
namespace streamfx::encoder::ffmpeg::handler { namespace streamfx::encoder::ffmpeg::handler {

14
source/encoders/handlers/amf_shared.cpp
View File

@ -27,10 +27,22 @@
#include "ffmpeg/tools.hpp" #include "ffmpeg/tools.hpp"
extern "C" { extern "C" {
#ifdef _MSC_VER
#pragma warning(push) #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> #include <libavutil/opt.h>
#ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#else
#pragma GCC diagnostic pop
#endif
} }
// Translation // Translation

10
source/encoders/handlers/amf_shared.hpp
View File

@ -28,11 +28,19 @@
extern "C" { extern "C" {
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(push) #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 #endif
#include <libavcodec/avcodec.h> #include <libavcodec/avcodec.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#else
#pragma GCC diagnostic pop
#endif #endif
} }

16
source/encoders/handlers/debug_handler.cpp
View File

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

5
source/encoders/handlers/dnxhd_handler.cpp
View File

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

14
source/encoders/handlers/dnxhd_handler.hpp
View File

@ -24,10 +24,22 @@
#include "handler.hpp" #include "handler.hpp"
extern "C" { extern "C" {
#ifdef _MSC_VER
#pragma warning(push) #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> #include <libavcodec/avcodec.h>
#ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#else
#pragma GCC diagnostic pop
#endif
} }
namespace streamfx::encoder::ffmpeg::handler { namespace streamfx::encoder::ffmpeg::handler {

14
source/encoders/handlers/handler.hpp
View File

@ -24,10 +24,22 @@
#include "ffmpeg/hwapi/base.hpp" #include "ffmpeg/hwapi/base.hpp"
extern "C" { extern "C" {
#ifdef _MSC_VER
#pragma warning(push) #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> #include <libavcodec/avcodec.h>
#ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#else
#pragma GCC diagnostic pop
#endif
} }
namespace streamfx::encoder::ffmpeg { namespace streamfx::encoder::ffmpeg {

12
source/encoders/handlers/nvenc_h264_handler.cpp
View File

@ -20,6 +20,7 @@
// SOFTWARE. // SOFTWARE.
#include "nvenc_h264_handler.hpp" #include "nvenc_h264_handler.hpp"
#include "common.hpp"
#include "strings.hpp" #include "strings.hpp"
#include "../codecs/h264.hpp" #include "../codecs/h264.hpp"
#include "../encoder-ffmpeg.hpp" #include "../encoder-ffmpeg.hpp"
@ -30,12 +31,19 @@
extern "C" { extern "C" {
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(push) #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 #endif
#include <obs-module.h>
#include <libavutil/opt.h> #include <libavutil/opt.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#else
#pragma GCC diagnostic pop
#endif #endif
} }

14
source/encoders/handlers/nvenc_h264_handler.hpp
View File

@ -23,10 +23,22 @@
#include "handler.hpp" #include "handler.hpp"
extern "C" { extern "C" {
#ifdef _MSC_VER
#pragma warning(push) #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> #include <libavcodec/avcodec.h>
#ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#else
#pragma GCC diagnostic pop
#endif
} }
namespace streamfx::encoder::ffmpeg::handler { namespace streamfx::encoder::ffmpeg::handler {

16
source/encoders/handlers/nvenc_hevc_handler.cpp
View File

@ -20,6 +20,7 @@
// SOFTWARE. // SOFTWARE.
#include "nvenc_hevc_handler.hpp" #include "nvenc_hevc_handler.hpp"
#include "common.hpp"
#include "strings.hpp" #include "strings.hpp"
#include "../codecs/hevc.hpp" #include "../codecs/hevc.hpp"
#include "../encoder-ffmpeg.hpp" #include "../encoder-ffmpeg.hpp"
@ -28,11 +29,22 @@
#include "plugin.hpp" #include "plugin.hpp"
extern "C" { extern "C" {
#include <obs-module.h> #ifdef _MSC_VER
#pragma warning(push) #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> #include <libavutil/opt.h>
#ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#else
#pragma GCC diagnostic pop
#endif
} }
#define ST_KEY_PROFILE "H265.Profile" #define ST_KEY_PROFILE "H265.Profile"

14
source/encoders/handlers/nvenc_hevc_handler.hpp
View File

@ -23,10 +23,22 @@
#include "handler.hpp" #include "handler.hpp"
extern "C" { extern "C" {
#ifdef _MSC_VER
#pragma warning(push) #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> #include <libavcodec/avcodec.h>
#ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#else
#pragma GCC diagnostic pop
#endif
} }
namespace streamfx::encoder::ffmpeg::handler { namespace streamfx::encoder::ffmpeg::handler {

14
source/encoders/handlers/nvenc_shared.cpp
View File

@ -24,10 +24,22 @@
#include "ffmpeg/tools.hpp" #include "ffmpeg/tools.hpp"
extern "C" { extern "C" {
#ifdef _MSC_VER
#pragma warning(push) #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> #include <libavutil/opt.h>
#ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#else
#pragma GCC diagnostic pop
#endif
} }
#define ST_I18N_PRESET "Encoder.FFmpeg.NVENC.Preset" #define ST_I18N_PRESET "Encoder.FFmpeg.NVENC.Preset"

5
source/encoders/handlers/prores_aw_handler.cpp
View File

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

14
source/encoders/handlers/prores_aw_handler.hpp
View File

@ -23,10 +23,22 @@
#include "handler.hpp" #include "handler.hpp"
extern "C" { extern "C" {
#ifdef _MSC_VER
#pragma warning(push) #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> #include <libavcodec/avcodec.h>
#ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#else
#pragma GCC diagnostic pop
#endif
} }
namespace streamfx::encoder::ffmpeg::handler { namespace streamfx::encoder::ffmpeg::handler {

7
source/ffmpeg/avframe-queue.hpp
View File

@ -27,11 +27,16 @@
extern "C" { extern "C" {
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(push) #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 #endif
#include <libavutil/frame.h> #include <libavutil/frame.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#else
#pragma GCC diagnostic pop
#endif #endif
} }

7
source/ffmpeg/hwapi/base.hpp
View File

@ -27,12 +27,17 @@
extern "C" { extern "C" {
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(push) #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 #endif
#include <libavutil/frame.h> #include <libavutil/frame.h>
#include <libavutil/hwcontext.h> #include <libavutil/hwcontext.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#else
#pragma GCC diagnostic pop
#endif #endif
} }

15
source/ffmpeg/hwapi/d3d11.cpp
View File

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

7
source/ffmpeg/hwapi/d3d11.hpp
View File

@ -24,7 +24,10 @@
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(push) #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 #endif
#include <atlutil.h> #include <atlutil.h>
#include <d3d11.h> #include <d3d11.h>
@ -32,6 +35,8 @@
#include <dxgi.h> #include <dxgi.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#else
#pragma GCC diagnostic pop
#endif #endif
namespace streamfx::ffmpeg::hwapi { namespace streamfx::ffmpeg::hwapi {

7
source/ffmpeg/swscale.hpp
View File

@ -26,12 +26,17 @@
extern "C" { extern "C" {
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(push) #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 #endif
#include <libavutil/pixfmt.h> #include <libavutil/pixfmt.h>
#include <libswscale/swscale.h> #include <libswscale/swscale.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#else
#pragma GCC diagnostic pop
#endif #endif
} }

11
source/ffmpeg/tools.cpp
View File

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

7
source/ffmpeg/tools.hpp
View File

@ -26,13 +26,18 @@
extern "C" { extern "C" {
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(push) #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 #endif
#include <libavcodec/avcodec.h> #include <libavcodec/avcodec.h>
#include <libavutil/opt.h> #include <libavutil/opt.h>
#include <libavutil/pixfmt.h> #include <libavutil/pixfmt.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#else
#pragma GCC diagnostic pop
#endif #endif
} }

11
source/gfx/blur/gfx-blur-box-linear.cpp
View File

@ -16,22 +16,13 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
#include "gfx-blur-box-linear.hpp" #include "gfx-blur-box-linear.hpp"
#include "common.hpp"
#include <cmath> #include <cmath>
#include <memory> #include <memory>
#include <stdexcept> #include <stdexcept>
#include "obs/gs/gs-helper.hpp" #include "obs/gs/gs-helper.hpp"
#include "plugin.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. #define ST_MAX_BLUR_SIZE 128 // Also change this in box-linear.effect if modified.
streamfx::gfx::blur::box_linear_data::box_linear_data() streamfx::gfx::blur::box_linear_data::box_linear_data()

11
source/gfx/blur/gfx-blur-box.cpp
View File

@ -16,22 +16,13 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
#include "gfx-blur-box.hpp" #include "gfx-blur-box.hpp"
#include "common.hpp"
#include <cmath> #include <cmath>
#include <memory> #include <memory>
#include <stdexcept> #include <stdexcept>
#include "obs/gs/gs-helper.hpp" #include "obs/gs/gs-helper.hpp"
#include "plugin.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. #define ST_MAX_BLUR_SIZE 128 // Also change this in box.effect if modified.
streamfx::gfx::blur::box_data::box_data() streamfx::gfx::blur::box_data::box_data()

11
source/gfx/blur/gfx-blur-dual-filtering.cpp
View File

@ -16,21 +16,12 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
#include "gfx-blur-dual-filtering.hpp" #include "gfx-blur-dual-filtering.hpp"
#include "common.hpp"
#include <algorithm> #include <algorithm>
#include <stdexcept> #include <stdexcept>
#include "obs/gs/gs-helper.hpp" #include "obs/gs/gs-helper.hpp"
#include "plugin.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 // Dual Filtering Blur
// //
// This type of Blur uses downsampling and upsampling and clever math. That makes it less // This type of Blur uses downsampling and upsampling and clever math. That makes it less

11
source/gfx/blur/gfx-blur-gaussian-linear.cpp
View File

@ -16,19 +16,10 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
#include "gfx-blur-gaussian-linear.hpp" #include "gfx-blur-gaussian-linear.hpp"
#include "common.hpp"
#include <stdexcept> #include <stdexcept>
#include "obs/gs/gs-helper.hpp" #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 // 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 // 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 // will go down again and it is not handled well. This is a pretty basic

11
source/gfx/blur/gfx-blur-gaussian.cpp
View File

@ -16,21 +16,12 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
#include "gfx-blur-gaussian.hpp" #include "gfx-blur-gaussian.hpp"
#include "common.hpp"
#include <algorithm> #include <algorithm>
#include <stdexcept> #include <stdexcept>
#include "obs/gs/gs-helper.hpp" #include "obs/gs/gs-helper.hpp"
#include "plugin.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/ // 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 #define ST_KERNEL_SIZE 128u

15
source/gfx/gfx-opengl.cpp
View File

@ -24,6 +24,16 @@
#include "util/util-logging.hpp" #include "util/util-logging.hpp"
// OpenGL // 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" #include "glad/gl.h"
#ifdef D_PLATFORM_WINDOWS #ifdef D_PLATFORM_WINDOWS
#include "glad/wgl.h" #include "glad/wgl.h"
@ -31,6 +41,11 @@
#ifdef D_PLATFORM_LINUX #ifdef D_PLATFORM_LINUX
#include "glad/glx.h" #include "glad/glx.h"
#endif #endif
#ifdef _MSC_VER
#pragma warning(pop)
#else
#pragma GCC diagnostic pop
#endif
#ifdef _DEBUG #ifdef _DEBUG
#define ST_PREFIX "<%s> " #define ST_PREFIX "<%s> "

2
source/gfx/shader/gfx-shader-param-texture.hpp
View File

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

15
source/nvidia/ar/nvidia-ar.cpp
View File

@ -41,9 +41,24 @@
#endif #endif
#ifdef WIN32 #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 <KnownFolders.h>
#include <ShlObj.h> #include <ShlObj.h>
#include <Windows.h> #include <Windows.h>
#ifdef _MSC_VER
#pragma warning(pop)
#else
#pragma GCC diagnostic pop
#endif
#define ST_LIBRARY_NAME "nvARPose.dll" #define ST_LIBRARY_NAME "nvARPose.dll"
#else #else

10
source/nvidia/cuda/nvidia-cuda-context.cpp
View File

@ -39,11 +39,19 @@
#ifdef WIN32 #ifdef WIN32
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(push) #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 #endif
#include <atlutil.h> #include <atlutil.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#else
#pragma GCC diagnostic pop
#endif #endif
#endif #endif

15
source/nvidia/cuda/nvidia-cuda.hpp
View File

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

15
source/nvidia/cv/nvidia-cv.cpp
View File

@ -45,9 +45,24 @@
#endif #endif
#if defined(WIN32) #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 <KnownFolders.h>
#include <ShlObj.h> #include <ShlObj.h>
#include <Windows.h> #include <Windows.h>
#ifdef _MSC_VER
#pragma warning(pop)
#else
#pragma GCC diagnostic pop
#endif
#define LIB_NAME "NVCVImage.dll" #define LIB_NAME "NVCVImage.dll"
#else #else

15
source/nvidia/cv/nvidia-cv.hpp
View File

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

15
source/nvidia/vfx/nvidia-vfx.cpp
View File

@ -41,9 +41,24 @@
#endif #endif
#if defined(WIN32) #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 <KnownFolders.h>
#include <ShlObj.h> #include <ShlObj.h>
#include <Windows.h> #include <Windows.h>
#ifdef _MSC_VER
#pragma warning(pop)
#else
#pragma GCC diagnostic pop
#endif
#define LIB_NAME "NVVideoEffects.dll" #define LIB_NAME "NVVideoEffects.dll"
#else #else

10
source/obs/gs/gs-effect-parameter.cpp
View File

@ -25,11 +25,19 @@
extern "C" { extern "C" {
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(push) #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 #endif
#include <graphics/effect.h> #include <graphics/effect.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#else
#pragma GCC diagnostic pop
#endif #endif
} }

10
source/obs/gs/gs-effect-pass.cpp
View File

@ -23,11 +23,19 @@
extern "C" { extern "C" {
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(push) #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 #endif
#include <graphics/effect.h> #include <graphics/effect.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#else
#pragma GCC diagnostic pop
#endif #endif
} }

10
source/obs/gs/gs-effect-technique.cpp
View File

@ -24,11 +24,19 @@
extern "C" { extern "C" {
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(push) #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 #endif
#include <graphics/effect.h> #include <graphics/effect.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#else
#pragma GCC diagnostic pop
#endif #endif
} }

10
source/sources/source-mirror.cpp
View File

@ -48,11 +48,19 @@
// OBS // OBS
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(push) #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 #endif
#include <media-io/audio-io.h> #include <media-io/audio-io.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#else
#pragma GCC diagnostic pop
#endif #endif
#define ST_I18N "Source.Mirror" #define ST_I18N "Source.Mirror"

10
source/ui/ui-about-entry.hpp
View File

@ -18,18 +18,24 @@
*/ */
#pragma once #pragma once
#include "ui-common.hpp"
#include <chrono> #include <chrono>
#include "ui-about.hpp" #include "ui-about.hpp"
#include "ui-common.hpp"
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(push) #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 #endif
#include <QMouseEvent> #include <QMouseEvent>
#include "ui_about-entry.h" #include "ui_about-entry.h"
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#else
#pragma GCC diagnostic pop
#endif #endif
namespace streamfx::ui { namespace streamfx::ui {

18
source/ui/ui-about.cpp
View File

@ -18,26 +18,32 @@
*/ */
#include "ui-about.hpp" #include "ui-about.hpp"
#include "ui-common.hpp"
#include <algorithm> #include <algorithm>
#include <deque> #include <deque>
#include <fstream> #include <fstream>
#include <map> #include <map>
#include <random> #include <random>
#include <obs-frontend-api.h>
#include <nlohmann/json.hpp>
#include "plugin.hpp" #include "plugin.hpp"
#include "ui-about-entry.hpp" #include "ui-about-entry.hpp"
#include "util/util-logging.hpp" #include "util/util-logging.hpp"
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(push) #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 #endif
#include <QLayout> #include <nlohmann/json.hpp>
#include <QLayoutItem>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#else
#pragma GCC diagnostic pop
#endif #endif
#ifdef _DEBUG #ifdef _DEBUG

7
source/ui/ui-about.hpp
View File

@ -23,11 +23,16 @@
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(push) #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 #endif
#include "ui_about.h" #include "ui_about.h"
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#else
#pragma GCC diagnostic pop
#endif #endif
namespace streamfx::ui { namespace streamfx::ui {

35
source/ui/ui-common.hpp
View File

@ -18,15 +18,20 @@
*/ */
#pragma once #pragma once
#include "common.hpp"
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(push) #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 #endif
#include <QAction> #include <QAction>
#include <QDesktopServices> #include <QDesktopServices>
#include <QDialog> #include <QDialog>
#include <QLayout>
#include <QLayoutItem>
#include <QMainWindow> #include <QMainWindow>
#include <QMenu> #include <QMenu>
#include <QMenuBar> #include <QMenuBar>
@ -35,11 +40,27 @@
#include <QTranslator> #include <QTranslator>
#include <QUrl> #include <QUrl>
#include <QWidget> #include <QWidget>
extern "C" {
#include <obs-frontend-api.h>
}
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#else
#pragma GCC diagnostic pop
#endif #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
}

8
source/ui/ui-updater.hpp
View File

@ -24,9 +24,11 @@
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(push) #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 #endif
#include <QAction> #include <QAction>
#include <QActionGroup> #include <QActionGroup>
#include <QBoxLayout> #include <QBoxLayout>
@ -41,6 +43,8 @@ Q_DECLARE_METATYPE(::streamfx::version_stage);
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#else
#pragma GCC diagnostic pop
#endif #endif
namespace streamfx::ui { namespace streamfx::ui {

4
source/ui/ui.cpp
View File

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

2
source/ui/ui.hpp
View File

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

19
source/updater.hpp
View File

@ -22,11 +22,28 @@
#include <atomic> #include <atomic>
#include <chrono> #include <chrono>
#include <map> #include <map>
#include <nlohmann/json.hpp>
#include "util/util-curl.hpp" #include "util/util-curl.hpp"
#include "util/util-event.hpp" #include "util/util-event.hpp"
#include "util/util-threadpool.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 { namespace streamfx {
enum class version_stage : uint8_t { enum class version_stage : uint8_t {
STABLE, // A.B.C STABLE, // A.B.C

15
source/util/util-curl.hpp
View File

@ -30,7 +30,22 @@ extern "C" {
#ifndef NOMINMAX #ifndef NOMINMAX
#define NOMINMAX #define NOMINMAX
#endif #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> #include <curl/curl.h>
#ifdef _MSC_VER
#pragma warning(pop)
#else
#pragma GCC diagnostic pop
#endif
} }
namespace streamfx::util { namespace streamfx::util {

12
source/util/utility.cpp
View File

@ -18,22 +18,12 @@
*/ */
#include "utility.hpp" #include "utility.hpp"
#include "common.hpp"
#include <sstream> #include <sstream>
#include <stdexcept> #include <stdexcept>
#include <unordered_map> #include <unordered_map>
#include "plugin.hpp" #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* 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); obs_property_t* p = obs_properties_add_list(props, name, desc, OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);

10
source/util/utility.hpp
View File

@ -27,7 +27,13 @@
extern "C" { extern "C" {
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(push) #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 #endif
#include <obs.h> #include <obs.h>
#include <graphics/vec2.h> #include <graphics/vec2.h>
@ -35,6 +41,8 @@ extern "C" {
#include <graphics/vec4.h> #include <graphics/vec4.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#else
#pragma GCC diagnostic pop
#endif #endif
} }

11
templates/module.cpp.in
View File

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