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

code: Migrate filter::blur to new dynamic loader

This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2023-05-14 08:50:28 +02:00 committed by Xaymar
parent 1059e5c027
commit 17d25f1ef0
3 changed files with 20 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
source/filters/filter-blur.cpp
View File

@ -855,26 +855,27 @@ bool blur_factory::on_manual_open(obs_properties_t* props, obs_property_t* prope
}
#endif
std::shared_ptr<blur_factory> _filter_blur_factory_instance = nullptr;
void streamfx::filter::blur::blur_factory::initialize()
std::shared_ptr<blur_factory> blur_factory::instance()
{
try {
if (!_filter_blur_factory_instance)
_filter_blur_factory_instance = std::make_shared<blur_factory>();
} catch (const std::exception& ex) {
D_LOG_ERROR("Failed to initialize due to error: %s", ex.what());
} catch (...) {
D_LOG_ERROR("Failed to initialize due to unknown error.", "");
static std::weak_ptr<blur_factory> winst;
static std::mutex mtx;
std::unique_lock<decltype(mtx)> lock(mtx);
auto instance = winst.lock();
if (!instance) {
instance = std::shared_ptr<blur_factory>(new blur_factory());
winst = instance;
}
return instance;
}
void streamfx::filter::blur::blur_factory::finalize()
{
_filter_blur_factory_instance.reset();
}
static std::shared_ptr<blur_factory> loader_instance;
std::shared_ptr<blur_factory> streamfx::filter::blur::blur_factory::get()
{
return _filter_blur_factory_instance;
}
static auto loader = streamfx::loader(
[]() { // Initalizer
loader_instance = blur_factory::instance();
},
[]() { // Finalizer
loader_instance.reset();
},
streamfx::loader_priority::NORMAL);

6
source/filters/filter-blur.hpp
View File

@ -120,10 +120,6 @@ namespace streamfx::filter::blur {
#endif
public: // Singleton
static void initialize();
static void finalize();
static std::shared_ptr<blur_factory> get();
static std::shared_ptr<blur_factory> instance();
};
} // namespace streamfx::filter::blur

9
source/plugin.cpp
View File

@ -19,9 +19,6 @@
#ifdef ENABLE_FILTER_AUTOFRAMING
#include "filters/filter-autoframing.hpp"
#endif
#ifdef ENABLE_FILTER_BLUR
#include "filters/filter-blur.hpp"
#endif
#ifdef ENABLE_FILTER_DENOISING
#include "filters/filter-denoising.hpp"
#endif
@ -144,9 +141,6 @@ MODULE_EXPORT bool obs_module_load(void)
#ifdef ENABLE_FILTER_AUTOFRAMING
streamfx::filter::autoframing::autoframing_factory::initialize();
#endif
#ifdef ENABLE_FILTER_BLUR
streamfx::filter::blur::blur_factory::initialize();
#endif
#ifdef ENABLE_FILTER_DENOISING
streamfx::filter::denoising::denoising_factory::initialize();
#endif
@ -199,9 +193,6 @@ MODULE_EXPORT void obs_module_unload(void)
#ifdef ENABLE_FILTER_AUTOFRAMING
streamfx::filter::autoframing::autoframing_factory::finalize();
#endif
#ifdef ENABLE_FILTER_BLUR
streamfx::filter::blur::blur_factory::finalize();
#endif
#ifdef ENABLE_FILTER_DENOISING
streamfx::filter::denoising::denoising_factory::finalize();
#endif