Browse Source

clang-format: Commit file changes for clang-format 12

Ryan Foster 4 years ago
parent
commit
5f68991911

+ 2 - 3
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] =

+ 2 - 2
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<FilterAudioSources_t *>(data))(
-				source);
+			return (*static_cast<FilterAudioSources_t *>(
+				data))(source);
 		},
 		static_cast<void *>(&FilterAudioSources));
 

+ 5 - 4
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,

+ 3 - 2
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");
 

+ 3 - 2
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);
 	}
 

+ 7 - 5
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);
 

+ 2 - 2
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")))

+ 8 - 8
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)