From 915c85e60e4b09bd48122175176d0bf8e747b334 Mon Sep 17 00:00:00 2001 From: Michael Fabian 'Xaymar' Dirks Date: Sat, 30 Sep 2023 06:51:56 +0200 Subject: [PATCH] core: Frontend and Updater are default features --- CMakeLists.txt | 6 ----- .../source/filters/filter-autoframing.cpp | 4 ---- .../source/filters/filter-autoframing.hpp | 2 -- components/blur/source/filter/filter-blur.cpp | 4 ---- components/blur/source/filter/filter-blur.hpp | 2 -- .../source/filters/filter-color-grade.cpp | 4 ---- .../source/filters/filter-color-grade.hpp | 2 -- .../source/filters/filter-denoising.cpp | 4 ---- .../source/filters/filter-denoising.hpp | 2 -- .../source/filters/filter-dynamic-mask.cpp | 4 ---- .../source/filters/filter-dynamic-mask.hpp | 2 -- .../ffmpeg/source/encoders/encoder-ffmpeg.cpp | 4 ---- .../ffmpeg/source/encoders/encoder-ffmpeg.hpp | 2 -- .../mirror/source/sources/source-mirror.cpp | 4 ---- .../mirror/source/sources/source-mirror.hpp | 2 -- .../source/filters/filter-sdf-effects.cpp | 4 ---- .../source/filters/filter-sdf-effects.hpp | 2 -- .../shader/source/filters/filter-shader.cpp | 4 ---- .../shader/source/filters/filter-shader.hpp | 2 -- .../shader/source/sources/source-shader.cpp | 4 ---- .../shader/source/sources/source-shader.hpp | 2 -- .../source/transitions/transition-shader.cpp | 4 ---- .../source/transitions/transition-shader.hpp | 2 -- .../source/filter/filter-transform.cpp | 4 ---- .../source/filter/filter-transform.hpp | 2 -- .../source/filters/filter-upscaling.cpp | 4 ---- .../source/filters/filter-upscaling.hpp | 2 -- .../filters/filter-virtual-greenscreen.cpp | 4 ---- .../filters/filter-virtual-greenscreen.hpp | 2 -- source/plugin.cpp | 23 +------------------ source/plugin.hpp | 2 -- source/ui/ui.cpp | 13 ++--------- source/ui/ui.hpp | 5 ---- 33 files changed, 3 insertions(+), 130 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0778b0cb..a882285f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -643,9 +643,6 @@ list(APPEND PROJECT_PRIVATE_SOURCE "source/updater.hpp" "source/updater.cpp" ) -list(APPEND PROJECT_DEFINITIONS - ENABLE_UPDATER -) # Frontend list(APPEND PROJECT_UI @@ -667,9 +664,6 @@ list(APPEND PROJECT_UI_SOURCE list(APPEND PROJECT_INCLUDE_DIRS "source/ui" ) -list(APPEND PROJECT_DEFINITIONS - ENABLE_FRONTEND -) list(APPEND PROJECT_UI_SOURCE "source/ui/ui-updater.hpp" diff --git a/components/autoframing/source/filters/filter-autoframing.cpp b/components/autoframing/source/filters/filter-autoframing.cpp index e42245ed..bb2accc9 100644 --- a/components/autoframing/source/filters/filter-autoframing.cpp +++ b/components/autoframing/source/filters/filter-autoframing.cpp @@ -1097,11 +1097,9 @@ obs_properties_t* autoframing_factory::get_properties2(autoframing_instance* dat { obs_properties_t* pr = obs_properties_create(); -#ifdef ENABLE_FRONTEND { obs_properties_add_button2(pr, S_MANUAL_OPEN, D_TRANSLATE(S_MANUAL_OPEN), autoframing_factory::on_manual_open, nullptr); } -#endif { auto grp = obs_properties_create(); @@ -1224,13 +1222,11 @@ obs_properties_t* autoframing_factory::get_properties2(autoframing_instance* dat return pr; } -#ifdef ENABLE_FRONTEND bool streamfx::filter::autoframing::autoframing_factory::on_manual_open(obs_properties_t* props, obs_property_t* property, void* data) { streamfx::open_url(HELP_URL); return false; } -#endif bool streamfx::filter::autoframing::autoframing_factory::is_provider_available(tracking_provider provider) { diff --git a/components/autoframing/source/filters/filter-autoframing.hpp b/components/autoframing/source/filters/filter-autoframing.hpp index 68cf16aa..b0246265 100644 --- a/components/autoframing/source/filters/filter-autoframing.hpp +++ b/components/autoframing/source/filters/filter-autoframing.hpp @@ -161,9 +161,7 @@ namespace streamfx::filter::autoframing { void get_defaults2(obs_data_t* data) override; obs_properties_t* get_properties2(autoframing_instance* data) override; -#ifdef ENABLE_FRONTEND static bool on_manual_open(obs_properties_t* props, obs_property_t* property, void* data); -#endif bool is_provider_available(tracking_provider); tracking_provider find_ideal_provider(); diff --git a/components/blur/source/filter/filter-blur.cpp b/components/blur/source/filter/filter-blur.cpp index 9067973b..04e19cd6 100644 --- a/components/blur/source/filter/filter-blur.cpp +++ b/components/blur/source/filter/filter-blur.cpp @@ -745,11 +745,9 @@ obs_properties_t* blur_factory::get_properties2(blur_instance* data) obs_properties_t* pr = obs_properties_create(); obs_property_t* p = NULL; -#ifdef ENABLE_FRONTEND { obs_properties_add_button2(pr, S_MANUAL_OPEN, D_TRANSLATE(S_MANUAL_OPEN), streamfx::filter::blur::blur_factory::on_manual_open, nullptr); } -#endif // Blur Type and Sub-Type { @@ -840,7 +838,6 @@ std::string blur_factory::translate_string(const char* format, ...) return std::string(buffer.data(), buffer.data() + len); } -#ifdef ENABLE_FRONTEND bool blur_factory::on_manual_open(obs_properties_t* props, obs_property_t* property, void* data) { try { @@ -854,7 +851,6 @@ bool blur_factory::on_manual_open(obs_properties_t* props, obs_property_t* prope return false; } } -#endif std::shared_ptr blur_factory::instance() { diff --git a/components/blur/source/filter/filter-blur.hpp b/components/blur/source/filter/filter-blur.hpp index 3066ec87..4477567f 100644 --- a/components/blur/source/filter/filter-blur.hpp +++ b/components/blur/source/filter/filter-blur.hpp @@ -115,9 +115,7 @@ namespace streamfx::filter::blur { std::string translate_string(const char* format, ...); -#ifdef ENABLE_FRONTEND static bool on_manual_open(obs_properties_t* props, obs_property_t* property, void* data); -#endif public: // Singleton static std::shared_ptr instance(); diff --git a/components/color-grade/source/filters/filter-color-grade.cpp b/components/color-grade/source/filters/filter-color-grade.cpp index db78fced..5bf62dcb 100644 --- a/components/color-grade/source/filters/filter-color-grade.cpp +++ b/components/color-grade/source/filters/filter-color-grade.cpp @@ -613,11 +613,9 @@ obs_properties_t* color_grade_factory::get_properties2(color_grade_instance* dat { obs_properties_t* pr = obs_properties_create(); -#ifdef ENABLE_FRONTEND { obs_properties_add_button2(pr, S_MANUAL_OPEN, D_TRANSLATE(S_MANUAL_OPEN), streamfx::filter::color_grade::color_grade_factory::on_manual_open, nullptr); } -#endif { obs_properties_t* grp = obs_properties_create(); @@ -810,7 +808,6 @@ obs_properties_t* color_grade_factory::get_properties2(color_grade_instance* dat return pr; } -#ifdef ENABLE_FRONTEND bool color_grade_factory::on_manual_open(obs_properties_t* props, obs_property_t* property, void* data) { try { @@ -824,7 +821,6 @@ bool color_grade_factory::on_manual_open(obs_properties_t* props, obs_property_t return false; } } -#endif std::shared_ptr streamfx::filter::color_grade::color_grade_factory::instance() { diff --git a/components/color-grade/source/filters/filter-color-grade.hpp b/components/color-grade/source/filters/filter-color-grade.hpp index e9c867d5..dd6bc0bc 100644 --- a/components/color-grade/source/filters/filter-color-grade.hpp +++ b/components/color-grade/source/filters/filter-color-grade.hpp @@ -98,9 +98,7 @@ namespace streamfx::filter::color_grade { virtual obs_properties_t* get_properties2(color_grade_instance* data) override; -#ifdef ENABLE_FRONTEND static bool on_manual_open(obs_properties_t* props, obs_property_t* property, void* data); -#endif public: // Singleton static std::shared_ptr instance(); diff --git a/components/denoising/source/filters/filter-denoising.cpp b/components/denoising/source/filters/filter-denoising.cpp index bdcc6c7e..b211379e 100644 --- a/components/denoising/source/filters/filter-denoising.cpp +++ b/components/denoising/source/filters/filter-denoising.cpp @@ -565,11 +565,9 @@ obs_properties_t* denoising_factory::get_properties2(denoising_instance* data) { obs_properties_t* pr = obs_properties_create(); -#ifdef ENABLE_FRONTEND { obs_properties_add_button2(pr, S_MANUAL_OPEN, D_TRANSLATE(S_MANUAL_OPEN), denoising_factory::on_manual_open, nullptr); } -#endif if (data) { data->properties(pr); @@ -590,13 +588,11 @@ obs_properties_t* denoising_factory::get_properties2(denoising_instance* data) return pr; } -#ifdef ENABLE_FRONTEND bool denoising_factory::on_manual_open(obs_properties_t* props, obs_property_t* property, void* data) { streamfx::open_url(HELP_URL); return false; } -#endif bool streamfx::filter::denoising::denoising_factory::is_provider_available(denoising_provider provider) { diff --git a/components/denoising/source/filters/filter-denoising.hpp b/components/denoising/source/filters/filter-denoising.hpp index 555d40a1..a08a1e7e 100644 --- a/components/denoising/source/filters/filter-denoising.hpp +++ b/components/denoising/source/filters/filter-denoising.hpp @@ -98,9 +98,7 @@ namespace streamfx::filter::denoising { virtual void get_defaults2(obs_data_t* data) override; virtual obs_properties_t* get_properties2(denoising_instance* data) override; -#ifdef ENABLE_FRONTEND static bool on_manual_open(obs_properties_t* props, obs_property_t* property, void* data); -#endif bool is_provider_available(denoising_provider); denoising_provider find_ideal_provider(); diff --git a/components/dynamic-mask/source/filters/filter-dynamic-mask.cpp b/components/dynamic-mask/source/filters/filter-dynamic-mask.cpp index b68cf041..a8ef2044 100644 --- a/components/dynamic-mask/source/filters/filter-dynamic-mask.cpp +++ b/components/dynamic-mask/source/filters/filter-dynamic-mask.cpp @@ -721,11 +721,9 @@ obs_properties_t* dynamic_mask_factory::get_properties2(dynamic_mask_instance* d _translation_cache.clear(); -#ifdef ENABLE_FRONTEND { obs_properties_add_button2(props, S_MANUAL_OPEN, D_TRANSLATE(S_MANUAL_OPEN), streamfx::filter::dynamic_mask::dynamic_mask_factory::on_manual_open, nullptr); } -#endif { // Input p = obs_properties_add_list(props, ST_KEY_INPUT, D_TRANSLATE(ST_I18N_INPUT), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_STRING); @@ -806,7 +804,6 @@ std::string dynamic_mask_factory::translate_string(const char* format, ...) return std::string(buffer.data(), buffer.data() + len); } -#ifdef ENABLE_FRONTEND bool dynamic_mask_factory::on_manual_open(obs_properties_t* props, obs_property_t* property, void* data) { try { @@ -820,7 +817,6 @@ bool dynamic_mask_factory::on_manual_open(obs_properties_t* props, obs_property_ return false; } } -#endif std::shared_ptr dynamic_mask_factory::instance() { diff --git a/components/dynamic-mask/source/filters/filter-dynamic-mask.hpp b/components/dynamic-mask/source/filters/filter-dynamic-mask.hpp index 2982116f..297096ba 100644 --- a/components/dynamic-mask/source/filters/filter-dynamic-mask.hpp +++ b/components/dynamic-mask/source/filters/filter-dynamic-mask.hpp @@ -124,9 +124,7 @@ namespace streamfx::filter::dynamic_mask { std::string translate_string(const char* format, ...); -#ifdef ENABLE_FRONTEND static bool on_manual_open(obs_properties_t* props, obs_property_t* property, void* data); -#endif public: // Singleton static void initialize(); diff --git a/components/ffmpeg/source/encoders/encoder-ffmpeg.cpp b/components/ffmpeg/source/encoders/encoder-ffmpeg.cpp index 0af9c803..9134253a 100644 --- a/components/ffmpeg/source/encoders/encoder-ffmpeg.cpp +++ b/components/ffmpeg/source/encoders/encoder-ffmpeg.cpp @@ -1030,11 +1030,9 @@ obs_properties_t* ffmpeg_factory::get_properties2(instance_t* data) { obs_properties_t* props = obs_properties_create(); -#ifdef ENABLE_FRONTEND { obs_properties_add_button2(props, S_MANUAL_OPEN, D_TRANSLATE(S_MANUAL_OPEN), streamfx::encoder::ffmpeg::ffmpeg_factory::on_manual_open, this); } -#endif if (data) { data->get_properties(props); @@ -1108,14 +1106,12 @@ obs_properties_t* ffmpeg_factory::get_properties2(instance_t* data) return props; } -#ifdef ENABLE_FRONTEND bool ffmpeg_factory::on_manual_open(obs_properties_t* props, obs_property_t* property, void* data) { ffmpeg_factory* ptr = static_cast(data); streamfx::open_url(ptr->_handler->help(ptr)); return false; } -#endif const AVCodec* ffmpeg_factory::get_avcodec() { diff --git a/components/ffmpeg/source/encoders/encoder-ffmpeg.hpp b/components/ffmpeg/source/encoders/encoder-ffmpeg.hpp index d4e4cbcb..dafa76e2 100644 --- a/components/ffmpeg/source/encoders/encoder-ffmpeg.hpp +++ b/components/ffmpeg/source/encoders/encoder-ffmpeg.hpp @@ -129,9 +129,7 @@ namespace streamfx::encoder::ffmpeg { obs_properties_t* get_properties2(instance_t* data) override; -#ifdef ENABLE_FRONTEND static bool on_manual_open(obs_properties_t* props, obs_property_t* property, void* data); -#endif public: const AVCodec* get_avcodec(); diff --git a/components/mirror/source/sources/source-mirror.cpp b/components/mirror/source/sources/source-mirror.cpp index 5bc6a7b2..cb63b5e1 100644 --- a/components/mirror/source/sources/source-mirror.cpp +++ b/components/mirror/source/sources/source-mirror.cpp @@ -316,11 +316,9 @@ obs_properties_t* mirror_factory::get_properties2(mirror_instance* data) obs_properties_t* pr = obs_properties_create(); obs_property_t* p = nullptr; -#ifdef ENABLE_FRONTEND { obs_properties_add_button2(pr, S_MANUAL_OPEN, D_TRANSLATE(S_MANUAL_OPEN), streamfx::source::mirror::mirror_factory::on_manual_open, nullptr); } -#endif { p = obs_properties_add_list(pr, ST_KEY_SOURCE, D_TRANSLATE(ST_I18N_SOURCE), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_STRING); @@ -365,7 +363,6 @@ obs_properties_t* mirror_factory::get_properties2(mirror_instance* data) return pr; } -#ifdef ENABLE_FRONTEND bool mirror_factory::on_manual_open(obs_properties_t* props, obs_property_t* property, void* data) { try { @@ -379,7 +376,6 @@ bool mirror_factory::on_manual_open(obs_properties_t* props, obs_property_t* pro return false; } } -#endif std::shared_ptr mirror_factory::instance() { diff --git a/components/mirror/source/sources/source-mirror.hpp b/components/mirror/source/sources/source-mirror.hpp index 88a06e1f..8d3dd8c6 100644 --- a/components/mirror/source/sources/source-mirror.hpp +++ b/components/mirror/source/sources/source-mirror.hpp @@ -81,9 +81,7 @@ namespace streamfx::source::mirror { virtual obs_properties_t* get_properties2(source::mirror::mirror_instance* data) override; -#ifdef ENABLE_FRONTEND static bool on_manual_open(obs_properties_t* props, obs_property_t* property, void* data); -#endif public: // Singleton static void initialize(); diff --git a/components/sdf-effects/source/filters/filter-sdf-effects.cpp b/components/sdf-effects/source/filters/filter-sdf-effects.cpp index d0fd68d1..bc2d0747 100644 --- a/components/sdf-effects/source/filters/filter-sdf-effects.cpp +++ b/components/sdf-effects/source/filters/filter-sdf-effects.cpp @@ -594,11 +594,9 @@ obs_properties_t* sdf_effects_factory::get_properties2(sdf_effects_instance* dat obs_properties_t* prs = obs_properties_create(); obs_property_t* p = nullptr; -#ifdef ENABLE_FRONTEND { obs_properties_add_button2(prs, S_MANUAL_OPEN, D_TRANSLATE(S_MANUAL_OPEN), streamfx::filter::sdf_effects::sdf_effects_factory::on_manual_open, nullptr); } -#endif { // Shadow Outer auto pr = obs_properties_create(); @@ -669,7 +667,6 @@ obs_properties_t* sdf_effects_factory::get_properties2(sdf_effects_instance* dat return prs; } -#ifdef ENABLE_FRONTEND bool sdf_effects_factory::on_manual_open(obs_properties_t* props, obs_property_t* property, void* data) { try { @@ -683,7 +680,6 @@ bool sdf_effects_factory::on_manual_open(obs_properties_t* props, obs_property_t return false; } } -#endif std::shared_ptr sdf_effects_factory::instance() { diff --git a/components/sdf-effects/source/filters/filter-sdf-effects.hpp b/components/sdf-effects/source/filters/filter-sdf-effects.hpp index 497873c6..3959bdbd 100644 --- a/components/sdf-effects/source/filters/filter-sdf-effects.hpp +++ b/components/sdf-effects/source/filters/filter-sdf-effects.hpp @@ -91,9 +91,7 @@ namespace streamfx::filter::sdf_effects { virtual obs_properties_t* get_properties2(filter::sdf_effects::sdf_effects_instance* data) override; -#ifdef ENABLE_FRONTEND static bool on_manual_open(obs_properties_t* props, obs_property_t* property, void* data); -#endif public: // Singleton static void initialize(); diff --git a/components/shader/source/filters/filter-shader.cpp b/components/shader/source/filters/filter-shader.cpp index 03162896..038bde9f 100644 --- a/components/shader/source/filters/filter-shader.cpp +++ b/components/shader/source/filters/filter-shader.cpp @@ -188,11 +188,9 @@ obs_properties_t* shader_factory::get_properties2(shader::shader_instance* data) auto pr = obs_properties_create(); obs_properties_set_param(pr, data, nullptr); -#ifdef ENABLE_FRONTEND { auto p = obs_properties_add_button2(pr, S_MANUAL_OPEN, D_TRANSLATE(S_MANUAL_OPEN), streamfx::filter::shader::shader_factory::on_manual_open, nullptr); } -#endif if (data) { reinterpret_cast(data)->properties(pr); @@ -201,7 +199,6 @@ obs_properties_t* shader_factory::get_properties2(shader::shader_instance* data) return pr; } -#ifdef ENABLE_FRONTEND bool shader_factory::on_manual_open(obs_properties_t* props, obs_property_t* property, void* data) { try { @@ -215,7 +212,6 @@ bool shader_factory::on_manual_open(obs_properties_t* props, obs_property_t* pro return false; } } -#endif std::shared_ptr shader_factory::instance() { diff --git a/components/shader/source/filters/filter-shader.hpp b/components/shader/source/filters/filter-shader.hpp index 5de3026c..b52af30d 100644 --- a/components/shader/source/filters/filter-shader.hpp +++ b/components/shader/source/filters/filter-shader.hpp @@ -48,9 +48,7 @@ namespace streamfx::filter::shader { virtual obs_properties_t* get_properties2(filter::shader::shader_instance* data) override; -#ifdef ENABLE_FRONTEND static bool on_manual_open(obs_properties_t* props, obs_property_t* property, void* data); -#endif public: // Singleton static void initialize(); diff --git a/components/shader/source/sources/source-shader.cpp b/components/shader/source/sources/source-shader.cpp index 021c6592..04e51807 100644 --- a/components/shader/source/sources/source-shader.cpp +++ b/components/shader/source/sources/source-shader.cpp @@ -142,11 +142,9 @@ obs_properties_t* shader_factory::get_properties2(shader_instance* data) auto pr = obs_properties_create(); obs_properties_set_param(pr, data, nullptr); -#ifdef ENABLE_FRONTEND { obs_properties_add_button2(pr, S_MANUAL_OPEN, D_TRANSLATE(S_MANUAL_OPEN), streamfx::source::shader::shader_factory::on_manual_open, nullptr); } -#endif if (data) { reinterpret_cast(data)->properties(pr); @@ -155,7 +153,6 @@ obs_properties_t* shader_factory::get_properties2(shader_instance* data) return pr; } -#ifdef ENABLE_FRONTEND bool shader_factory::on_manual_open(obs_properties_t* props, obs_property_t* property, void* data) { try { @@ -169,7 +166,6 @@ bool shader_factory::on_manual_open(obs_properties_t* props, obs_property_t* pro return false; } } -#endif std::shared_ptr shader_factory::instance() { diff --git a/components/shader/source/sources/source-shader.hpp b/components/shader/source/sources/source-shader.hpp index 5cf5284c..ee1db12a 100644 --- a/components/shader/source/sources/source-shader.hpp +++ b/components/shader/source/sources/source-shader.hpp @@ -47,9 +47,7 @@ namespace streamfx::source::shader { virtual obs_properties_t* get_properties2(source::shader::shader_instance* data) override; -#ifdef ENABLE_FRONTEND static bool on_manual_open(obs_properties_t* props, obs_property_t* property, void* data); -#endif public: // Singleton static std::shared_ptr instance(); diff --git a/components/shader/source/transitions/transition-shader.cpp b/components/shader/source/transitions/transition-shader.cpp index 0a38b96e..cfa285a5 100644 --- a/components/shader/source/transitions/transition-shader.cpp +++ b/components/shader/source/transitions/transition-shader.cpp @@ -149,11 +149,9 @@ obs_properties_t* shader_factory::get_properties2(shader::shader_instance* data) auto pr = obs_properties_create(); obs_properties_set_param(pr, data, nullptr); -#ifdef ENABLE_FRONTEND { obs_properties_add_button2(pr, S_MANUAL_OPEN, D_TRANSLATE(S_MANUAL_OPEN), streamfx::transition::shader::shader_factory::on_manual_open, nullptr); } -#endif if (data) { reinterpret_cast(data)->properties(pr); @@ -162,7 +160,6 @@ obs_properties_t* shader_factory::get_properties2(shader::shader_instance* data) return pr; } -#ifdef ENABLE_FRONTEND bool shader_factory::on_manual_open(obs_properties_t* props, obs_property_t* property, void* data) { try { @@ -176,7 +173,6 @@ bool shader_factory::on_manual_open(obs_properties_t* props, obs_property_t* pro return false; } } -#endif std::shared_ptr shader_factory::instance() { diff --git a/components/shader/source/transitions/transition-shader.hpp b/components/shader/source/transitions/transition-shader.hpp index a3efd2ce..6cd03463 100644 --- a/components/shader/source/transitions/transition-shader.hpp +++ b/components/shader/source/transitions/transition-shader.hpp @@ -47,9 +47,7 @@ namespace streamfx::transition::shader { virtual obs_properties_t* get_properties2(transition::shader::shader_instance* data) override; -#ifdef ENABLE_FRONTEND static bool on_manual_open(obs_properties_t* props, obs_property_t* property, void* data); -#endif public: // Singleton static std::shared_ptr instance(); diff --git a/components/transform/source/filter/filter-transform.cpp b/components/transform/source/filter/filter-transform.cpp index 52135aa6..9b9f0a87 100644 --- a/components/transform/source/filter/filter-transform.cpp +++ b/components/transform/source/filter/filter-transform.cpp @@ -623,11 +623,9 @@ obs_properties_t* transform_factory::get_properties2(transform_instance* data) { obs_properties_t* pr = obs_properties_create(); -#ifdef ENABLE_FRONTEND { obs_properties_add_button2(pr, S_MANUAL_OPEN, D_TRANSLATE(S_MANUAL_OPEN), streamfx::filter::transform::transform_factory::on_manual_open, nullptr); } -#endif // Camera { @@ -794,7 +792,6 @@ obs_properties_t* transform_factory::get_properties2(transform_instance* data) return pr; } -#ifdef ENABLE_FRONTEND bool transform_factory::on_manual_open(obs_properties_t* props, obs_property_t* property, void* data) { try { @@ -808,7 +805,6 @@ bool transform_factory::on_manual_open(obs_properties_t* props, obs_property_t* return false; } } -#endif std::shared_ptr transform_factory::instance() { diff --git a/components/transform/source/filter/filter-transform.hpp b/components/transform/source/filter/filter-transform.hpp index afea575c..6da0ddd4 100644 --- a/components/transform/source/filter/filter-transform.hpp +++ b/components/transform/source/filter/filter-transform.hpp @@ -91,9 +91,7 @@ namespace streamfx::filter::transform { virtual obs_properties_t* get_properties2(filter::transform::transform_instance* data) override; -#ifdef ENABLE_FRONTEND static bool on_manual_open(obs_properties_t* props, obs_property_t* property, void* data); -#endif public: // Singleton static std::shared_ptr instance(); diff --git a/components/upscaling/source/filters/filter-upscaling.cpp b/components/upscaling/source/filters/filter-upscaling.cpp index dd0d288d..3dafa52e 100644 --- a/components/upscaling/source/filters/filter-upscaling.cpp +++ b/components/upscaling/source/filters/filter-upscaling.cpp @@ -562,11 +562,9 @@ obs_properties_t* upscaling_factory::get_properties2(upscaling_instance* data) { obs_properties_t* pr = obs_properties_create(); -#ifdef ENABLE_FRONTEND { obs_properties_add_button2(pr, S_MANUAL_OPEN, D_TRANSLATE(S_MANUAL_OPEN), upscaling_factory::on_manual_open, nullptr); } -#endif if (data) { data->properties(pr); @@ -587,7 +585,6 @@ obs_properties_t* upscaling_factory::get_properties2(upscaling_instance* data) return pr; } -#ifdef ENABLE_FRONTEND bool upscaling_factory::on_manual_open(obs_properties_t* props, obs_property_t* property, void* data) { try { @@ -601,7 +598,6 @@ bool upscaling_factory::on_manual_open(obs_properties_t* props, obs_property_t* return false; } } -#endif bool streamfx::filter::upscaling::upscaling_factory::is_provider_available(upscaling_provider provider) { diff --git a/components/upscaling/source/filters/filter-upscaling.hpp b/components/upscaling/source/filters/filter-upscaling.hpp index 18eed403..593544aa 100644 --- a/components/upscaling/source/filters/filter-upscaling.hpp +++ b/components/upscaling/source/filters/filter-upscaling.hpp @@ -99,9 +99,7 @@ namespace streamfx::filter::upscaling { virtual void get_defaults2(obs_data_t* data) override; virtual obs_properties_t* get_properties2(upscaling_instance* data) override; -#ifdef ENABLE_FRONTEND static bool on_manual_open(obs_properties_t* props, obs_property_t* property, void* data); -#endif bool is_provider_available(upscaling_provider); upscaling_provider find_ideal_provider(); diff --git a/components/virtual-greenscreen/source/filters/filter-virtual-greenscreen.cpp b/components/virtual-greenscreen/source/filters/filter-virtual-greenscreen.cpp index b17ffbd3..7210866a 100644 --- a/components/virtual-greenscreen/source/filters/filter-virtual-greenscreen.cpp +++ b/components/virtual-greenscreen/source/filters/filter-virtual-greenscreen.cpp @@ -561,11 +561,9 @@ obs_properties_t* virtual_greenscreen_factory::get_properties2(virtual_greenscre { obs_properties_t* pr = obs_properties_create(); -#ifdef ENABLE_FRONTEND { obs_properties_add_button2(pr, S_MANUAL_OPEN, D_TRANSLATE(S_MANUAL_OPEN), virtual_greenscreen_factory::on_manual_open, nullptr); } -#endif if (data) { data->properties(pr); @@ -586,7 +584,6 @@ obs_properties_t* virtual_greenscreen_factory::get_properties2(virtual_greenscre return pr; } -#ifdef ENABLE_FRONTEND bool virtual_greenscreen_factory::on_manual_open(obs_properties_t* props, obs_property_t* property, void* data) { try { @@ -600,7 +597,6 @@ bool virtual_greenscreen_factory::on_manual_open(obs_properties_t* props, obs_pr return false; } } -#endif bool streamfx::filter::virtual_greenscreen::virtual_greenscreen_factory::is_provider_available(virtual_greenscreen_provider provider) { diff --git a/components/virtual-greenscreen/source/filters/filter-virtual-greenscreen.hpp b/components/virtual-greenscreen/source/filters/filter-virtual-greenscreen.hpp index 48a01936..0694dbaa 100644 --- a/components/virtual-greenscreen/source/filters/filter-virtual-greenscreen.hpp +++ b/components/virtual-greenscreen/source/filters/filter-virtual-greenscreen.hpp @@ -99,9 +99,7 @@ namespace streamfx::filter::virtual_greenscreen { virtual void get_defaults2(obs_data_t* data) override; virtual obs_properties_t* get_properties2(virtual_greenscreen_instance* data) override; -#ifdef ENABLE_FRONTEND static bool on_manual_open(obs_properties_t* props, obs_property_t* property, void* data); -#endif bool is_provider_available(virtual_greenscreen_provider); virtual_greenscreen_provider find_ideal_provider(); diff --git a/source/plugin.cpp b/source/plugin.cpp index 168fe4fb..444f3c37 100644 --- a/source/plugin.cpp +++ b/source/plugin.cpp @@ -3,22 +3,13 @@ // AUTOGENERATED COPYRIGHT HEADER END #include "plugin.hpp" -#include "configuration.hpp" #include "gfx/gfx-opengl.hpp" #include "obs/gs/gs-helper.hpp" #include "obs/gs/gs-vertexbuffer.hpp" -#ifdef ENABLE_NVIDIA_CUDA -#include "nvidia/cuda/nvidia-cuda-obs.hpp" -#endif - -#ifdef ENABLE_FRONTEND +#include "configuration.hpp" #include "ui/ui.hpp" -#endif - -#ifdef ENABLE_UPDATER #include "updater.hpp" -#endif #include "warning-disable.hpp" #include @@ -78,16 +69,6 @@ MODULE_EXPORT bool obs_module_load(void) } } -#ifdef ENABLE_NVIDIA_CUDA - // Initialize CUDA if features requested it. - std::shared_ptr<::streamfx::nvidia::cuda::obs> cuda; - try { - cuda = ::streamfx::nvidia::cuda::obs::get(); - } catch (...) { - // If CUDA failed to load, it is considered safe to ignore. - } -#endif - // Run all initializers. for (auto kv : streamfx::get_initializers()) { for (auto init : kv.second) { @@ -175,10 +156,8 @@ std::filesystem::path streamfx::config_file_path(std::string_view file) } } -#ifdef ENABLE_FRONTEND bool streamfx::open_url(std::string_view url) { QUrl qurl = QString::fromUtf8(url.data()); return QDesktopServices::openUrl(qurl); } -#endif diff --git a/source/plugin.hpp b/source/plugin.hpp index 6714e04a..c4ba46d8 100644 --- a/source/plugin.hpp +++ b/source/plugin.hpp @@ -40,7 +40,5 @@ namespace streamfx { std::filesystem::path data_file_path(std::string_view file); std::filesystem::path config_file_path(std::string_view file); -#ifdef ENABLE_FRONTEND bool open_url(std::string_view url); -#endif } // namespace streamfx diff --git a/source/ui/ui.cpp b/source/ui/ui.cpp index 2443c7b4..b977107c 100644 --- a/source/ui/ui.cpp +++ b/source/ui/ui.cpp @@ -72,11 +72,7 @@ streamfx::ui::handler::handler() _about_action(), _about_dialog(), - _translator() -#ifdef ENABLE_UPDATER - , - _updater() -#endif + _translator(), _updater() { obs_frontend_add_event_callback(frontend_event_handler, this); } @@ -168,9 +164,7 @@ void streamfx::ui::handler::on_obs_loaded() } // Create the updater. -#ifdef ENABLE_UPDATER _updater = streamfx::ui::updater::instance(_menu); -#endif _menu->addSeparator(); @@ -204,10 +198,7 @@ void streamfx::ui::handler::on_obs_loaded() } // Let the Updater start its work. - -#ifdef ENABLE_UPDATER this->_updater->obs_ready(); -#endif } void streamfx::ui::handler::on_obs_exit() @@ -260,7 +251,7 @@ void streamfx::ui::handler::on_action_about(bool checked) std::shared_ptr streamfx::ui::handler::instance() { static std::weak_ptr winst; - static std::mutex mtx; + static std::mutex mtx; std::unique_lock lock(mtx); auto instance = winst.lock(); diff --git a/source/ui/ui.hpp b/source/ui/ui.hpp index b1da7695..13d5e02b 100644 --- a/source/ui/ui.hpp +++ b/source/ui/ui.hpp @@ -5,10 +5,7 @@ #pragma once #include "ui-common.hpp" #include "ui-about.hpp" - -#ifdef ENABLE_UPDATER #include "ui-updater.hpp" -#endif namespace streamfx::ui { class handler : public QObject { @@ -32,9 +29,7 @@ namespace streamfx::ui { QTranslator* _translator; -#ifdef ENABLE_UPDATER std::shared_ptr _updater; -#endif private: handler();