From 5f689919113a955c4533bb9ef603c67302a9396c Mon Sep 17 00:00:00 2001 From: Ryan Foster Date: Wed, 13 Oct 2021 01:08:31 -0400 Subject: [PATCH] clang-format: Commit file changes for clang-format 12 --- UI/volume-control.cpp | 5 ++--- UI/window-basic-main.cpp | 4 ++-- libobs-opengl/gl-x11-egl.c | 9 +++++---- libobs/media-io/audio-io.c | 5 +++-- libobs/util/cf-lexer.c | 5 +++-- libobs/util/platform-windows.c | 12 +++++++----- libobs/util/simde/hedley.h | 4 ++-- libobs/util/simde/simde-common.h | 16 ++++++++-------- 8 files changed, 32 insertions(+), 28 deletions(-) diff --git a/UI/volume-control.cpp b/UI/volume-control.cpp index 56e5631d1..d7e383cd9 100644 --- a/UI/volume-control.cpp +++ b/UI/volume-control.cpp @@ -727,9 +727,8 @@ VolumeMeter::calculateBallisticsForChannel(int channelNr, uint64_t ts, } else { // The peak and hold falls back to peak after 1 second. qreal timeSinceLastPeak = - (uint64_t)( - ts - - displayInputPeakHoldLastUpdateTime[channelNr]) * + (uint64_t)(ts - + displayInputPeakHoldLastUpdateTime[channelNr]) * 0.000000001; if (timeSinceLastPeak > inputPeakHoldDuration) { displayInputPeakHold[channelNr] = diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp index 3f43d89ce..9b4b08957 100644 --- a/UI/window-basic-main.cpp +++ b/UI/window-basic-main.cpp @@ -512,8 +512,8 @@ static obs_data_t *GenerateSaveData(obs_data_array_t *sceneOrder, obs_data_array_t *sourcesArray = obs_save_sources_filtered( [](void *data, obs_source_t *source) { - return (*static_cast(data))( - source); + return (*static_cast( + data))(source); }, static_cast(&FilterAudioSources)); diff --git a/libobs-opengl/gl-x11-egl.c b/libobs-opengl/gl-x11-egl.c index 295540fa0..8c1bea155 100644 --- a/libobs-opengl/gl-x11-egl.c +++ b/libobs-opengl/gl-x11-egl.c @@ -203,10 +203,11 @@ static EGLDisplay get_egl_display(struct gl_platform *plat) egl_client_extensions = eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS); PFNEGLGETPLATFORMDISPLAYEXTPROC eglGetPlatformDisplayEXT = - (PFNEGLGETPLATFORMDISPLAYEXTPROC)( - strstr(egl_client_extensions, "EGL_EXT_platform_base") - ? eglGetProcAddress("eglGetPlatformDisplayEXT") - : NULL); + (PFNEGLGETPLATFORMDISPLAYEXTPROC)(strstr(egl_client_extensions, + "EGL_EXT_platform_base") + ? eglGetProcAddress( + "eglGetPlatformDisplayEXT") + : NULL); if (eglGetPlatformDisplayEXT) { edisplay = eglGetPlatformDisplayEXT(EGL_PLATFORM_X11_EXT, diff --git a/libobs/media-io/audio-io.c b/libobs/media-io/audio-io.c index 653be56ca..dc93bfeaf 100644 --- a/libobs/media-io/audio-io.c +++ b/libobs/media-io/audio-io.c @@ -214,8 +214,9 @@ static void *audio_thread(void *param) uint64_t start_time = os_gettime_ns(); uint64_t prev_time = start_time; uint64_t audio_time = prev_time; - uint32_t audio_wait_time = (uint32_t)( - audio_frames_to_ns(rate, AUDIO_OUTPUT_FRAMES) / 1000000); + uint32_t audio_wait_time = + (uint32_t)(audio_frames_to_ns(rate, AUDIO_OUTPUT_FRAMES) / + 1000000); os_set_thread_name("audio-io: audio thread"); diff --git a/libobs/util/cf-lexer.c b/libobs/util/cf-lexer.c index 5349b4f14..726c12c1d 100644 --- a/libobs/util/cf-lexer.c +++ b/libobs/util/cf-lexer.c @@ -393,8 +393,9 @@ static bool cf_lexer_nexttoken(struct cf_lexer *lex, struct cf_token *out_token) } if (wrote_data) { - out_token->unmerged_str.len = (size_t)( - lex->base_lexer.offset - out_token->unmerged_str.array); + out_token->unmerged_str.len = + (size_t)(lex->base_lexer.offset - + out_token->unmerged_str.array); out_token->type = cf_get_token_type(out_token, &start_token); } diff --git a/libobs/util/platform-windows.c b/libobs/util/platform-windows.c index e1d95577f..34c459d31 100644 --- a/libobs/util/platform-windows.c +++ b/libobs/util/platform-windows.c @@ -224,9 +224,10 @@ bool os_is_obs_plugin(const char *path) /* get a pointer to the export directory */ PIMAGE_EXPORT_DIRECTORY export; - export = (PIMAGE_EXPORT_DIRECTORY)( - (byte *)base + data_dir->VirtualAddress - - section->VirtualAddress + section->PointerToRawData); + export = (PIMAGE_EXPORT_DIRECTORY)((byte *)base + + data_dir->VirtualAddress - + section->VirtualAddress + + section->PointerToRawData); if (export->NumberOfNames == 0) goto cleanup; @@ -339,8 +340,9 @@ bool os_sleepto_ns(uint64_t time_target) const bool stall = count.QuadPart < count_target; if (stall) { - const DWORD milliseconds = (DWORD)( - ((count_target - count.QuadPart) * 1000.0) / freq); + const DWORD milliseconds = + (DWORD)(((count_target - count.QuadPart) * 1000.0) / + freq); if (milliseconds > 1) Sleep(milliseconds - 1); diff --git a/libobs/util/simde/hedley.h b/libobs/util/simde/hedley.h index d8fed3b74..6d9995a48 100644 --- a/libobs/util/simde/hedley.h +++ b/libobs/util/simde/hedley.h @@ -2020,12 +2020,12 @@ HEDLEY_DIAGNOSTIC_POP HEDLEY_DIAGNOSTIC_PUSH \ _Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \ __attribute__((diagnose_if(!(expr), #expr, "error"))) \ - HEDLEY_DIAGNOSTIC_POP + HEDLEY_DIAGNOSTIC_POP #define HEDLEY_REQUIRE_MSG(expr, msg) \ HEDLEY_DIAGNOSTIC_PUSH \ _Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \ __attribute__((diagnose_if(!(expr), msg, "error"))) \ - HEDLEY_DIAGNOSTIC_POP + HEDLEY_DIAGNOSTIC_POP #else #define HEDLEY_REQUIRE(expr) \ __attribute__((diagnose_if(!(expr), #expr, "error"))) diff --git a/libobs/util/simde/simde-common.h b/libobs/util/simde/simde-common.h index 8b8da2ba4..42ef56893 100644 --- a/libobs/util/simde/simde-common.h +++ b/libobs/util/simde/simde-common.h @@ -902,14 +902,14 @@ HEDLEY_DIAGNOSTIC_POP #if (HEDLEY_HAS_WARNING("-Wsign-conversion") && \ SIMDE_DETECT_CLANG_VERSION_NOT(11, 0, 0)) || \ HEDLEY_GCC_VERSION_CHECK(4, 3, 0) -#define SIMDE_BUG_IGNORE_SIGN_CONVERSION(expr) \ - (__extension__({ \ - HEDLEY_DIAGNOSTIC_PUSH \ - HEDLEY_DIAGNOSTIC_POP \ - _Pragma("GCC diagnostic ignored \"-Wsign-conversion\"") __typeof__( \ - expr) simde_bug_ignore_sign_conversion_v_ = (expr); \ - HEDLEY_DIAGNOSTIC_PUSH \ - simde_bug_ignore_sign_conversion_v_; \ +#define SIMDE_BUG_IGNORE_SIGN_CONVERSION(expr) \ + (__extension__({ \ + HEDLEY_DIAGNOSTIC_PUSH \ + HEDLEY_DIAGNOSTIC_POP \ + _Pragma("GCC diagnostic ignored \"-Wsign-conversion\"") __typeof__(expr) \ + simde_bug_ignore_sign_conversion_v_ = (expr); \ + HEDLEY_DIAGNOSTIC_PUSH \ + simde_bug_ignore_sign_conversion_v_; \ })) #else #define SIMDE_BUG_IGNORE_SIGN_CONVERSION(expr) (expr)