RomanNum3ral
/
obs-streamFX
mirror of https://github.com/RomanNum3ral/obs-StreamFX.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

project: Apply clang-format manually again

This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2019-04-19 20:40:07 +02:00
parent b34c880f88
commit f8e685cf42
6 changed files with 27 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/filters/filter-custom-shader.cpp
View File

@ -376,7 +376,9 @@ bool filter::CustomShader::Instance::apply_special_parameters(uint32_t, uint32_t
.set_float2(float_t(imageTexture->get_width()), float_t(imageTexture->get_height())); .set_float2(float_t(imageTexture->get_width()), float_t(imageTexture->get_height()));
} }
if (m_shader.effect->has_parameter("Image_SizeI" /*, gs::effect_parameter::type::Integer2*/)) { if (m_shader.effect->has_parameter("Image_SizeI" /*, gs::effect_parameter::type::Integer2*/)) {
m_shader.effect->get_parameter("Image_SizeI").set_int2(static_cast<int32_t>(imageTexture->get_width()), static_cast<int32_t>(imageTexture->get_height())); m_shader.effect->get_parameter("Image_SizeI")
.set_int2(static_cast<int32_t>(imageTexture->get_width()),
static_cast<int32_t>(imageTexture->get_height()));
} }
if (m_shader.effect->has_parameter("Image_Texel", gs::effect_parameter::type::Float2)) { if (m_shader.effect->has_parameter("Image_Texel", gs::effect_parameter::type::Float2)) {
m_shader.effect->get_parameter("Image_Texel") m_shader.effect->get_parameter("Image_Texel")

16
source/filters/filter-sdf-effects.cpp
View File

@ -482,7 +482,8 @@ void filter::sdf_effects::sdf_effects_instance::update(obs_data_t* data)
{ {
{ {
this->m_outer_shadow = this->m_outer_shadow =
obs_data_get_bool(data, P_SHADOW_OUTER) && (obs_data_get_double(data, P_SHADOW_OUTER_ALPHA) >= std::numeric_limits<double_t>::epsilon()); obs_data_get_bool(data, P_SHADOW_OUTER)
&& (obs_data_get_double(data, P_SHADOW_OUTER_ALPHA) >= std::numeric_limits<double_t>::epsilon());
{ {
union { union {
uint32_t color; uint32_t color;
@ -505,7 +506,8 @@ void filter::sdf_effects::sdf_effects_instance::update(obs_data_t* data)
{ {
this->m_inner_shadow = this->m_inner_shadow =
obs_data_get_bool(data, P_SHADOW_INNER) && (obs_data_get_double(data, P_SHADOW_INNER_ALPHA) >= std::numeric_limits<double_t>::epsilon()); obs_data_get_bool(data, P_SHADOW_INNER)
&& (obs_data_get_double(data, P_SHADOW_INNER_ALPHA) >= std::numeric_limits<double_t>::epsilon());
{ {
union { union {
uint32_t color; uint32_t color;
@ -528,7 +530,8 @@ void filter::sdf_effects::sdf_effects_instance::update(obs_data_t* data)
{ {
this->m_outer_glow = this->m_outer_glow =
obs_data_get_bool(data, P_GLOW_OUTER) && (obs_data_get_double(data, P_GLOW_OUTER_ALPHA) >= std::numeric_limits<double_t>::epsilon()); obs_data_get_bool(data, P_GLOW_OUTER)
&& (obs_data_get_double(data, P_GLOW_OUTER_ALPHA) >= std::numeric_limits<double_t>::epsilon());
{ {
union { union {
uint32_t color; uint32_t color;
@ -553,7 +556,8 @@ void filter::sdf_effects::sdf_effects_instance::update(obs_data_t* data)
{ {
this->m_inner_glow = this->m_inner_glow =
obs_data_get_bool(data, P_GLOW_INNER) && (obs_data_get_double(data, P_GLOW_INNER_ALPHA) >= std::numeric_limits<double_t>::epsilon()); obs_data_get_bool(data, P_GLOW_INNER)
&& (obs_data_get_double(data, P_GLOW_INNER_ALPHA) >= std::numeric_limits<double_t>::epsilon());
{ {
union { union {
uint32_t color; uint32_t color;
@ -577,8 +581,8 @@ void filter::sdf_effects::sdf_effects_instance::update(obs_data_t* data)
} }
{ {
this->m_outline = this->m_outline = obs_data_get_bool(data, P_OUTLINE)
obs_data_get_bool(data, P_OUTLINE) && (obs_data_get_double(data, P_OUTLINE_ALPHA) >= std::numeric_limits<double_t>::epsilon()); && (obs_data_get_double(data, P_OUTLINE_ALPHA) >= std::numeric_limits<double_t>::epsilon());
{ {
union { union {
uint32_t color; uint32_t color;

3
source/gfx/gfx-effect-source.cpp
View File

@ -159,7 +159,8 @@ void gfx::effect_source::get_properties(obs_properties_t* properties)
obs_properties_add_bool(properties, prm.second->ui.names[0], prm.second->ui.descs[0]); obs_properties_add_bool(properties, prm.second->ui.names[0], prm.second->ui.descs[0]);
} else if (prm.first.second >= gs::effect_parameter::type::Integer } else if (prm.first.second >= gs::effect_parameter::type::Integer
&& prm.first.second <= gs::effect_parameter::type::Integer4) { && prm.first.second <= gs::effect_parameter::type::Integer4) {
size_t cnt = static_cast<size_t>(prm.first.second) - static_cast<size_t>(gs::effect_parameter::type::Integer); size_t cnt =
static_cast<size_t>(prm.first.second) - static_cast<size_t>(gs::effect_parameter::type::Integer);
for (size_t idx = 0; idx <= cnt; idx++) { for (size_t idx = 0; idx <= cnt; idx++) {
obs_properties_add_int(properties, prm.second->ui.names[idx], prm.second->ui.descs[idx], INT_MIN, obs_properties_add_int(properties, prm.second->ui.names[idx], prm.second->ui.descs[idx], INT_MIN,

34
source/obs/obs-source.cpp
View File

@ -427,32 +427,14 @@ obs::source::source()
} \ } \
}); \ }); \
} }
auto_signal_c(destroy) auto_signal_c(destroy) auto_signal_c(remove) auto_signal_c(save) auto_signal_c(load) auto_signal_c(activate)
auto_signal_c(remove) auto_signal_c(deactivate) auto_signal_c(show) auto_signal_c(hide) auto_signal_c(mute)
auto_signal_c(save) auto_signal_c(push_to_mute_changed) auto_signal_c(push_to_mute_delay) auto_signal_c(push_to_talk_changed)
auto_signal_c(load) auto_signal_c(push_to_talk_delay) auto_signal_c(enable) auto_signal_c(rename) auto_signal_c(volume)
auto_signal_c(activate) auto_signal_c(update_properties) auto_signal_c(update_flags) auto_signal_c(audio_sync)
auto_signal_c(deactivate) auto_signal_c(audio_mixers) auto_signal_c(filter_add) auto_signal_c(filter_remove)
auto_signal_c(show) auto_signal_c(reorder_filters) auto_signal_c(transition_start)
auto_signal_c(hide) auto_signal_c(transition_video_stop) auto_signal_c(transition_stop)
auto_signal_c(mute)
auto_signal_c(push_to_mute_changed)
auto_signal_c(push_to_mute_delay)
auto_signal_c(push_to_talk_changed)
auto_signal_c(push_to_talk_delay)
auto_signal_c(enable)
auto_signal_c(rename)
auto_signal_c(volume)
auto_signal_c(update_properties)
auto_signal_c(update_flags)
auto_signal_c(audio_sync)
auto_signal_c(audio_mixers)
auto_signal_c(filter_add)
auto_signal_c(filter_remove)
auto_signal_c(reorder_filters)
auto_signal_c(transition_start)
auto_signal_c(transition_video_stop)
auto_signal_c(transition_stop)
#undef auto_signal_c #undef auto_signal_c
// libOBS unfortunately does not use the event system for audio data callbacks, which is kind of odd as most other // libOBS unfortunately does not use the event system for audio data callbacks, which is kind of odd as most other