Merge branch 'main' of github-ashmanix:ashmanix/blur-filter-obs-plugin

ashmanix · Sep 25, 2023 · 8114e1a · 8114e1a
2 parents 6ee1998 + c1162ba
commit 8114e1a
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 25 deletions.
diff --git a/src/blur-filter-source.cpp b/src/blur-filter-source.cpp
@@ -152,9 +152,8 @@ obs_properties_t *BlurFilterSource::GetProperties(void *data)
 			filterData->filterArray[i]->SetProperties(
 				filterData->mainProperties,
 				filterStringName.append(std::to_string(i)));
-
-			TogglePropertyGroupVisibility(filterData);
 		}
+		TogglePropertyGroupVisibility(filterData);
 		return filterData->mainProperties;
 	}
 

diff --git a/src/filters/base-filter.hpp b/src/filters/base-filter.hpp
@@ -9,7 +9,7 @@ class BaseFilter {
 
 private:
 	char *shaderFileName;
-	obs_property_t *filterPropertiesGroup;
+	obs_property_t *filterPropertiesGroup = nullptr;
 
 public:
 	virtual void SetParameters(gs_effect_t *effect)

diff --git a/src/filters/box-blur-filter.cpp b/src/filters/box-blur-filter.cpp
@@ -50,12 +50,12 @@ void BoxBlurFilter::Render(obs_source_t *context)
 
 void BoxBlurFilter::HidePropertiesGroup()
 {
-	obs_property_set_visible(filterPropertiesGroup, false);
+	if(filterPropertiesGroup) obs_property_set_visible(filterPropertiesGroup, false);
 }
 
 void BoxBlurFilter::ShowPropertiesGroup()
 {
-	obs_property_set_visible(filterPropertiesGroup, true);
+	if(filterPropertiesGroup) obs_property_set_visible(filterPropertiesGroup, true);
 }
 
 const char *BoxBlurFilter::GetShaderFilePath()

diff --git a/src/filters/box-blur-filter.hpp b/src/filters/box-blur-filter.hpp
@@ -11,13 +11,13 @@
 
 class BoxBlurFilter : public BaseFilter {
 private:
-	gs_eparam_t *blurSizeParam;
-	gs_eparam_t *targetWidthParam;
-	gs_eparam_t *targetHeightParam;
+	gs_eparam_t *blurSizeParam = nullptr;
+	gs_eparam_t *targetWidthParam = nullptr;
+	gs_eparam_t *targetHeightParam = nullptr;
 
 	float blurSize;
 	obs_properties_t *filterProperties;
-	obs_property_t *filterPropertiesGroup;
+	obs_property_t *filterPropertiesGroup = nullptr;
 
 	char const *shaderFileName = "box_blur.effect";
 	char const *filterName = obs_module_text("BlurTypeSelectOptionBox");

diff --git a/src/filters/fast-gaussian.cpp b/src/filters/fast-gaussian.cpp
@@ -77,12 +77,12 @@ void FastGaussianFilter::Render(obs_source_t *context)
 
 void FastGaussianFilter::HidePropertiesGroup()
 {
-	obs_property_set_visible(filterPropertiesGroup, false);
+	if (filterPropertiesGroup) obs_property_set_visible(filterPropertiesGroup, false);
 }
 
 void FastGaussianFilter::ShowPropertiesGroup()
 {
-	obs_property_set_visible(filterPropertiesGroup, true);
+	if (filterPropertiesGroup) obs_property_set_visible(filterPropertiesGroup, true);
 }
 
 const char *FastGaussianFilter::GetShaderFilePath()

diff --git a/src/filters/fast-gaussian.hpp b/src/filters/fast-gaussian.hpp
@@ -13,17 +13,17 @@
 
 class FastGaussianFilter : public BaseFilter {
 private:
-	gs_eparam_t *blurDirectionsParam;
-	gs_eparam_t *blurQualityParam;
-	gs_eparam_t *blurSizeParam;
-	gs_eparam_t *targetWidthParam;
-	gs_eparam_t *targetHeightParam;
+	gs_eparam_t *blurDirectionsParam = nullptr;
+	gs_eparam_t *blurQualityParam = nullptr;
+	gs_eparam_t *blurSizeParam = nullptr;
+	gs_eparam_t *targetWidthParam = nullptr;
+	gs_eparam_t *targetHeightParam = nullptr;
 
 	float blurDirections;
 	float blurQuality;
 	float blurSize;
-	obs_properties_t *filterProperties;
-	obs_property_t *filterPropertiesGroup;
+	obs_properties_t *filterProperties = nullptr;
+	obs_property_t *filterPropertiesGroup = nullptr;
 
 	char const *shaderFileName = "fast_gaussian_blur.effect";
 	char const *filterName =

diff --git a/src/filters/simple-gaussian.cpp b/src/filters/simple-gaussian.cpp
@@ -51,12 +51,12 @@ void SimpleGaussianFilter::Render(obs_source_t *context)
 
 void SimpleGaussianFilter::HidePropertiesGroup()
 {
-	obs_property_set_visible(filterPropertiesGroup, false);
+	if (filterPropertiesGroup) obs_property_set_visible(filterPropertiesGroup, false);
 }
 
 void SimpleGaussianFilter::ShowPropertiesGroup()
 {
-	obs_property_set_visible(filterPropertiesGroup, true);
+	if(filterPropertiesGroup) obs_property_set_visible(filterPropertiesGroup, true);
 }
 
 const char *SimpleGaussianFilter::GetShaderFilePath()

diff --git a/src/filters/simple-gaussian.hpp b/src/filters/simple-gaussian.hpp
@@ -12,13 +12,13 @@
 
 class SimpleGaussianFilter : public BaseFilter {
 private:
-	gs_eparam_t *blurSizeParam;
-	gs_eparam_t *targetWidthParam;
-	gs_eparam_t *targetHeightParam;
+	gs_eparam_t *blurSizeParam = nullptr;
+	gs_eparam_t *targetWidthParam = nullptr;
+	gs_eparam_t *targetHeightParam = nullptr;
 
 	float blurSize;
-	obs_properties_t *filterProperties;
-	obs_property_t *filterPropertiesGroup;
+	obs_properties_t *filterProperties = nullptr;
+	obs_property_t *filterPropertiesGroup = nullptr;
 
 	char const *shaderFileName = "simple_gaussian_blur.effect";
 	char const *filterName =