diff --git a/source/filter-transform.cpp b/source/filter-transform.cpp index cafd0c12..42b36f3e 100644 --- a/source/filter-transform.cpp +++ b/source/filter-transform.cpp @@ -232,15 +232,15 @@ obs_properties_t* filter::transform::transform_factory::get_properties(void*) obs_property_set_long_description(p, P_TRANSLATE(P_DESC(S_MIPGENERATOR))); obs_property_list_add_int(p, P_TRANSLATE(S_MIPGENERATOR_POINT), (long long)gs::mipmapper::generator::Point); - obs_property_list_add_int(p, P_TRANSLATE(S_MIPGENERATOR_POINT), (long long)gs::mipmapper::generator::Linear); - obs_property_list_add_int(p, P_TRANSLATE(S_MIPGENERATOR_POINT), (long long)gs::mipmapper::generator::Sharpen); - obs_property_list_add_int(p, P_TRANSLATE(S_MIPGENERATOR_POINT), (long long)gs::mipmapper::generator::Smoothen); - obs_property_list_add_int(p, P_TRANSLATE(S_MIPGENERATOR_POINT), (long long)gs::mipmapper::generator::Bicubic); - obs_property_list_add_int(p, P_TRANSLATE(S_MIPGENERATOR_POINT), (long long)gs::mipmapper::generator::Lanczos); + obs_property_list_add_int(p, P_TRANSLATE(S_MIPGENERATOR_LINEAR), (long long)gs::mipmapper::generator::Linear); + obs_property_list_add_int(p, P_TRANSLATE(S_MIPGENERATOR_SHARPEN), (long long)gs::mipmapper::generator::Sharpen); + obs_property_list_add_int(p, P_TRANSLATE(S_MIPGENERATOR_SMOOTHEN), (long long)gs::mipmapper::generator::Smoothen); + obs_property_list_add_int(p, P_TRANSLATE(S_MIPGENERATOR_BICUBIC), (long long)gs::mipmapper::generator::Bicubic); + obs_property_list_add_int(p, P_TRANSLATE(S_MIPGENERATOR_LANCZOS), (long long)gs::mipmapper::generator::Lanczos); - p = obs_properties_add_float_slider(pr, S_MIPGENERATOR_STRENGTH, P_TRANSLATE(S_MIPGENERATOR_STRENGTH), 0.0, 1000.0, - 0.01); - obs_property_set_long_description(p, P_TRANSLATE(P_DESC(S_MIPGENERATOR_STRENGTH))); + p = obs_properties_add_float_slider(pr, S_MIPGENERATOR_INTENSITY, P_TRANSLATE(S_MIPGENERATOR_INTENSITY), 0.0, + 1000.0, 0.01); + obs_property_set_long_description(p, P_TRANSLATE(P_DESC(S_MIPGENERATOR_INTENSITY))); return pr; } @@ -264,7 +264,7 @@ bool filter::transform::transform_factory::modified_properties(obs_properties_t* bool mipmappingVisible = obs_data_get_bool(d, ST_MIPMAPPING) && advancedVisible; obs_property_set_visible(obs_properties_get(pr, S_MIPGENERATOR), mipmappingVisible); - obs_property_set_visible(obs_properties_get(pr, S_MIPGENERATOR_STRENGTH), mipmappingVisible); + obs_property_set_visible(obs_properties_get(pr, S_MIPGENERATOR_INTENSITY), mipmappingVisible); return true; } @@ -381,7 +381,7 @@ void filter::transform::transform_instance::update(obs_data_t* data) // Mipmapping m_mipmap_enabled = obs_data_get_bool(data, ST_MIPMAPPING); - m_mipmap_strength = obs_data_get_double(data, S_MIPGENERATOR_STRENGTH); + m_mipmap_strength = obs_data_get_double(data, S_MIPGENERATOR_INTENSITY); m_mipmap_generator = (gs::mipmapper::generator)obs_data_get_int(data, S_MIPGENERATOR); m_update_mesh = true; diff --git a/source/filter-transform.hpp b/source/filter-transform.hpp index bd1462fe..bc6f8a25 100644 --- a/source/filter-transform.hpp +++ b/source/filter-transform.hpp @@ -34,8 +34,8 @@ namespace filter { obs_source_info sourceInfo; public: // Singleton - static void initialize(); - static void finalize(); + static void initialize(); + static void finalize(); static std::shared_ptr get(); public: diff --git a/source/strings.hpp b/source/strings.hpp index 040d6541..66dcd128 100644 --- a/source/strings.hpp +++ b/source/strings.hpp @@ -47,4 +47,4 @@ #define S_MIPGENERATOR_SMOOTHEN "MipGenerator.Smoothen" #define S_MIPGENERATOR_BICUBIC "MipGenerator.Bicubic" #define S_MIPGENERATOR_LANCZOS "MipGenerator.Lanczos" -#define S_MIPGENERATOR_STRENGTH "MipGenerator.Strength" +#define S_MIPGENERATOR_INTENSITY "MipGenerator.Intensity"