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::color_grade to new dynamic loader

This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2023-05-14 06:50:27 +02:00 committed by Xaymar
parent 1363b14288
commit 765e663180
3 changed files with 26 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
source/filters/filter-color-grade.cpp
View File

@ -826,26 +826,33 @@ bool color_grade_factory::on_manual_open(obs_properties_t* props, obs_property_t
} }
#endif #endif
std::shared_ptr<color_grade_factory> _color_grade_factory_instance = nullptr; std::shared_ptr<color_grade_factory> streamfx::filter::color_grade::color_grade_factory::instance()
void streamfx::filter::color_grade::color_grade_factory::initialize()
{ {
try { static std::weak_ptr<color_grade_factory> winst;
if (!_color_grade_factory_instance) static std::mutex mtx;
_color_grade_factory_instance = std::make_shared<color_grade_factory>();
} catch (const std::exception& ex) { std::unique_lock<decltype(mtx)> lock(mtx);
D_LOG_ERROR("Failed to initialize due to error: %s", ex.what()); auto instance = winst.lock();
} catch (...) { if (!instance) {
D_LOG_ERROR("Failed to initialize due to unknown error.", ""); try {
instance = std::shared_ptr<color_grade_factory>(new color_grade_factory());
winst = instance;
} 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.", "");
}
} }
return instance;
} }
void streamfx::filter::color_grade::color_grade_factory::finalize() static std::shared_ptr<color_grade_factory> loader_instance;
{
_color_grade_factory_instance.reset();
}
std::shared_ptr<color_grade_factory> streamfx::filter::color_grade::color_grade_factory::get() static auto loader = streamfx::loader(
{ []() { // Initalizer
return _color_grade_factory_instance; loader_instance = color_grade_factory::instance();
} },
[]() { // Finalizer
loader_instance.reset();
},
streamfx::loader_priority::NORMAL); // Must be loaded after all other functionality.

6
source/filters/filter-color-grade.hpp
View File

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

9
source/plugin.cpp
View File

@ -22,9 +22,6 @@
#ifdef ENABLE_FILTER_BLUR #ifdef ENABLE_FILTER_BLUR
#include "filters/filter-blur.hpp" #include "filters/filter-blur.hpp"
#endif #endif
#ifdef ENABLE_FILTER_COLOR_GRADE
#include "filters/filter-color-grade.hpp"
#endif
#ifdef ENABLE_FILTER_DENOISING #ifdef ENABLE_FILTER_DENOISING
#include "filters/filter-denoising.hpp" #include "filters/filter-denoising.hpp"
#endif #endif
@ -162,9 +159,6 @@ MODULE_EXPORT bool obs_module_load(void)
#ifdef ENABLE_FILTER_BLUR #ifdef ENABLE_FILTER_BLUR
streamfx::filter::blur::blur_factory::initialize(); streamfx::filter::blur::blur_factory::initialize();
#endif #endif
#ifdef ENABLE_FILTER_COLOR_GRADE
streamfx::filter::color_grade::color_grade_factory::initialize();
#endif
#ifdef ENABLE_FILTER_DENOISING #ifdef ENABLE_FILTER_DENOISING
streamfx::filter::denoising::denoising_factory::initialize(); streamfx::filter::denoising::denoising_factory::initialize();
#endif #endif
@ -235,9 +229,6 @@ MODULE_EXPORT void obs_module_unload(void)
#ifdef ENABLE_FILTER_BLUR #ifdef ENABLE_FILTER_BLUR
streamfx::filter::blur::blur_factory::finalize(); streamfx::filter::blur::blur_factory::finalize();
#endif #endif
#ifdef ENABLE_FILTER_COLOR_GRADE
streamfx::filter::color_grade::color_grade_factory::finalize();
#endif
#ifdef ENABLE_FILTER_DENOISING #ifdef ENABLE_FILTER_DENOISING
streamfx::filter::denoising::denoising_factory::finalize(); streamfx::filter::denoising::denoising_factory::finalize();
#endif #endif