Skip to content

Commit

Permalink
Properly shows/hides 'Freeze' option for BSM mask.
Browse files Browse the repository at this point in the history
  • Loading branch information
FiniteSingularity committed Jan 27, 2024
1 parent 7166a91 commit 3885280
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
15 changes: 7 additions & 8 deletions src/advanced-masks-filter.c
Original file line number Diff line number Diff line change
Expand Up @@ -299,14 +299,8 @@ static bool setting_mask_effect_modified(void *data, obs_properties_t *props,
obs_data_t *settings)
{
int mask_effect = (int)obs_data_get_int(settings, "mask_effect");
switch (mask_effect) {
case MASK_EFFECT_ADJUSTMENT:
setting_visibility("mask_adjustments_group", true, props);
break;
case MASK_EFFECT_ALPHA:
setting_visibility("mask_adjustments_group", false, props);
break;
}
setting_visibility("mask_adjustments_group", mask_effect == MASK_EFFECT_ADJUSTMENT, props);

setting_mask_type_modified(data, props, p, settings);
return true;
}
Expand Down Expand Up @@ -343,6 +337,7 @@ static bool setting_mask_type_modified(void *data, obs_properties_t *props,
settings);
setting_visibility("bsm_mask_source", false, props);
setting_visibility("bsm_time", false, props);
setting_visibility("bsm_freeze", false, props);
return true;
case MASK_TYPE_SOURCE:
setting_visibility("mask_source", true, props);
Expand All @@ -365,6 +360,7 @@ static bool setting_mask_type_modified(void *data, obs_properties_t *props,
setting_visibility("mask_gradient_group", false, props);
setting_visibility("bsm_mask_source", false, props);
setting_visibility("bsm_time", false, props);
setting_visibility("bsm_freeze", false, props);
return true;
case MASK_TYPE_IMAGE:
setting_visibility("mask_source", false, props);
Expand All @@ -387,6 +383,7 @@ static bool setting_mask_type_modified(void *data, obs_properties_t *props,
setting_visibility("mask_gradient_group", false, props);
setting_visibility("bsm_mask_source", false, props);
setting_visibility("bsm_time", false, props);
setting_visibility("bsm_freeze", false, props);
return true;
case MASK_TYPE_GRADIENT:
setting_visibility("mask_source", false, props);
Expand All @@ -407,6 +404,7 @@ static bool setting_mask_type_modified(void *data, obs_properties_t *props,
setting_visibility("mask_gradient_group", true, props);
setting_visibility("bsm_mask_source", false, props);
setting_visibility("bsm_time", false, props);
setting_visibility("bsm_freeze", false, props);
return true;
case MASK_TYPE_BSM:
setting_visibility("mask_source", false, props);
Expand All @@ -428,6 +426,7 @@ static bool setting_mask_type_modified(void *data, obs_properties_t *props,

setting_visibility("bsm_mask_source", true, props);
setting_visibility("bsm_time", true, props);
setting_visibility("bsm_freeze", effect_type == MASK_EFFECT_ALPHA, props);
return true;
}
return false;
Expand Down
2 changes: 1 addition & 1 deletion src/mask-bsm.c
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ void bsm_mask_top_properties(obs_properties_t *props)

obs_property_float_set_suffix(p, "ms");

obs_properties_add_bool(
p = obs_properties_add_bool(
props, "bsm_freeze",
obs_module_text("AdvancedMasks.BSMMask.Freeze"));
}
Expand Down

0 comments on commit 3885280

Please sign in to comment.