diff --git a/source/filter-blur.cpp b/source/filter-blur.cpp index 90eb09f4..e29fc572 100644 --- a/source/filter-blur.cpp +++ b/source/filter-blur.cpp @@ -118,8 +118,6 @@ Filter::Blur::Blur() { sourceInfo.update = update; sourceInfo.activate = activate; sourceInfo.deactivate = deactivate; - sourceInfo.show = show; - sourceInfo.hide = hide; sourceInfo.video_tick = video_tick; sourceInfo.video_render = video_render; @@ -328,14 +326,6 @@ void Filter::Blur::deactivate(void *ptr) { reinterpret_cast(ptr)->deactivate(); } -void Filter::Blur::show(void *ptr) { - reinterpret_cast(ptr)->show(); -} - -void Filter::Blur::hide(void *ptr) { - reinterpret_cast(ptr)->hide(); -} - void Filter::Blur::video_tick(void *ptr, float time) { reinterpret_cast(ptr)->video_tick(time); } @@ -400,10 +390,6 @@ void Filter::Blur::Instance::activate() {} void Filter::Blur::Instance::deactivate() {} -void Filter::Blur::Instance::show() {} - -void Filter::Blur::Instance::hide() {} - void Filter::Blur::Instance::video_tick(float) {} void Filter::Blur::Instance::video_render(gs_effect_t *effect) { @@ -627,80 +613,6 @@ void Filter::Blur::Instance::video_render(gs_effect_t *effect) { } } -gs_effect_param* gs_effect_get_param(gs_effect_t* effect, const char* name) { - gs_effect_param* p = gs_effect_get_param_by_name(effect, name); - if (!p) - P_LOG_ERROR(" Failed to find parameter %s in effect.", name); - return p; -} - -bool gs_set_param_int(gs_effect_t* effect, const char* name, int value) { - gs_effect_param* p = nullptr; - if (nullptr != (p = gs_effect_get_param(effect, name))) { - gs_effect_set_int(p, value); - return true; - } - P_LOG_ERROR(" Failed to set value %d for parameter %s in" - " effect.", value, name); - return false; -} - -bool gs_set_param_float(gs_effect_t* effect, const char* name, float value) { - gs_effect_param* p = nullptr; - if (nullptr != (p = gs_effect_get_param(effect, name))) { - gs_effect_set_float(p, value); - return true; - } - P_LOG_ERROR(" Failed to set value %f for parameter %s in" - " effect.", value, name); - return false; -} - -bool gs_set_param_float2(gs_effect_t* effect, const char* name, vec2* value) { - gs_effect_param* p = nullptr; - if (nullptr != (p = gs_effect_get_param(effect, name))) { - gs_effect_set_vec2(p, value); - return true; - } - P_LOG_ERROR(" Failed to set value {%f,%f} for parameter %s" - " in effect.", value->x, value->y, name); - return false; -} - -bool gs_set_param_float3(gs_effect_t* effect, const char* name, vec3* value) { - gs_effect_param* p = nullptr; - if (nullptr != (p = gs_effect_get_param(effect, name))) { - gs_effect_set_vec3(p, value); - return true; - } - P_LOG_ERROR(" Failed to set value {%f,%f,%f} for parameter" - "%s in effect.", value->x, value->y, value->z, name); - return false; -} - -bool gs_set_param_float4(gs_effect_t* effect, const char* name, vec4* value) { - gs_effect_param* p = nullptr; - if (nullptr != (p = gs_effect_get_param(effect, name))) { - gs_effect_set_vec4(p, value); - return true; - } - P_LOG_ERROR(" Failed to set value {%f,%f,%f,%f} for" - " parameter %s in effect.", value->x, value->y, value->z, - value->w, name); - return false; -} - -bool gs_set_param_texture(gs_effect_t* effect, const char* name, gs_texture_t* value) { - gs_effect_param* p = nullptr; - if (nullptr != (p = gs_effect_get_param(effect, name))) { - gs_effect_set_texture(p, value); - return true; - } - P_LOG_ERROR(" Failed to set texture for" - " parameter %s in effect.", name); - return false; -} - bool Filter::Blur::Instance::apply_shared_param(gs_texture_t* input, float texelX, float texelY) { bool result = true; diff --git a/source/filter-blur.h b/source/filter-blur.h index a2b79bfb..719c3b3b 100644 --- a/source/filter-blur.h +++ b/source/filter-blur.h @@ -54,8 +54,6 @@ namespace Filter { static void update(void *, obs_data_t *); static void activate(void *); static void deactivate(void *); - static void show(void *); - static void hide(void *); static void video_tick(void *, float); static void video_render(void *, gs_effect_t *);