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

plugin: Fix problematic 'using namespace' code

This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2020-07-25 16:54:04 +02:00
parent f98319dee7
commit 2a7187a3c4
1 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
source/plugin.cpp
View File

@ -114,49 +114,46 @@ try {
// Filters // Filters
{ {
using namespace streamfx::filter;
#ifdef ENABLE_FILTER_BLUR #ifdef ENABLE_FILTER_BLUR
blur::blur_factory::initialize(); streamfx::filter::blur::blur_factory::initialize();
#endif #endif
#ifdef ENABLE_FILTER_COLOR_GRADE #ifdef ENABLE_FILTER_COLOR_GRADE
color_grade::color_grade_factory::initialize(); streamfx::filter::color_grade::color_grade_factory::initialize();
#endif #endif
#ifdef ENABLE_FILTER_DISPLACEMENT #ifdef ENABLE_FILTER_DISPLACEMENT
displacement::displacement_factory::initialize(); streamfx::filter::displacement::displacement_factory::initialize();
#endif #endif
#ifdef ENABLE_FILTER_DYNAMIC_MASK #ifdef ENABLE_FILTER_DYNAMIC_MASK
dynamic_mask::dynamic_mask_factory::initialize(); streamfx::filter::dynamic_mask::dynamic_mask_factory::initialize();
#endif #endif
#ifdef ENABLE_FILTER_NVIDIA_FACE_TRACKING #ifdef ENABLE_FILTER_NVIDIA_FACE_TRACKING
streamfx::filter::nvidia::face_tracking_factory::initialize(); streamfx::filter::nvidia::face_tracking_factory::initialize();
#endif #endif
#ifdef ENABLE_FILTER_SDF_EFFECTS #ifdef ENABLE_FILTER_SDF_EFFECTS
sdf_effects::sdf_effects_factory::initialize(); streamfx::filter::sdf_effects::sdf_effects_factory::initialize();
#endif #endif
#ifdef ENABLE_FILTER_SHADER #ifdef ENABLE_FILTER_SHADER
shader::shader_factory::initialize(); streamfx::filter::shader::shader_factory::initialize();
#endif #endif
#ifdef ENABLE_FILTER_TRANSFORM #ifdef ENABLE_FILTER_TRANSFORM
transform::transform_factory::initialize(); streamfx::filter::transform::transform_factory::initialize();
#endif #endif
} }
// Sources // Sources
{ {
using namespace streamfx::source;
#ifdef ENABLE_SOURCE_MIRROR #ifdef ENABLE_SOURCE_MIRROR
mirror::mirror_factory::initialize(); streamfx::source::mirror::mirror_factory::initialize();
#endif #endif
#ifdef ENABLE_SOURCE_SHADER #ifdef ENABLE_SOURCE_SHADER
shader::shader_factory::initialize(); streamfx::source::shader::shader_factory::initialize();
#endif #endif
} }
// Transitions // Transitions
{ {
using namespace streamfx::transition;
#ifdef ENABLE_TRANSITION_SHADER #ifdef ENABLE_TRANSITION_SHADER
shader::shader_factory::initialize(); streamfx::transition::shader::shader_factory::initialize();
#endif #endif
} }
@ -183,57 +180,53 @@ try {
// Transitions // Transitions
{ {
using namespace streamfx::transition;
#ifdef ENABLE_TRANSITION_SHADER #ifdef ENABLE_TRANSITION_SHADER
shader::shader_factory::finalize(); streamfx::transition::shader::shader_factory::finalize();
#endif #endif
} }
// Sources // Sources
{ {
using namespace streamfx::source;
#ifdef ENABLE_SOURCE_MIRROR #ifdef ENABLE_SOURCE_MIRROR
mirror::mirror_factory::finalize(); streamfx::source::mirror::mirror_factory::finalize();
#endif #endif
#ifdef ENABLE_SOURCE_SHADER #ifdef ENABLE_SOURCE_SHADER
shader::shader_factory::finalize(); streamfx::source::shader::shader_factory::finalize();
#endif #endif
} }
// Filters // Filters
{ {
using namespace streamfx::filter;
#ifdef ENABLE_FILTER_BLUR #ifdef ENABLE_FILTER_BLUR
blur::blur_factory::finalize(); streamfx::filter::blur::blur_factory::finalize();
#endif #endif
#ifdef ENABLE_FILTER_COLOR_GRADE #ifdef ENABLE_FILTER_COLOR_GRADE
color_grade::color_grade_factory::finalize(); streamfx::filter::color_grade::color_grade_factory::finalize();
#endif #endif
#ifdef ENABLE_FILTER_DISPLACEMENT #ifdef ENABLE_FILTER_DISPLACEMENT
displacement::displacement_factory::finalize(); streamfx::filter::displacement::displacement_factory::finalize();
#endif #endif
#ifdef ENABLE_FILTER_DYNAMIC_MASK #ifdef ENABLE_FILTER_DYNAMIC_MASK
dynamic_mask::dynamic_mask_factory::finalize(); streamfx::filter::dynamic_mask::dynamic_mask_factory::finalize();
#endif #endif
#ifdef ENABLE_FILTER_NVIDIA_FACE_TRACKING #ifdef ENABLE_FILTER_NVIDIA_FACE_TRACKING
streamfx::filter::nvidia::face_tracking_factory::finalize(); streamfx::filter::nvidia::face_tracking_factory::finalize();
#endif #endif
#ifdef ENABLE_FILTER_SDF_EFFECTS #ifdef ENABLE_FILTER_SDF_EFFECTS
sdf_effects::sdf_effects_factory::finalize(); streamfx::filter::sdf_effects::sdf_effects_factory::finalize();
#endif #endif
#ifdef ENABLE_FILTER_SHADER #ifdef ENABLE_FILTER_SHADER
shader::shader_factory::finalize(); streamfx::filter::shader::shader_factory::finalize();
#endif #endif
#ifdef ENABLE_FILTER_TRANSFORM #ifdef ENABLE_FILTER_TRANSFORM
transform::transform_factory::finalize(); streamfx::filter::transform::transform_factory::finalize();
#endif #endif
} }
// Encoders // Encoders
{ {
#ifdef ENABLE_ENCODER_FFMPEG #ifdef ENABLE_ENCODER_FFMPEG
using namespace streamfx::encoder::ffmpeg; streamfx::encoder::ffmpeg::ffmpeg_manager::finalize();
ffmpeg_manager::finalize();
#endif #endif
} }