From 1c067b3b5da647e94a9aeb1c10604723a3e915a0 Mon Sep 17 00:00:00 2001 From: Michael Fabian 'Xaymar' Dirks Date: Tue, 8 Jun 2021 04:16:33 +0200 Subject: [PATCH] project: Apply coding guidelines --- source/common.hpp | 2 +- source/encoders/encoder-ffmpeg.cpp | 2 +- source/filters/filter-blur.cpp | 2 +- source/filters/filter-color-grade.cpp | 2 +- source/filters/filter-displacement.cpp | 2 +- source/filters/filter-dynamic-mask.cpp | 2 +- source/filters/filter-nv-face-tracking.cpp | 2 +- source/filters/filter-sdf-effects.cpp | 2 +- source/filters/filter-shader.cpp | 2 +- source/filters/filter-transform.cpp | 2 +- source/sources/source-mirror.cpp | 2 +- source/sources/source-shader.cpp | 2 +- source/strings.hpp | 4 ++-- source/transitions/transition-shader.cpp | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/source/common.hpp b/source/common.hpp index ca74e13d..2ab5ec6a 100644 --- a/source/common.hpp +++ b/source/common.hpp @@ -90,7 +90,7 @@ extern "C" { // Common Global defines /// Logging -#define DLOG_(level, ...) blog(level, "[" PLUGIN_NAME "] " __VA_ARGS__) +#define DLOG_(level, ...) blog(level, "[" S_PLUGIN_NAME "] " __VA_ARGS__) #define DLOG_ERROR(...) DLOG_(LOG_ERROR, __VA_ARGS__) #define DLOG_WARNING(...) DLOG_(LOG_WARNING, __VA_ARGS__) #define DLOG_INFO(...) DLOG_(LOG_INFO, __VA_ARGS__) diff --git a/source/encoders/encoder-ffmpeg.cpp b/source/encoders/encoder-ffmpeg.cpp index 5fb5cdc3..2597dfe9 100644 --- a/source/encoders/encoder-ffmpeg.cpp +++ b/source/encoders/encoder-ffmpeg.cpp @@ -911,7 +911,7 @@ ffmpeg_factory::ffmpeg_factory(const AVCodec* codec) : _avcodec(codec) // Generate default identifier. { std::stringstream str; - str << PREFIX << _avcodec->name; + str << S_PREFIX << _avcodec->name; _id = str.str(); } diff --git a/source/filters/filter-blur.cpp b/source/filters/filter-blur.cpp index 0fa3bb45..8ee454d5 100644 --- a/source/filters/filter-blur.cpp +++ b/source/filters/filter-blur.cpp @@ -560,7 +560,7 @@ void blur_instance::video_render(gs_effect_t* effect) blur_factory::blur_factory() { - _info.id = PREFIX "filter-blur"; + _info.id = S_PREFIX "filter-blur"; _info.type = OBS_SOURCE_TYPE_FILTER; _info.output_flags = OBS_SOURCE_VIDEO; diff --git a/source/filters/filter-color-grade.cpp b/source/filters/filter-color-grade.cpp index 92535e76..817cc3c2 100644 --- a/source/filters/filter-color-grade.cpp +++ b/source/filters/filter-color-grade.cpp @@ -565,7 +565,7 @@ void color_grade_instance::video_render(gs_effect_t* shader) color_grade_factory::color_grade_factory() { - _info.id = PREFIX "filter-color-grade"; + _info.id = S_PREFIX "filter-color-grade"; _info.type = OBS_SOURCE_TYPE_FILTER; _info.output_flags = OBS_SOURCE_VIDEO; diff --git a/source/filters/filter-displacement.cpp b/source/filters/filter-displacement.cpp index 51fd93cb..cbd4daeb 100644 --- a/source/filters/filter-displacement.cpp +++ b/source/filters/filter-displacement.cpp @@ -116,7 +116,7 @@ std::string displacement_instance::get_file() displacement_factory::displacement_factory() { - _info.id = PREFIX "filter-displacement"; + _info.id = S_PREFIX "filter-displacement"; _info.type = OBS_SOURCE_TYPE_FILTER; _info.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_CUSTOM_DRAW | OBS_SOURCE_DEPRECATED | OBS_SOURCE_CAP_DISABLED; diff --git a/source/filters/filter-dynamic-mask.cpp b/source/filters/filter-dynamic-mask.cpp index 5ea6f1e7..9135fbf2 100644 --- a/source/filters/filter-dynamic-mask.cpp +++ b/source/filters/filter-dynamic-mask.cpp @@ -393,7 +393,7 @@ void streamfx::filter::dynamic_mask::dynamic_mask_instance::deactivate() dynamic_mask_factory::dynamic_mask_factory() { - _info.id = PREFIX "filter-dynamic-mask"; + _info.id = S_PREFIX "filter-dynamic-mask"; _info.type = OBS_SOURCE_TYPE_FILTER; _info.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_CUSTOM_DRAW; diff --git a/source/filters/filter-nv-face-tracking.cpp b/source/filters/filter-nv-face-tracking.cpp index 923b3c02..dbf12351 100644 --- a/source/filters/filter-nv-face-tracking.cpp +++ b/source/filters/filter-nv-face-tracking.cpp @@ -620,7 +620,7 @@ face_tracking_factory::face_tracking_factory() _ar = std::make_shared<::nvidia::ar::ar>(); // Info - _info.id = PREFIX "filter-nvidia-face-tracking"; + _info.id = S_PREFIX "filter-nvidia-face-tracking"; _info.type = OBS_SOURCE_TYPE_FILTER; _info.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_CUSTOM_DRAW; diff --git a/source/filters/filter-sdf-effects.cpp b/source/filters/filter-sdf-effects.cpp index 51392b78..63553b72 100644 --- a/source/filters/filter-sdf-effects.cpp +++ b/source/filters/filter-sdf-effects.cpp @@ -517,7 +517,7 @@ void sdf_effects_instance::video_render(gs_effect_t* effect) sdf_effects_factory::sdf_effects_factory() { - _info.id = PREFIX "filter-sdf-effects"; + _info.id = S_PREFIX "filter-sdf-effects"; _info.type = OBS_SOURCE_TYPE_FILTER; _info.output_flags = OBS_SOURCE_VIDEO; diff --git a/source/filters/filter-shader.cpp b/source/filters/filter-shader.cpp index 10dbe1e9..de06d8f2 100644 --- a/source/filters/filter-shader.cpp +++ b/source/filters/filter-shader.cpp @@ -149,7 +149,7 @@ void streamfx::filter::shader::shader_instance::deactivate() shader_factory::shader_factory() { - _info.id = PREFIX "filter-shader"; + _info.id = S_PREFIX "filter-shader"; _info.type = OBS_SOURCE_TYPE_FILTER; _info.output_flags = OBS_SOURCE_VIDEO; diff --git a/source/filters/filter-transform.cpp b/source/filters/filter-transform.cpp index ac2578eb..15e0b6bd 100644 --- a/source/filters/filter-transform.cpp +++ b/source/filters/filter-transform.cpp @@ -441,7 +441,7 @@ void transform_instance::video_render(gs_effect_t* effect) transform_factory::transform_factory() { - _info.id = PREFIX "filter-transform"; + _info.id = S_PREFIX "filter-transform"; _info.type = OBS_SOURCE_TYPE_FILTER; _info.output_flags = OBS_SOURCE_VIDEO; diff --git a/source/sources/source-mirror.cpp b/source/sources/source-mirror.cpp index 84f8bc33..21fb3680 100644 --- a/source/sources/source-mirror.cpp +++ b/source/sources/source-mirror.cpp @@ -274,7 +274,7 @@ void mirror_instance::audio_output(std::shared_ptr data) mirror_factory::mirror_factory() { - _info.id = PREFIX "source-mirror"; + _info.id = S_PREFIX "source-mirror"; _info.type = OBS_SOURCE_TYPE_INPUT; _info.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_CUSTOM_DRAW | OBS_SOURCE_AUDIO; diff --git a/source/sources/source-shader.cpp b/source/sources/source-shader.cpp index 4f1755d7..a520ec84 100644 --- a/source/sources/source-shader.cpp +++ b/source/sources/source-shader.cpp @@ -102,7 +102,7 @@ void streamfx::source::shader::shader_instance::deactivate() shader_factory::shader_factory() { - _info.id = PREFIX "source-shader"; + _info.id = S_PREFIX "source-shader"; _info.type = OBS_SOURCE_TYPE_INPUT; _info.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_CUSTOM_DRAW; diff --git a/source/strings.hpp b/source/strings.hpp index b4c72196..c318b9be 100644 --- a/source/strings.hpp +++ b/source/strings.hpp @@ -20,8 +20,8 @@ #pragma once #include "common.hpp" -#define PLUGIN_NAME "StreamFX" -#define PREFIX "streamfx-" +#define S_PLUGIN_NAME "StreamFX" +#define S_PREFIX "streamfx-" #define D_TRANSLATE(x) obs_module_text(x) diff --git a/source/transitions/transition-shader.cpp b/source/transitions/transition-shader.cpp index 9be3f3c2..819f3af4 100644 --- a/source/transitions/transition-shader.cpp +++ b/source/transitions/transition-shader.cpp @@ -123,7 +123,7 @@ void shader_instance::transition_stop() shader_factory::shader_factory() { - _info.id = PREFIX "transition-shader"; + _info.id = S_PREFIX "transition-shader"; _info.type = OBS_SOURCE_TYPE_TRANSITION; _info.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_CUSTOM_DRAW;