etc/obs-StreamFX
0
0
Fork 0
mirror of https://github.com/Xaymar/obs-StreamFX synced 2024-11-13 07:15:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

filter/blur: Fix unicode support

Browse source 
Related: #359
This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2020-11-28 23:33:08 +01:00
parent e2d342818a
commit ad33066cd3
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
source/filters/filter-blur.cpp
View file

@ -113,14 +113,12 @@ blur_instance::blur_instance(obs_data_t* settings, obs_source_t* self)
// Load Effects // Load Effects
{ {
char* file = obs_module_file("effects/mask.effect"); auto file = streamfx::data_file_path("effects/mask.effect").string();
try { try {
_effect_mask = gs::effect::create(file); _effect_mask = gs::effect::create(file);
} catch (std::runtime_error& ex) { } catch (std::runtime_error& ex) {
DLOG_ERROR("<filter-blur> Loading _effect '%s' failed with error(s): %s", file, ex.what()); DLOG_ERROR("<filter-blur> Loading effect '%s' failed with error(s): %s", file.c_str(), ex.what());
} }
bfree(file);
} }
} }
@ -601,11 +599,7 @@ void blur_factory::get_defaults2(obs_data_t* settings)
obs_data_set_default_double(settings, ST_MASK_REGION_FEATHER, 0.0); obs_data_set_default_double(settings, ST_MASK_REGION_FEATHER, 0.0);
obs_data_set_default_double(settings, ST_MASK_REGION_FEATHER_SHIFT, 0.0); obs_data_set_default_double(settings, ST_MASK_REGION_FEATHER_SHIFT, 0.0);
obs_data_set_default_bool(settings, ST_MASK_REGION_INVERT, false); obs_data_set_default_bool(settings, ST_MASK_REGION_INVERT, false);
{ obs_data_set_default_string(settings, ST_MASK_IMAGE, streamfx::data_file_path("white.png").u8string().c_str());
char* default_file = obs_module_file("white.png");
obs_data_set_default_string(settings, ST_MASK_IMAGE, default_file);
bfree(default_file);
}
obs_data_set_default_string(settings, ST_MASK_SOURCE, ""); obs_data_set_default_string(settings, ST_MASK_SOURCE, "");
obs_data_set_default_int(settings, ST_MASK_COLOR, 0xFFFFFFFFull); obs_data_set_default_int(settings, ST_MASK_COLOR, 0xFFFFFFFFull);
obs_data_set_default_double(settings, ST_MASK_MULTIPLIER, 1.0); obs_data_set_default_double(settings, ST_MASK_MULTIPLIER, 1.0);