From ee0a69bbf012ea7c9e4037dbd6f94236d3379b17 Mon Sep 17 00:00:00 2001 From: Michael Fabian 'Xaymar' Dirks Date: Sun, 14 Jun 2020 04:53:15 +0200 Subject: [PATCH] project: Adjust object Ids and add proxies for compatibility --- source/filters/filter-blur.cpp | 3 ++- source/filters/filter-color-grade.cpp | 3 ++- source/filters/filter-displacement.cpp | 3 ++- source/filters/filter-dynamic-mask.cpp | 3 ++- source/filters/filter-nv-face-tracking.cpp | 3 ++- source/filters/filter-sdf-effects.cpp | 3 ++- source/filters/filter-shader.cpp | 3 ++- source/filters/filter-transform.cpp | 3 ++- source/sources/source-mirror.cpp | 3 ++- source/sources/source-shader.cpp | 3 ++- source/transitions/transition-shader.cpp | 3 ++- 11 files changed, 22 insertions(+), 11 deletions(-) diff --git a/source/filters/filter-blur.cpp b/source/filters/filter-blur.cpp index ae1f8850..f55f476b 100644 --- a/source/filters/filter-blur.cpp +++ b/source/filters/filter-blur.cpp @@ -561,12 +561,13 @@ void blur_instance::video_render(gs_effect_t* effect) blur_factory::blur_factory() { - _info.id = "obs-stream-effects-filter-blur"; + _info.id = PREFIX "filter-blur"; _info.type = OBS_SOURCE_TYPE_FILTER; _info.output_flags = OBS_SOURCE_VIDEO; set_resolution_enabled(false); finish_setup(); + register_proxy("obs-stream-effects-filter-blur"); } blur_factory::~blur_factory() {} diff --git a/source/filters/filter-color-grade.cpp b/source/filters/filter-color-grade.cpp index 74f5d095..309048a6 100644 --- a/source/filters/filter-color-grade.cpp +++ b/source/filters/filter-color-grade.cpp @@ -274,12 +274,13 @@ void color_grade_instance::video_render(gs_effect_t* effect) color_grade_factory::color_grade_factory() { - _info.id = "obs-stream-effects-filter-color-grade"; + _info.id = PREFIX "filter-color-grade"; _info.type = OBS_SOURCE_TYPE_FILTER; _info.output_flags = OBS_SOURCE_VIDEO; set_resolution_enabled(false); finish_setup(); + register_proxy("obs-stream-effects-filter-color-grade"); } color_grade_factory::~color_grade_factory() {} diff --git a/source/filters/filter-displacement.cpp b/source/filters/filter-displacement.cpp index 34a857a0..681e5ce9 100644 --- a/source/filters/filter-displacement.cpp +++ b/source/filters/filter-displacement.cpp @@ -123,12 +123,13 @@ std::string displacement_instance::get_file() displacement_factory::displacement_factory() { - _info.id = "obs-stream-effects-filter-displacement"; + _info.id = PREFIX "filter-displacement"; _info.type = OBS_SOURCE_TYPE_FILTER; _info.output_flags = OBS_SOURCE_VIDEO; set_resolution_enabled(false); finish_setup(); + register_proxy("obs-stream-effects-filter-displacement"); } displacement_factory::~displacement_factory() {} diff --git a/source/filters/filter-dynamic-mask.cpp b/source/filters/filter-dynamic-mask.cpp index 8aab3a99..9c14a42e 100644 --- a/source/filters/filter-dynamic-mask.cpp +++ b/source/filters/filter-dynamic-mask.cpp @@ -346,12 +346,13 @@ void dynamic_mask_instance::video_render(gs_effect_t* in_effect) dynamic_mask_factory::dynamic_mask_factory() { - _info.id = "obs-stream-effects-filter-dynamic-mask"; + _info.id = PREFIX "filter-dynamic-mask"; _info.type = OBS_SOURCE_TYPE_FILTER; _info.output_flags = OBS_SOURCE_VIDEO; set_resolution_enabled(false); finish_setup(); + register_proxy("obs-stream-effects-filter-dynamic-mask"); } dynamic_mask_factory::~dynamic_mask_factory() {} diff --git a/source/filters/filter-nv-face-tracking.cpp b/source/filters/filter-nv-face-tracking.cpp index d9b6da80..6f1d2db9 100644 --- a/source/filters/filter-nv-face-tracking.cpp +++ b/source/filters/filter-nv-face-tracking.cpp @@ -626,12 +626,13 @@ face_tracking_factory::face_tracking_factory() } // Info - _info.id = "streamfx-nvidia-face-tracking"; + _info.id = PREFIX "filter-nvidia-face-tracking"; _info.type = OBS_SOURCE_TYPE_FILTER; _info.output_flags = OBS_SOURCE_VIDEO; set_resolution_enabled(false); finish_setup(); + register_proxy("streamfx-nvidia-face-tracking"); } face_tracking_factory::~face_tracking_factory() {} diff --git a/source/filters/filter-sdf-effects.cpp b/source/filters/filter-sdf-effects.cpp index 11b785be..f8c0ce3f 100644 --- a/source/filters/filter-sdf-effects.cpp +++ b/source/filters/filter-sdf-effects.cpp @@ -520,12 +520,13 @@ void sdf_effects_instance::video_render(gs_effect_t* effect) sdf_effects_factory::sdf_effects_factory() { - _info.id = "obs-stream-effects-filter-sdf-effects"; + _info.id = PREFIX "filter-sdf-effects"; _info.type = OBS_SOURCE_TYPE_FILTER; _info.output_flags = OBS_SOURCE_VIDEO; set_resolution_enabled(false); finish_setup(); + register_proxy("obs-stream-effects-filter-sdf-effects"); } sdf_effects_factory::~sdf_effects_factory() {} diff --git a/source/filters/filter-shader.cpp b/source/filters/filter-shader.cpp index 5c0aa309..1a0296b3 100644 --- a/source/filters/filter-shader.cpp +++ b/source/filters/filter-shader.cpp @@ -136,11 +136,12 @@ void shader_instance::video_render(gs_effect_t* effect) shader_factory::shader_factory() { - _info.id = "obs-stream-effects-filter-shader"; + _info.id = PREFIX "filter-shader"; _info.type = OBS_SOURCE_TYPE_FILTER; _info.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_CUSTOM_DRAW; finish_setup(); + register_proxy("obs-stream-effects-filter-shader"); } shader_factory::~shader_factory() {} diff --git a/source/filters/filter-transform.cpp b/source/filters/filter-transform.cpp index 16d32e39..dd0e185c 100644 --- a/source/filters/filter-transform.cpp +++ b/source/filters/filter-transform.cpp @@ -439,12 +439,13 @@ void transform_instance::video_render(gs_effect_t* effect) transform_factory::transform_factory() { - _info.id = "obs-stream-effects-filter-transform"; + _info.id = PREFIX "filter-transform"; _info.type = OBS_SOURCE_TYPE_FILTER; _info.output_flags = OBS_SOURCE_VIDEO; set_resolution_enabled(false); finish_setup(); + register_proxy("obs-stream-effects-filter-transform"); } transform_factory::~transform_factory() {} diff --git a/source/sources/source-mirror.cpp b/source/sources/source-mirror.cpp index c5e6f105..c451b4bf 100644 --- a/source/sources/source-mirror.cpp +++ b/source/sources/source-mirror.cpp @@ -268,13 +268,14 @@ void mirror_instance::audio_output(std::shared_ptr data) mirror_factory::mirror_factory() { - _info.id = "obs-stream-effects-source-mirror"; + _info.id = PREFIX "source-mirror"; _info.type = OBS_SOURCE_TYPE_INPUT; _info.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_CUSTOM_DRAW | OBS_SOURCE_AUDIO; set_have_active_child_sources(true); set_have_child_sources(true); finish_setup(); + register_proxy("obs-stream-effects-source-mirror"); } mirror_factory::~mirror_factory() {} diff --git a/source/sources/source-shader.cpp b/source/sources/source-shader.cpp index 5dbb377f..e6fbe574 100644 --- a/source/sources/source-shader.cpp +++ b/source/sources/source-shader.cpp @@ -90,11 +90,12 @@ void shader_instance::video_render(gs_effect_t* effect) shader_factory::shader_factory() { - _info.id = "obs-stream-effects-source-shader"; + _info.id = PREFIX "source-shader"; _info.type = OBS_SOURCE_TYPE_INPUT; _info.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_CUSTOM_DRAW; finish_setup(); + register_proxy("obs-stream-effects-source-shader"); } shader_factory::~shader_factory() {} diff --git a/source/transitions/transition-shader.cpp b/source/transitions/transition-shader.cpp index 801042c5..14385849 100644 --- a/source/transitions/transition-shader.cpp +++ b/source/transitions/transition-shader.cpp @@ -116,11 +116,12 @@ void shader_instance::transition_stop() {} shader_factory::shader_factory() { - _info.id = "obs-stream-effects-transition-shader"; + _info.id = PREFIX "transition-shader"; _info.type = OBS_SOURCE_TYPE_TRANSITION; _info.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_CUSTOM_DRAW; finish_setup(); + register_proxy("obs-stream-effects-transition-shader"); } shader_factory::~shader_factory() {}