Skip to content

Commit 5370a60

Browse files
committed
base: Apply latest clang-format changes from upstream
This changes the formatting for the repository to clang-format 19.1.1, same as upstream obs-studio. New changes to .clang-format from obs-studio are brought over (see [1]), but the submodule-specific modifications are left in place (see [2]). [1]: obsproject/obs-studio@b3ab792 [2]: 5fc39ef
1 parent 79e53ad commit 5370a60

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

.clang-format

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ PenaltyReturnTypeOnItsOwnLine: 60
8181

8282
PointerAlignment: Right
8383
ReflowComments: false
84+
SkipMacroDefinitionBody: true
8485
SortIncludes: false
8586
SortUsingDeclarations: false
8687
SpaceAfterCStyleCast: false

src/requesthandler/RequestHandler_Inputs.cpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -940,8 +940,10 @@ RequestResult RequestHandler::SetInputDeinterlaceMode(const Request &request)
940940
return RequestResult::Error(RequestStatus::InvalidResourceState, "The specified input is not async.");
941941

942942
enum obs_deinterlace_mode deinterlaceMode = request.RequestData["inputDeinterlaceMode"];
943-
if (deinterlaceMode == OBS_DEINTERLACE_MODE_DISABLE && request.RequestData["inputDeinterlaceMode"] != "OBS_DEINTERLACE_MODE_DISABLE")
944-
return RequestResult::Error(RequestStatus::InvalidRequestField, "The field inputDeinterlaceMode has an invalid value.");
943+
if (deinterlaceMode == OBS_DEINTERLACE_MODE_DISABLE &&
944+
request.RequestData["inputDeinterlaceMode"] != "OBS_DEINTERLACE_MODE_DISABLE")
945+
return RequestResult::Error(RequestStatus::InvalidRequestField,
946+
"The field inputDeinterlaceMode has an invalid value.");
945947

946948
obs_source_set_deinterlace_mode(input, deinterlaceMode);
947949

@@ -1015,8 +1017,10 @@ RequestResult RequestHandler::SetInputDeinterlaceFieldOrder(const Request &reque
10151017
return RequestResult::Error(RequestStatus::InvalidResourceState, "The specified input is not async.");
10161018

10171019
enum obs_deinterlace_field_order deinterlaceFieldOrder = request.RequestData["inputDeinterlaceFieldOrder"];
1018-
if (deinterlaceFieldOrder == OBS_DEINTERLACE_FIELD_ORDER_TOP && request.RequestData["inputDeinterlaceFieldOrder"] != "OBS_DEINTERLACE_FIELD_ORDER_TOP")
1019-
return RequestResult::Error(RequestStatus::InvalidRequestField, "The field inputDeinterlaceFieldOrder has an invalid value.");
1020+
if (deinterlaceFieldOrder == OBS_DEINTERLACE_FIELD_ORDER_TOP &&
1021+
request.RequestData["inputDeinterlaceFieldOrder"] != "OBS_DEINTERLACE_FIELD_ORDER_TOP")
1022+
return RequestResult::Error(RequestStatus::InvalidRequestField,
1023+
"The field inputDeinterlaceFieldOrder has an invalid value.");
10201024

10211025
obs_source_set_deinterlace_field_order(input, deinterlaceFieldOrder);
10221026

0 commit comments

Comments
 (0)