From 96e4d67242c128c1850eb45af136e75cb8c2b2f3 Mon Sep 17 00:00:00 2001 From: PatTheMav Date: Fri, 14 Mar 2025 21:13:32 +0100 Subject: [PATCH] clang-format: Update source code files with clang-format 19.1.1 --- frontend/settings/OBSHotkeyWidget.cpp | 5 ++--- frontend/utility/BasicOutputHandler.hpp | 2 +- frontend/utility/RemuxWorker.hpp | 2 +- libobs/util/threading-windows.c | 3 ++- plugins/coreaudio-encoder/encoder.cpp | 2 +- plugins/mac-capture/mac-display-capture.m | 8 ++++---- plugins/nv-filters/nvidia-videofx-filter.c | 2 +- plugins/nv-filters/nvvfx-load.h | 2 +- plugins/obs-webrtc/whip-output.cpp | 2 +- shared/obs-scripting/obs-scripting-python.c | 2 +- shared/obs-scripting/obs-scripting.c | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/frontend/settings/OBSHotkeyWidget.cpp b/frontend/settings/OBSHotkeyWidget.cpp index 77d691c81..b5a0b9670 100644 --- a/frontend/settings/OBSHotkeyWidget.cpp +++ b/frontend/settings/OBSHotkeyWidget.cpp @@ -117,9 +117,8 @@ void OBSHotkeyWidget::AddEdit(obs_key_combination combo, int idx) return std::distance(begin(removeButtons), res); }; - QObject::connect(add, &QPushButton::clicked, [&, CurrentIndex] { - AddEdit({0, OBS_KEY_NONE}, CurrentIndex() + 1); - }); + QObject::connect(add, &QPushButton::clicked, + [&, CurrentIndex] { AddEdit({0, OBS_KEY_NONE}, CurrentIndex() + 1); }); QObject::connect(remove, &QPushButton::clicked, [&, CurrentIndex] { RemoveEdit(CurrentIndex()); }); diff --git a/frontend/utility/BasicOutputHandler.hpp b/frontend/utility/BasicOutputHandler.hpp index 7d041304a..4d1a8661e 100644 --- a/frontend/utility/BasicOutputHandler.hpp +++ b/frontend/utility/BasicOutputHandler.hpp @@ -65,7 +65,7 @@ struct BasicOutputHandler { BasicOutputHandler(OBSBasic *main_); - virtual ~BasicOutputHandler(){}; + virtual ~BasicOutputHandler() {}; virtual std::shared_future SetupStreaming(obs_service_t *service, SetupStreamingContinuation_t continuation) = 0; diff --git a/frontend/utility/RemuxWorker.hpp b/frontend/utility/RemuxWorker.hpp index 9816e3501..cf60f885c 100644 --- a/frontend/utility/RemuxWorker.hpp +++ b/frontend/utility/RemuxWorker.hpp @@ -31,7 +31,7 @@ class RemuxWorker : public QObject { void UpdateProgress(float percent); explicit RemuxWorker() : isWorking(false) {} - virtual ~RemuxWorker(){}; + virtual ~RemuxWorker() {}; private slots: void remux(const QString &source, const QString &target); diff --git a/libobs/util/threading-windows.c b/libobs/util/threading-windows.c index 3c62968e5..4ccc97841 100644 --- a/libobs/util/threading-windows.c +++ b/libobs/util/threading-windows.c @@ -185,7 +185,8 @@ void os_set_thread_name(const char *name) RaiseException(VC_EXCEPTION, 0, THREADNAME_INFO_SIZE, (ULONG_PTR *)&info); #ifdef NO_SEH_MINGW } - __except1{ + __except1 + { #else } __except (EXCEPTION_EXECUTE_HANDLER) { #endif diff --git a/plugins/coreaudio-encoder/encoder.cpp b/plugins/coreaudio-encoder/encoder.cpp index c306abdb0..434344552 100644 --- a/plugins/coreaudio-encoder/encoder.cpp +++ b/plugins/coreaudio-encoder/encoder.cpp @@ -1263,7 +1263,7 @@ bool obs_module_load(void) CA_LOG(LOG_INFO, "Adding CoreAudio AAC encoder"); #endif - struct obs_encoder_info aac_info {}; + struct obs_encoder_info aac_info{}; aac_info.id = "CoreAudio_AAC"; aac_info.type = OBS_ENCODER_AUDIO; aac_info.codec = "aac"; diff --git a/plugins/mac-capture/mac-display-capture.m b/plugins/mac-capture/mac-display-capture.m index 785dec8dc..eae9d3061 100644 --- a/plugins/mac-capture/mac-display-capture.m +++ b/plugins/mac-capture/mac-display-capture.m @@ -600,10 +600,10 @@ static obs_properties_t *display_capture_properties(void *unused) BOOL *_Nonnull stop __unused) { char dimension_buffer[4][12]; char name_buffer[256]; - snprintf(dimension_buffer[0], sizeof(dimension_buffer[0]), "%u", (uint32_t)[screen frame].size.width); - snprintf(dimension_buffer[1], sizeof(dimension_buffer[0]), "%u", (uint32_t)[screen frame].size.height); - snprintf(dimension_buffer[2], sizeof(dimension_buffer[0]), "%d", (int32_t)[screen frame].origin.x); - snprintf(dimension_buffer[3], sizeof(dimension_buffer[0]), "%d", (int32_t)[screen frame].origin.y); + snprintf(dimension_buffer[0], sizeof(dimension_buffer[0]), "%u", (uint32_t) [screen frame].size.width); + snprintf(dimension_buffer[1], sizeof(dimension_buffer[0]), "%u", (uint32_t) [screen frame].size.height); + snprintf(dimension_buffer[2], sizeof(dimension_buffer[0]), "%d", (int32_t) [screen frame].origin.x); + snprintf(dimension_buffer[3], sizeof(dimension_buffer[0]), "%d", (int32_t) [screen frame].origin.y); snprintf(name_buffer, sizeof(name_buffer), "%.200s: %.12sx%.12s @ %.12s,%.12s", [[screen localizedName] UTF8String], dimension_buffer[0], dimension_buffer[1], dimension_buffer[2], diff --git a/plugins/nv-filters/nvidia-videofx-filter.c b/plugins/nv-filters/nvidia-videofx-filter.c index 615f9fa27..427f74762 100644 --- a/plugins/nv-filters/nvidia-videofx-filter.c +++ b/plugins/nv-filters/nvidia-videofx-filter.c @@ -243,7 +243,7 @@ static bool nvvfx_filter_create_internal(struct nvvfx_data *filter) } if (NVCV_SUCCESS != vfxErr) log_nverror_destroy(filter, vfxErr); - /* debug */ + /* debug */ #ifdef _DEBUG const char *info; vfxErr = NvVFX_GetString(filter->handle_blur, NVVFX_INFO, &info); diff --git a/plugins/nv-filters/nvvfx-load.h b/plugins/nv-filters/nvvfx-load.h index 5b52c574f..7c9365ae8 100644 --- a/plugins/nv-filters/nvvfx-load.h +++ b/plugins/nv-filters/nvvfx-load.h @@ -252,7 +252,7 @@ typedef struct #ifdef _MSC_VER __declspec(dllexport) #endif // _MSC_VER - NvCVImage { + NvCVImage { unsigned int width; //!< The number of pixels horizontally in the image. unsigned int height; //!< The number of pixels vertically in the image. signed int pitch; //!< The byte stride between pixels vertically. diff --git a/plugins/obs-webrtc/whip-output.cpp b/plugins/obs-webrtc/whip-output.cpp index 05a0f4035..b9c7a4cd6 100644 --- a/plugins/obs-webrtc/whip-output.cpp +++ b/plugins/obs-webrtc/whip-output.cpp @@ -682,7 +682,7 @@ void register_whip_output() return obs_properties_create(); }; info.get_total_bytes = [](void *priv_data) -> uint64_t { - return (uint64_t) static_cast(priv_data)->GetTotalBytes(); + return (uint64_t)static_cast(priv_data)->GetTotalBytes(); }; info.get_connect_time_ms = [](void *priv_data) -> int { return static_cast(priv_data)->GetConnectTime(); diff --git a/shared/obs-scripting/obs-scripting-python.c b/shared/obs-scripting/obs-scripting-python.c index a650e841b..4b391282a 100644 --- a/shared/obs-scripting/obs-scripting-python.c +++ b/shared/obs-scripting/obs-scripting-python.c @@ -1599,7 +1599,7 @@ bool obs_scripting_load_python(const char *python_path) if (python_loaded) return true; - /* Use external python on windows and mac */ + /* Use external python on windows and mac */ #if RUNTIME_LINK if (!import_python(python_path, &python_version)) return false; diff --git a/shared/obs-scripting/obs-scripting.c b/shared/obs-scripting/obs-scripting.c index 2e67cfe9c..90db088bb 100644 --- a/shared/obs-scripting/obs-scripting.c +++ b/shared/obs-scripting/obs-scripting.c @@ -161,7 +161,7 @@ void obs_scripting_unload(void) if (!scripting_loaded) return; - /* ---------------------- */ + /* ---------------------- */ #if defined(LUAJIT_FOUND) obs_lua_unload();