Skip to content

Commit 1088ec8

Browse files
Warchamp7Warchamp7
committed
requesthandler: Rename "Get" style object requests to "Acquire"
Just a visual change. "Acquire" is used to indicate that these methods return resources with an incremented ref.
1 parent 6992493 commit 1088ec8

10 files changed

+107
-103
lines changed

‎src/requesthandler/RequestHandler_Filters.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ RequestResult RequestHandler::GetSourceFilterList(const Request &request)
6060
{
6161
RequestStatus::RequestStatus statusCode;
6262
std::string comment;
63-
OBSSourceAutoRelease source = request.GetSource("canvasUuid", "sourceName", "sourceUuid", statusCode, comment);
63+
OBSSourceAutoRelease source = request.AcquireSource("canvasUuid", "sourceName", "sourceUuid", statusCode, comment);
6464
if (!source)
6565
return RequestResult::Error(statusCode, comment);
6666

@@ -127,7 +127,7 @@ RequestResult RequestHandler::CreateSourceFilter(const Request &request)
127127
RequestStatus::RequestStatus statusCode;
128128
std::string comment;
129129

130-
OBSSourceAutoRelease source = request.GetSource("canvasUuid", "sourceName", "sourceUuid", statusCode, comment);
130+
OBSSourceAutoRelease source = request.AcquireSource("canvasUuid", "sourceName", "sourceUuid", statusCode, comment);
131131
if (!(source && request.ValidateString("filterName", statusCode, comment) &&
132132
request.ValidateString("filterKind", statusCode, comment)))
133133
return RequestResult::Error(statusCode, comment);
@@ -179,7 +179,7 @@ RequestResult RequestHandler::RemoveSourceFilter(const Request &request)
179179
{
180180
RequestStatus::RequestStatus statusCode;
181181
std::string comment;
182-
FilterPair pair = request.GetFilter(statusCode, comment);
182+
FilterPair pair = request.AcquireFilter(statusCode, comment);
183183
if (!pair.filter)
184184
return RequestResult::Error(statusCode, comment);
185185

@@ -208,7 +208,7 @@ RequestResult RequestHandler::SetSourceFilterName(const Request &request)
208208
{
209209
RequestStatus::RequestStatus statusCode;
210210
std::string comment;
211-
FilterPair pair = request.GetFilter(statusCode, comment);
211+
FilterPair pair = request.AcquireFilter(statusCode, comment);
212212
if (!pair.filter || !request.ValidateString("newFilterName", statusCode, comment))
213213
return RequestResult::Error(statusCode, comment);
214214

@@ -247,7 +247,7 @@ RequestResult RequestHandler::GetSourceFilter(const Request &request)
247247
{
248248
RequestStatus::RequestStatus statusCode;
249249
std::string comment;
250-
FilterPair pair = request.GetFilter(statusCode, comment);
250+
FilterPair pair = request.AcquireFilter(statusCode, comment);
251251
if (!pair.filter)
252252
return RequestResult::Error(statusCode, comment);
253253

@@ -284,7 +284,7 @@ RequestResult RequestHandler::SetSourceFilterIndex(const Request &request)
284284
{
285285
RequestStatus::RequestStatus statusCode;
286286
std::string comment;
287-
FilterPair pair = request.GetFilter(statusCode, comment);
287+
FilterPair pair = request.AcquireFilter(statusCode, comment);
288288
if (!(pair.filter && request.ValidateNumber("filterIndex", statusCode, comment, 0, 8192)))
289289
return RequestResult::Error(statusCode, comment);
290290

@@ -316,7 +316,7 @@ RequestResult RequestHandler::SetSourceFilterSettings(const Request &request)
316316
{
317317
RequestStatus::RequestStatus statusCode;
318318
std::string comment;
319-
FilterPair pair = request.GetFilter(statusCode, comment);
319+
FilterPair pair = request.AcquireFilter(statusCode, comment);
320320
if (!(pair.filter && request.ValidateObject("filterSettings", statusCode, comment, true)))
321321
return RequestResult::Error(statusCode, comment);
322322

@@ -365,7 +365,7 @@ RequestResult RequestHandler::SetSourceFilterEnabled(const Request &request)
365365
{
366366
RequestStatus::RequestStatus statusCode;
367367
std::string comment;
368-
FilterPair pair = request.GetFilter(statusCode, comment);
368+
FilterPair pair = request.AcquireFilter(statusCode, comment);
369369
if (!(pair.filter && request.ValidateBoolean("filterEnabled", statusCode, comment)))
370370
return RequestResult::Error(statusCode, comment);
371371

‎src/requesthandler/RequestHandler_Inputs.cpp‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ RequestResult RequestHandler::CreateInput(const Request &request)
145145
{
146146
RequestStatus::RequestStatus statusCode;
147147
std::string comment;
148-
OBSSourceAutoRelease sceneSource = request.GetScene(statusCode, comment);
148+
OBSSourceAutoRelease sceneSource = request.AcquireScene(statusCode, comment);
149149
if (!(sceneSource && request.ValidateString("inputName", statusCode, comment) &&
150150
request.ValidateString("inputKind", statusCode, comment)))
151151
return RequestResult::Error(statusCode, comment);
@@ -212,7 +212,7 @@ RequestResult RequestHandler::RemoveInput(const Request &request)
212212
{
213213
RequestStatus::RequestStatus statusCode;
214214
std::string comment;
215-
OBSSourceAutoRelease input = request.GetInput(statusCode, comment);
215+
OBSSourceAutoRelease input = request.AcquireInput(statusCode, comment);
216216
if (!input)
217217
return RequestResult::Error(statusCode, comment);
218218

@@ -242,7 +242,7 @@ RequestResult RequestHandler::SetInputName(const Request &request)
242242
{
243243
RequestStatus::RequestStatus statusCode;
244244
std::string comment;
245-
OBSSourceAutoRelease input = request.GetInput(statusCode, comment);
245+
OBSSourceAutoRelease input = request.AcquireInput(statusCode, comment);
246246
if (!(input && request.ValidateString("newInputName", statusCode, comment)))
247247
return RequestResult::Error(statusCode, comment);
248248

@@ -315,7 +315,7 @@ RequestResult RequestHandler::GetInputSettings(const Request &request)
315315
{
316316
RequestStatus::RequestStatus statusCode;
317317
std::string comment;
318-
OBSSourceAutoRelease input = request.GetInput(statusCode, comment);
318+
OBSSourceAutoRelease input = request.AcquireInput(statusCode, comment);
319319
if (!input)
320320
return RequestResult::Error(statusCode, comment);
321321

@@ -346,7 +346,7 @@ RequestResult RequestHandler::SetInputSettings(const Request &request)
346346
{
347347
RequestStatus::RequestStatus statusCode;
348348
std::string comment;
349-
OBSSourceAutoRelease input = request.GetInput(statusCode, comment);
349+
OBSSourceAutoRelease input = request.AcquireInput(statusCode, comment);
350350
if (!(input && request.ValidateObject("inputSettings", statusCode, comment, true)))
351351
return RequestResult::Error(statusCode, comment);
352352

@@ -397,7 +397,7 @@ RequestResult RequestHandler::GetInputMute(const Request &request)
397397
{
398398
RequestStatus::RequestStatus statusCode;
399399
std::string comment;
400-
OBSSourceAutoRelease input = request.GetInput(statusCode, comment);
400+
OBSSourceAutoRelease input = request.AcquireInput(statusCode, comment);
401401
if (!input)
402402
return RequestResult::Error(statusCode, comment);
403403

@@ -427,7 +427,7 @@ RequestResult RequestHandler::SetInputMute(const Request &request)
427427
{
428428
RequestStatus::RequestStatus statusCode;
429429
std::string comment;
430-
OBSSourceAutoRelease input = request.GetInput(statusCode, comment);
430+
OBSSourceAutoRelease input = request.AcquireInput(statusCode, comment);
431431
if (!(input && request.ValidateBoolean("inputMuted", statusCode, comment)))
432432
return RequestResult::Error(statusCode, comment);
433433

@@ -458,7 +458,7 @@ RequestResult RequestHandler::ToggleInputMute(const Request &request)
458458
{
459459
RequestStatus::RequestStatus statusCode;
460460
std::string comment;
461-
OBSSourceAutoRelease input = request.GetInput(statusCode, comment);
461+
OBSSourceAutoRelease input = request.AcquireInput(statusCode, comment);
462462
if (!input)
463463
return RequestResult::Error(statusCode, comment);
464464

@@ -493,7 +493,7 @@ RequestResult RequestHandler::GetInputVolume(const Request &request)
493493
{
494494
RequestStatus::RequestStatus statusCode;
495495
std::string comment;
496-
OBSSourceAutoRelease input = request.GetInput(statusCode, comment);
496+
OBSSourceAutoRelease input = request.AcquireInput(statusCode, comment);
497497
if (!input)
498498
return RequestResult::Error(statusCode, comment);
499499

@@ -530,7 +530,7 @@ RequestResult RequestHandler::SetInputVolume(const Request &request)
530530
{
531531
RequestStatus::RequestStatus statusCode;
532532
std::string comment;
533-
OBSSourceAutoRelease input = request.GetInput(statusCode, comment);
533+
OBSSourceAutoRelease input = request.AcquireInput(statusCode, comment);
534534
if (!input)
535535
return RequestResult::Error(statusCode, comment);
536536

@@ -581,7 +581,7 @@ RequestResult RequestHandler::GetInputAudioBalance(const Request &request)
581581
{
582582
RequestStatus::RequestStatus statusCode;
583583
std::string comment;
584-
OBSSourceAutoRelease input = request.GetInput(statusCode, comment);
584+
OBSSourceAutoRelease input = request.AcquireInput(statusCode, comment);
585585
if (!input)
586586
return RequestResult::Error(statusCode, comment);
587587

@@ -612,7 +612,7 @@ RequestResult RequestHandler::SetInputAudioBalance(const Request &request)
612612
{
613613
RequestStatus::RequestStatus statusCode;
614614
std::string comment;
615-
OBSSourceAutoRelease input = request.GetInput(statusCode, comment);
615+
OBSSourceAutoRelease input = request.AcquireInput(statusCode, comment);
616616
if (!(input && request.ValidateNumber("inputAudioBalance", statusCode, comment, 0.0, 1.0)))
617617
return RequestResult::Error(statusCode, comment);
618618

@@ -646,7 +646,7 @@ RequestResult RequestHandler::GetInputAudioSyncOffset(const Request &request)
646646
{
647647
RequestStatus::RequestStatus statusCode;
648648
std::string comment;
649-
OBSSourceAutoRelease input = request.GetInput(statusCode, comment);
649+
OBSSourceAutoRelease input = request.AcquireInput(statusCode, comment);
650650
if (!input)
651651
return RequestResult::Error(statusCode, comment);
652652

@@ -678,7 +678,7 @@ RequestResult RequestHandler::SetInputAudioSyncOffset(const Request &request)
678678
{
679679
RequestStatus::RequestStatus statusCode;
680680
std::string comment;
681-
OBSSourceAutoRelease input = request.GetInput(statusCode, comment);
681+
OBSSourceAutoRelease input = request.AcquireInput(statusCode, comment);
682682
if (!(input && request.ValidateNumber("inputAudioSyncOffset", statusCode, comment, -950, 20000)))
683683
return RequestResult::Error(statusCode, comment);
684684

@@ -716,7 +716,7 @@ RequestResult RequestHandler::GetInputAudioMonitorType(const Request &request)
716716
{
717717
RequestStatus::RequestStatus statusCode;
718718
std::string comment;
719-
OBSSourceAutoRelease input = request.GetInput(statusCode, comment);
719+
OBSSourceAutoRelease input = request.AcquireInput(statusCode, comment);
720720
if (!input)
721721
return RequestResult::Error(statusCode, comment);
722722

@@ -747,7 +747,7 @@ RequestResult RequestHandler::SetInputAudioMonitorType(const Request &request)
747747
{
748748
RequestStatus::RequestStatus statusCode;
749749
std::string comment;
750-
OBSSourceAutoRelease input = request.GetInput(statusCode, comment);
750+
OBSSourceAutoRelease input = request.AcquireInput(statusCode, comment);
751751
if (!(input && request.ValidateString("monitorType", statusCode, comment)))
752752
return RequestResult::Error(statusCode, comment);
753753

@@ -794,7 +794,7 @@ RequestResult RequestHandler::GetInputAudioTracks(const Request &request)
794794
{
795795
RequestStatus::RequestStatus statusCode;
796796
std::string comment;
797-
OBSSourceAutoRelease input = request.GetInput(statusCode, comment);
797+
OBSSourceAutoRelease input = request.AcquireInput(statusCode, comment);
798798
if (!input)
799799
return RequestResult::Error(statusCode, comment);
800800

@@ -832,7 +832,7 @@ RequestResult RequestHandler::SetInputAudioTracks(const Request &request)
832832
{
833833
RequestStatus::RequestStatus statusCode;
834834
std::string comment;
835-
OBSSourceAutoRelease input = request.GetInput(statusCode, comment);
835+
OBSSourceAutoRelease input = request.AcquireInput(statusCode, comment);
836836
if (!input || !request.ValidateObject("inputAudioTracks", statusCode, comment))
837837
return RequestResult::Error(statusCode, comment);
838838

@@ -900,7 +900,7 @@ RequestResult RequestHandler::GetInputDeinterlaceMode(const Request &request)
900900
{
901901
RequestStatus::RequestStatus statusCode;
902902
std::string comment;
903-
OBSSourceAutoRelease input = request.GetInput(statusCode, comment);
903+
OBSSourceAutoRelease input = request.AcquireInput(statusCode, comment);
904904
if (!input)
905905
return RequestResult::Error(statusCode, comment);
906906

@@ -933,7 +933,7 @@ RequestResult RequestHandler::SetInputDeinterlaceMode(const Request &request)
933933
{
934934
RequestStatus::RequestStatus statusCode;
935935
std::string comment;
936-
OBSSourceAutoRelease input = request.GetInput(statusCode, comment);
936+
OBSSourceAutoRelease input = request.AcquireInput(statusCode, comment);
937937
if (!input || !request.ValidateString("inputDeinterlaceMode", statusCode, comment))
938938
return RequestResult::Error(statusCode, comment);
939939

@@ -977,7 +977,7 @@ RequestResult RequestHandler::GetInputDeinterlaceFieldOrder(const Request &reque
977977
{
978978
RequestStatus::RequestStatus statusCode;
979979
std::string comment;
980-
OBSSourceAutoRelease input = request.GetInput(statusCode, comment);
980+
OBSSourceAutoRelease input = request.AcquireInput(statusCode, comment);
981981
if (!input)
982982
return RequestResult::Error(statusCode, comment);
983983

@@ -1010,7 +1010,7 @@ RequestResult RequestHandler::SetInputDeinterlaceFieldOrder(const Request &reque
10101010
{
10111011
RequestStatus::RequestStatus statusCode;
10121012
std::string comment;
1013-
OBSSourceAutoRelease input = request.GetInput(statusCode, comment);
1013+
OBSSourceAutoRelease input = request.AcquireInput(statusCode, comment);
10141014
if (!input || !request.ValidateString("inputDeinterlaceFieldOrder", statusCode, comment))
10151015
return RequestResult::Error(statusCode, comment);
10161016

@@ -1050,7 +1050,7 @@ RequestResult RequestHandler::GetInputPropertiesListPropertyItems(const Request
10501050
{
10511051
RequestStatus::RequestStatus statusCode;
10521052
std::string comment;
1053-
OBSSourceAutoRelease input = request.GetInput(statusCode, comment);
1053+
OBSSourceAutoRelease input = request.AcquireInput(statusCode, comment);
10541054
if (!(input && request.ValidateString("propertyName", statusCode, comment)))
10551055
return RequestResult::Error(statusCode, comment);
10561056

@@ -1093,7 +1093,7 @@ RequestResult RequestHandler::PressInputPropertiesButton(const Request &request)
10931093
{
10941094
RequestStatus::RequestStatus statusCode;
10951095
std::string comment;
1096-
OBSSourceAutoRelease input = request.GetInput(statusCode, comment);
1096+
OBSSourceAutoRelease input = request.AcquireInput(statusCode, comment);
10971097
if (!(input && request.ValidateString("propertyName", statusCode, comment)))
10981098
return RequestResult::Error(statusCode, comment);
10991099

‎src/requesthandler/RequestHandler_MediaInputs.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ RequestResult RequestHandler::GetMediaInputStatus(const Request &request)
5757
{
5858
RequestStatus::RequestStatus statusCode;
5959
std::string comment;
60-
OBSSourceAutoRelease input = request.GetInput(statusCode, comment);
60+
OBSSourceAutoRelease input = request.AcquireInput(statusCode, comment);
6161
if (!input)
6262
return RequestResult::Error(statusCode, comment);
6363

@@ -96,7 +96,7 @@ RequestResult RequestHandler::SetMediaInputCursor(const Request &request)
9696
{
9797
RequestStatus::RequestStatus statusCode;
9898
std::string comment;
99-
OBSSourceAutoRelease input = request.GetInput(statusCode, comment);
99+
OBSSourceAutoRelease input = request.AcquireInput(statusCode, comment);
100100
if (!(input && request.ValidateNumber("mediaCursor", statusCode, comment, 0)))
101101
return RequestResult::Error(statusCode, comment);
102102

@@ -132,7 +132,7 @@ RequestResult RequestHandler::OffsetMediaInputCursor(const Request &request)
132132
{
133133
RequestStatus::RequestStatus statusCode;
134134
std::string comment;
135-
OBSSourceAutoRelease input = request.GetInput(statusCode, comment);
135+
OBSSourceAutoRelease input = request.AcquireInput(statusCode, comment);
136136
if (!(input && request.ValidateNumber("mediaCursorOffset", statusCode, comment)))
137137
return RequestResult::Error(statusCode, comment);
138138

@@ -169,7 +169,7 @@ RequestResult RequestHandler::TriggerMediaInputAction(const Request &request)
169169
{
170170
RequestStatus::RequestStatus statusCode;
171171
std::string comment;
172-
OBSSourceAutoRelease input = request.GetInput(statusCode, comment);
172+
OBSSourceAutoRelease input = request.AcquireInput(statusCode, comment);
173173
if (!(input && request.ValidateString("mediaAction", statusCode, comment)))
174174
return RequestResult::Error(statusCode, comment);
175175

‎src/requesthandler/RequestHandler_Outputs.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ RequestResult RequestHandler::GetOutputStatus(const Request &request)
317317
{
318318
RequestStatus::RequestStatus statusCode;
319319
std::string comment;
320-
OBSOutputAutoRelease output = request.GetOutput("outputName", statusCode, comment);
320+
OBSOutputAutoRelease output = request.AcquireOutput("outputName", statusCode, comment);
321321
if (!output)
322322
return RequestResult::Error(statusCode, comment);
323323

@@ -354,7 +354,7 @@ RequestResult RequestHandler::ToggleOutput(const Request &request)
354354
{
355355
RequestStatus::RequestStatus statusCode;
356356
std::string comment;
357-
OBSOutputAutoRelease output = request.GetOutput("outputName", statusCode, comment);
357+
OBSOutputAutoRelease output = request.AcquireOutput("outputName", statusCode, comment);
358358
if (!output)
359359
return RequestResult::Error(statusCode, comment);
360360

@@ -385,7 +385,7 @@ RequestResult RequestHandler::StartOutput(const Request &request)
385385
{
386386
RequestStatus::RequestStatus statusCode;
387387
std::string comment;
388-
OBSOutputAutoRelease output = request.GetOutput("outputName", statusCode, comment);
388+
OBSOutputAutoRelease output = request.AcquireOutput("outputName", statusCode, comment);
389389
if (!output)
390390
return RequestResult::Error(statusCode, comment);
391391

@@ -413,7 +413,7 @@ RequestResult RequestHandler::StopOutput(const Request &request)
413413
{
414414
RequestStatus::RequestStatus statusCode;
415415
std::string comment;
416-
OBSOutputAutoRelease output = request.GetOutput("outputName", statusCode, comment);
416+
OBSOutputAutoRelease output = request.AcquireOutput("outputName", statusCode, comment);
417417
if (!output)
418418
return RequestResult::Error(statusCode, comment);
419419

@@ -443,7 +443,7 @@ RequestResult RequestHandler::GetOutputSettings(const Request &request)
443443
{
444444
RequestStatus::RequestStatus statusCode;
445445
std::string comment;
446-
OBSOutputAutoRelease output = request.GetOutput("outputName", statusCode, comment);
446+
OBSOutputAutoRelease output = request.AcquireOutput("outputName", statusCode, comment);
447447
if (!output)
448448
return RequestResult::Error(statusCode, comment);
449449

@@ -471,7 +471,7 @@ RequestResult RequestHandler::SetOutputSettings(const Request &request)
471471
{
472472
RequestStatus::RequestStatus statusCode;
473473
std::string comment;
474-
OBSOutputAutoRelease output = request.GetOutput("outputName", statusCode, comment);
474+
OBSOutputAutoRelease output = request.AcquireOutput("outputName", statusCode, comment);
475475
if (!(output && request.ValidateObject("outputSettings", statusCode, comment, true)))
476476
return RequestResult::Error(statusCode, comment);
477477

0 commit comments

Comments
 (0)