From 721bdaf6427cdc9ed80a9a58b15330c230ad4b7f Mon Sep 17 00:00:00 2001 From: Michael Fabian 'Xaymar' Dirks Date: Wed, 3 Apr 2019 00:19:01 +0200 Subject: [PATCH] project: Reapply clang-format globally --- source/filters/filter-displacement.hpp | 4 ++-- source/filters/filter-sdf-effects.hpp | 12 ++++++------ source/gfx/blur/gfx-blur-box-linear.hpp | 2 +- source/gfx/blur/gfx-blur-dual-filtering.hpp | 12 ++++++------ source/gfx/blur/gfx-blur-gaussian-linear.hpp | 4 ++-- source/obs/gs/gs-rendertarget.hpp | 2 +- source/plugin.hpp | 2 +- source/sources/source-mirror.hpp | 10 +++++----- source/util-math.hpp | 6 +++--- source/util-memory.hpp | 2 +- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/source/filters/filter-displacement.hpp b/source/filters/filter-displacement.hpp index ea8a64c..dbbbd9e 100644 --- a/source/filters/filter-displacement.hpp +++ b/source/filters/filter-displacement.hpp @@ -48,8 +48,8 @@ namespace filter { obs_source_info sourceInfo; public: // Singleton - static void initialize(); - static void finalize(); + static void initialize(); + static void finalize(); static std::shared_ptr get(); public: diff --git a/source/filters/filter-sdf-effects.hpp b/source/filters/filter-sdf-effects.hpp index fc47700..342b340 100644 --- a/source/filters/filter-sdf-effects.hpp +++ b/source/filters/filter-sdf-effects.hpp @@ -43,7 +43,7 @@ namespace filter { class sdf_effects_factory { friend class std::_Ptr_base; - obs_source_info source_info; + obs_source_info source_info; std::list sources; @@ -51,8 +51,8 @@ namespace filter { std::shared_ptr sdf_shadow_effect; public: // Singleton - static void initialize(); - static void finalize(); + static void initialize(); + static void finalize(); static std::shared_ptr get(); public: @@ -96,7 +96,7 @@ namespace filter { std::shared_ptr m_sdf_write, m_sdf_read; std::shared_ptr m_sdf_texture; double_t m_sdf_scale; - + bool m_inner_shadow; float_t m_inner_range_min; float_t m_inner_range_max; @@ -117,7 +117,7 @@ namespace filter { obs_data_t* settings); static bool cb_modified_advanced(void* ptr, obs_properties_t* props, obs_property* prop, - obs_data_t* settings); + obs_data_t* settings); public: sdf_effects_instance(obs_data_t* settings, obs_source_t* self); @@ -135,5 +135,5 @@ namespace filter { void video_tick(float); void video_render(gs_effect_t*); }; - } // namespace shadow_sdf + } // namespace sdf_effects } // namespace filter diff --git a/source/gfx/blur/gfx-blur-box-linear.hpp b/source/gfx/blur/gfx-blur-box-linear.hpp index c43c182..8df8445 100644 --- a/source/gfx/blur/gfx-blur-box-linear.hpp +++ b/source/gfx/blur/gfx-blur-box-linear.hpp @@ -37,7 +37,7 @@ namespace gfx { }; class box_linear_factory : public ::gfx::blur::ifactory { - std::mutex m_data_lock; + std::mutex m_data_lock; std::weak_ptr<::gfx::blur::box_linear_data> m_data; public: diff --git a/source/gfx/blur/gfx-blur-dual-filtering.hpp b/source/gfx/blur/gfx-blur-dual-filtering.hpp index 4fb35e4..05d2dca 100644 --- a/source/gfx/blur/gfx-blur-dual-filtering.hpp +++ b/source/gfx/blur/gfx-blur-dual-filtering.hpp @@ -38,7 +38,7 @@ namespace gfx { }; class dual_filtering_factory : public ::gfx::blur::ifactory { - std::mutex m_data_lock; + std::mutex m_data_lock; std::weak_ptr<::gfx::blur::dual_filtering_data> m_data; public: @@ -94,18 +94,18 @@ namespace gfx { public: dual_filtering(); virtual ~dual_filtering(); - + virtual void set_input(std::shared_ptr<::gs::texture> texture) override; virtual ::gfx::blur::type get_type() override; - virtual double_t get_size() override; + virtual double_t get_size() override; - virtual void set_size(double_t width) override; + virtual void set_size(double_t width) override; - virtual void set_step_scale(double_t x, double_t y) override; + virtual void set_step_scale(double_t x, double_t y) override; - virtual void get_step_scale(double_t& x, double_t& y) override; + virtual void get_step_scale(double_t& x, double_t& y) override; virtual std::shared_ptr<::gs::texture> render() override; diff --git a/source/gfx/blur/gfx-blur-gaussian-linear.hpp b/source/gfx/blur/gfx-blur-gaussian-linear.hpp index fe02ccb..a16fd4c 100644 --- a/source/gfx/blur/gfx-blur-gaussian-linear.hpp +++ b/source/gfx/blur/gfx-blur-gaussian-linear.hpp @@ -39,7 +39,7 @@ namespace gfx { }; class gaussian_linear_factory : public ::gfx::blur::ifactory { - std::mutex m_data_lock; + std::mutex m_data_lock; std::weak_ptr<::gfx::blur::gaussian_linear_data> m_data; public: @@ -130,7 +130,7 @@ namespace gfx { virtual double_t get_angle() override; - virtual void set_angle(double_t angle) override; + virtual void set_angle(double_t angle) override; virtual std::shared_ptr<::gs::texture> render() override; }; diff --git a/source/obs/gs/gs-rendertarget.hpp b/source/obs/gs/gs-rendertarget.hpp index 4bc721c..9b973af 100644 --- a/source/obs/gs/gs-rendertarget.hpp +++ b/source/obs/gs/gs-rendertarget.hpp @@ -34,7 +34,7 @@ namespace gs { class rendertarget_op; - + class rendertarget { friend class rendertarget_op; diff --git a/source/plugin.hpp b/source/plugin.hpp index 5823087..8df0dd7 100644 --- a/source/plugin.hpp +++ b/source/plugin.hpp @@ -18,8 +18,8 @@ */ #pragma once -#include #include +#include #include // OBS diff --git a/source/sources/source-mirror.hpp b/source/sources/source-mirror.hpp index 4151e62..f7ad9c2 100644 --- a/source/sources/source-mirror.hpp +++ b/source/sources/source-mirror.hpp @@ -47,8 +47,8 @@ namespace source { obs_source_info osi; public: // Singleton - static void initialize(); - static void finalize(); + static void initialize(); + static void finalize(); static std::shared_ptr get(); public: @@ -106,9 +106,9 @@ namespace source { bool m_audio_have_output; // Input - std::shared_ptr m_source; - obs_sceneitem_t* m_source_item; - std::string m_source_name; + std::shared_ptr m_source; + obs_sceneitem_t* m_source_item; + std::string m_source_name; private: void release_input(); diff --git a/source/util-math.hpp b/source/util-math.hpp index f728f58..1f615f3 100644 --- a/source/util-math.hpp +++ b/source/util-math.hpp @@ -40,7 +40,7 @@ #define PI2 6.283185307179586476925286766559 // 2PI = 2 * pi #define PI2_SQROOT 2.506628274631000502415765284811 // sqrt(2 * pi) -#define V_RAD 57.295779513082320876798154814105 // 180/pi +#define V_RAD 57.295779513082320876798154814105 // 180/pi #define V_DEG 0.01745329251994329576923690768489 // pi/180 #define DEG_TO_RAD(x) (x * V_DEG) #define RAD_TO_DEG(x) (x * V_RAD) @@ -67,7 +67,7 @@ namespace util { #ifdef _MSC_VER __declspec(align(16)) #endif - struct vec3a : public vec3 { + struct vec3a : public vec3 { // 16-byte Aligned version of vec3 static void* operator new(size_t count); static void* operator new[](size_t count); @@ -78,7 +78,7 @@ namespace util { #ifdef _MSC_VER __declspec(align(16)) #endif - struct vec4a : public vec4 { + struct vec4a : public vec4 { // 16-byte Aligned version of vec4 static void* operator new(size_t count); static void* operator new[](size_t count); diff --git a/source/util-memory.hpp b/source/util-memory.hpp index 43946b1..23b26b7 100644 --- a/source/util-memory.hpp +++ b/source/util-memory.hpp @@ -106,7 +106,7 @@ namespace util { // Returns true if and only if storage allocated from *this // can be deallocated from other, and vice versa. // Always returns true for stateless allocators. - bool operator==(const AlignmentAllocator& ) const + bool operator==(const AlignmentAllocator&) const { return true; }