Skip to content

Commit b120e2d

Browse files
mhoyer-streamlabsmhoyer-streamlabs
committed
Code review updates
1 parent 771746c commit b120e2d

7 files changed

Lines changed: 60 additions & 45 deletions

File tree

‎obs-studio-client/source/advanced-recording.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,14 +297,13 @@ Napi::Value osn::AdvancedRecording::GetStreaming(const Napi::CallbackInfo &info)
297297

298298
void osn::AdvancedRecording::SetStreaming(const Napi::CallbackInfo &info, const Napi::Value &value)
299299
{
300-
if (!streamingRef.IsEmpty())
301-
streamingRef.Reset();
302-
303300
auto conn = GetConnection(info);
304301
if (!conn)
305302
return;
306303

307304
if (value.IsNull() || value.IsUndefined()) {
305+
if (!streamingRef.IsEmpty())
306+
streamingRef.Reset();
308307
auto response = conn->call_synchronous_helper(className, "SetStreaming", {ipc::value(this->uid), ipc::value(UINT64_MAX)});
309308
ValidateResponse(info, response);
310309
return;
@@ -325,5 +324,7 @@ void osn::AdvancedRecording::SetStreaming(const Napi::CallbackInfo &info, const
325324
if (!ValidateResponse(info, response))
326325
return;
327326

327+
if (!streamingRef.IsEmpty())
328+
streamingRef.Reset();
328329
streamingRef = Napi::Persistent(obj);
329330
}

‎obs-studio-client/source/advanced-replay-buffer.cpp‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -196,14 +196,13 @@ Napi::Value osn::AdvancedReplayBuffer::GetStreaming(const Napi::CallbackInfo &in
196196

197197
void osn::AdvancedReplayBuffer::SetStreaming(const Napi::CallbackInfo &info, const Napi::Value &value)
198198
{
199-
if (!parentOutputRef.IsEmpty())
200-
parentOutputRef.Reset();
201-
202199
auto conn = GetConnection(info);
203200
if (!conn)
204201
return;
205202

206203
if (value.IsNull() || value.IsUndefined()) {
204+
if (!parentOutputRef.IsEmpty())
205+
parentOutputRef.Reset();
207206
auto response = conn->call_synchronous_helper(className, "SetStreaming", {ipc::value(this->uid), ipc::value(UINT64_MAX)});
208207
ValidateResponse(info, response);
209208
usesStream = false;
@@ -226,6 +225,8 @@ void osn::AdvancedReplayBuffer::SetStreaming(const Napi::CallbackInfo &info, con
226225
return;
227226

228227
usesStream = true;
228+
if (!parentOutputRef.IsEmpty())
229+
parentOutputRef.Reset();
229230
parentOutputRef = Napi::Persistent(obj);
230231
}
231232

@@ -240,17 +241,16 @@ Napi::Value osn::AdvancedReplayBuffer::GetRecording(const Napi::CallbackInfo &in
240241

241242
void osn::AdvancedReplayBuffer::SetRecording(const Napi::CallbackInfo &info, const Napi::Value &value)
242243
{
243-
if (!parentOutputRef.IsEmpty())
244-
parentOutputRef.Reset();
245-
246244
auto conn = GetConnection(info);
247245
if (!conn)
248246
return;
249247

250248
if (value.IsNull() || value.IsUndefined()) {
249+
if (!parentOutputRef.IsEmpty())
250+
parentOutputRef.Reset();
251251
auto response = conn->call_synchronous_helper(className, "SetRecording", {ipc::value(this->uid), ipc::value(UINT64_MAX)});
252252
ValidateResponse(info, response);
253-
usesStream = true;
253+
usesStream = false;
254254
return;
255255
}
256256

@@ -269,5 +269,7 @@ void osn::AdvancedReplayBuffer::SetRecording(const Napi::CallbackInfo &info, con
269269
return;
270270

271271
usesStream = false;
272+
if (!parentOutputRef.IsEmpty())
273+
parentOutputRef.Reset();
272274
parentOutputRef = Napi::Persistent(obj);
273275
}

‎obs-studio-client/source/recording.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,13 @@ Napi::Value osn::Recording::GetVideoEncoder(const Napi::CallbackInfo &info)
2727

2828
void osn::Recording::SetVideoEncoder(const Napi::CallbackInfo &info, const Napi::Value &value)
2929
{
30-
if (!videoEncoderRef.IsEmpty())
31-
videoEncoderRef.Reset();
32-
3330
auto conn = GetConnection(info);
3431
if (!conn)
3532
return;
3633

3734
if (value.IsNull() || value.IsUndefined()) {
35+
if (!videoEncoderRef.IsEmpty())
36+
videoEncoderRef.Reset();
3837
auto response = conn->call_synchronous_helper(className, "SetVideoEncoder", {ipc::value(this->uid), ipc::value(UINT64_MAX)});
3938
ValidateResponse(info, response);
4039
return;
@@ -55,6 +54,8 @@ void osn::Recording::SetVideoEncoder(const Napi::CallbackInfo &info, const Napi:
5554
if (!ValidateResponse(info, response))
5655
return;
5756

57+
if (!videoEncoderRef.IsEmpty())
58+
videoEncoderRef.Reset();
5859
videoEncoderRef = Napi::Persistent(obj);
5960
}
6061

‎obs-studio-client/source/simple-recording.cpp‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -171,14 +171,13 @@ Napi::Value osn::SimpleRecording::GetAudioEncoder(const Napi::CallbackInfo &info
171171

172172
void osn::SimpleRecording::SetAudioEncoder(const Napi::CallbackInfo &info, const Napi::Value &value)
173173
{
174-
if (!audioEncoderRef.IsEmpty())
175-
audioEncoderRef.Reset();
176-
177174
auto conn = GetConnection(info);
178175
if (!conn)
179176
return;
180177

181178
if (value.IsNull() || value.IsUndefined()) {
179+
if (!audioEncoderRef.IsEmpty())
180+
audioEncoderRef.Reset();
182181
auto response = conn->call_synchronous_helper(className, "SetAudioEncoder", {ipc::value(this->uid), ipc::value(UINT64_MAX)});
183182
ValidateResponse(info, response);
184183
return;
@@ -199,6 +198,8 @@ void osn::SimpleRecording::SetAudioEncoder(const Napi::CallbackInfo &info, const
199198
if (!ValidateResponse(info, response))
200199
return;
201200

201+
if (!audioEncoderRef.IsEmpty())
202+
audioEncoderRef.Reset();
202203
audioEncoderRef = Napi::Persistent(obj);
203204
}
204205

@@ -268,14 +269,13 @@ Napi::Value osn::SimpleRecording::GetStreaming(const Napi::CallbackInfo &info)
268269

269270
void osn::SimpleRecording::SetStreaming(const Napi::CallbackInfo &info, const Napi::Value &value)
270271
{
271-
if (!streamingRef.IsEmpty())
272-
streamingRef.Reset();
273-
274272
auto conn = GetConnection(info);
275273
if (!conn)
276274
return;
277275

278276
if (value.IsNull() || value.IsUndefined()) {
277+
if (!streamingRef.IsEmpty())
278+
streamingRef.Reset();
279279
auto response = conn->call_synchronous_helper(className, "SetStreaming", {ipc::value(this->uid), ipc::value(UINT64_MAX)});
280280
ValidateResponse(info, response);
281281
return;
@@ -296,5 +296,7 @@ void osn::SimpleRecording::SetStreaming(const Napi::CallbackInfo &info, const Na
296296
if (!ValidateResponse(info, response))
297297
return;
298298

299+
if (!streamingRef.IsEmpty())
300+
streamingRef.Reset();
299301
streamingRef = Napi::Persistent(obj);
300302
}

‎obs-studio-client/source/simple-replay-buffer.cpp‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -171,14 +171,13 @@ Napi::Value osn::SimpleReplayBuffer::GetStreaming(const Napi::CallbackInfo &info
171171

172172
void osn::SimpleReplayBuffer::SetStreaming(const Napi::CallbackInfo &info, const Napi::Value &value)
173173
{
174-
if (!parentOutputRef.IsEmpty())
175-
parentOutputRef.Reset();
176-
177174
auto conn = GetConnection(info);
178175
if (!conn)
179176
return;
180177

181178
if (value.IsNull() || value.IsUndefined()) {
179+
if (!parentOutputRef.IsEmpty())
180+
parentOutputRef.Reset();
182181
auto response = conn->call_synchronous_helper(className, "SetStreaming", {ipc::value(this->uid), ipc::value(UINT64_MAX)});
183182
ValidateResponse(info, response);
184183
usesStream = false;
@@ -201,6 +200,8 @@ void osn::SimpleReplayBuffer::SetStreaming(const Napi::CallbackInfo &info, const
201200
return;
202201

203202
usesStream = true;
203+
if (!parentOutputRef.IsEmpty())
204+
parentOutputRef.Reset();
204205
parentOutputRef = Napi::Persistent(obj);
205206
}
206207

@@ -215,17 +216,16 @@ Napi::Value osn::SimpleReplayBuffer::GetRecording(const Napi::CallbackInfo &info
215216

216217
void osn::SimpleReplayBuffer::SetRecording(const Napi::CallbackInfo &info, const Napi::Value &value)
217218
{
218-
if (!parentOutputRef.IsEmpty())
219-
parentOutputRef.Reset();
220-
221219
auto conn = GetConnection(info);
222220
if (!conn)
223221
return;
224222

225223
if (value.IsNull() || value.IsUndefined()) {
224+
if (!parentOutputRef.IsEmpty())
225+
parentOutputRef.Reset();
226226
auto response = conn->call_synchronous_helper(className, "SetRecording", {ipc::value(this->uid), ipc::value(UINT64_MAX)});
227227
ValidateResponse(info, response);
228-
usesStream = true;
228+
usesStream = false;
229229
return;
230230
}
231231

@@ -244,5 +244,7 @@ void osn::SimpleReplayBuffer::SetRecording(const Napi::CallbackInfo &info, const
244244
return;
245245

246246
usesStream = false;
247+
if (!parentOutputRef.IsEmpty())
248+
parentOutputRef.Reset();
247249
parentOutputRef = Napi::Persistent(obj);
248250
}

‎obs-studio-client/source/simple-streaming-base.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,13 @@ void osn::SimpleStreamingBase::SetCustomEncSettings(const Napi::CallbackInfo &in
7676

7777
void osn::SimpleStreamingBase::SetAudioEncoder(const Napi::CallbackInfo &info, const Napi::Value &value)
7878
{
79-
if (!audioEncoderRef.IsEmpty())
80-
audioEncoderRef.Reset();
81-
8279
auto conn = GetConnection(info);
8380
if (!conn)
8481
return;
8582

8683
if (value.IsNull() || value.IsUndefined()) {
84+
if (!audioEncoderRef.IsEmpty())
85+
audioEncoderRef.Reset();
8786
auto response = conn->call_synchronous_helper(className, "SetAudioEncoder", {ipc::value(this->uid), ipc::value(UINT64_MAX)});
8887
ValidateResponse(info, response);
8988
return;
@@ -104,5 +103,7 @@ void osn::SimpleStreamingBase::SetAudioEncoder(const Napi::CallbackInfo &info, c
104103
if (!ValidateResponse(info, response))
105104
return;
106105

106+
if (!audioEncoderRef.IsEmpty())
107+
audioEncoderRef.Reset();
107108
audioEncoderRef = Napi::Persistent(obj);
108109
}

‎obs-studio-client/source/streaming.cpp‎

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@ Napi::Value osn::Streaming::GetService(const Napi::CallbackInfo &info)
5353

5454
void osn::Streaming::SetService(const Napi::CallbackInfo &info, const Napi::Value &value)
5555
{
56-
if (!serviceRef.IsEmpty())
57-
serviceRef.Reset();
58-
5956
auto conn = GetConnection(info);
6057
if (!conn)
6158
return;
6259

6360
if (value.IsNull() || value.IsUndefined()) {
64-
conn->call(className, "SetService", {ipc::value(this->uid), ipc::value(UINT64_MAX)});
61+
if (!serviceRef.IsEmpty())
62+
serviceRef.Reset();
63+
auto response = conn->call_synchronous_helper(className, "SetService", {ipc::value(this->uid), ipc::value(UINT64_MAX)});
64+
ValidateResponse(info, response);
6565
return;
6666
}
6767

@@ -79,6 +79,8 @@ void osn::Streaming::SetService(const Napi::CallbackInfo &info, const Napi::Valu
7979
if (!ValidateResponse(info, response))
8080
return;
8181

82+
if (!serviceRef.IsEmpty())
83+
serviceRef.Reset();
8284
serviceRef = Napi::Persistent(obj);
8385
}
8486

@@ -122,14 +124,13 @@ Napi::Value osn::Streaming::GetVideoEncoder(const Napi::CallbackInfo &info)
122124

123125
void osn::Streaming::SetVideoEncoder(const Napi::CallbackInfo &info, const Napi::Value &value)
124126
{
125-
if (!videoEncoderRef.IsEmpty())
126-
videoEncoderRef.Reset();
127-
128127
auto conn = GetConnection(info);
129128
if (!conn)
130129
return;
131130

132131
if (value.IsNull() || value.IsUndefined()) {
132+
if (!videoEncoderRef.IsEmpty())
133+
videoEncoderRef.Reset();
133134
auto response = conn->call_synchronous_helper(className, "SetVideoEncoder", {ipc::value(this->uid), ipc::value(UINT64_MAX)});
134135
ValidateResponse(info, response);
135136
return;
@@ -150,6 +151,8 @@ void osn::Streaming::SetVideoEncoder(const Napi::CallbackInfo &info, const Napi:
150151
if (!ValidateResponse(info, response))
151152
return;
152153

154+
if (!videoEncoderRef.IsEmpty())
155+
videoEncoderRef.Reset();
153156
videoEncoderRef = Napi::Persistent(obj);
154157
}
155158

@@ -208,14 +211,13 @@ Napi::Value osn::Streaming::GetDelay(const Napi::CallbackInfo &info)
208211

209212
void osn::Streaming::SetDelay(const Napi::CallbackInfo &info, const Napi::Value &value)
210213
{
211-
if (!delayRef.IsEmpty())
212-
delayRef.Reset();
213-
214214
auto conn = GetConnection(info);
215215
if (!conn)
216216
return;
217217

218218
if (value.IsNull() || value.IsUndefined()) {
219+
if (!delayRef.IsEmpty())
220+
delayRef.Reset();
219221
auto response = conn->call_synchronous_helper(className, "SetDelay", {ipc::value(this->uid), ipc::value(UINT64_MAX)});
220222
ValidateResponse(info, response);
221223
return;
@@ -235,6 +237,8 @@ void osn::Streaming::SetDelay(const Napi::CallbackInfo &info, const Napi::Value
235237
if (!ValidateResponse(info, response))
236238
return;
237239

240+
if (!delayRef.IsEmpty())
241+
delayRef.Reset();
238242
delayRef = Napi::Persistent(obj);
239243
}
240244

@@ -245,14 +249,13 @@ Napi::Value osn::Streaming::GetReconnect(const Napi::CallbackInfo &info)
245249

246250
void osn::Streaming::SetReconnect(const Napi::CallbackInfo &info, const Napi::Value &value)
247251
{
248-
if (!reconnectRef.IsEmpty())
249-
reconnectRef.Reset();
250-
251252
auto conn = GetConnection(info);
252253
if (!conn)
253254
return;
254255

255256
if (value.IsNull() || value.IsUndefined()) {
257+
if (!reconnectRef.IsEmpty())
258+
reconnectRef.Reset();
256259
auto response = conn->call_synchronous_helper(className, "SetReconnect", {ipc::value(this->uid), ipc::value(UINT64_MAX)});
257260
ValidateResponse(info, response);
258261
return;
@@ -272,6 +275,8 @@ void osn::Streaming::SetReconnect(const Napi::CallbackInfo &info, const Napi::Va
272275
if (!ValidateResponse(info, response))
273276
return;
274277

278+
if (!reconnectRef.IsEmpty())
279+
reconnectRef.Reset();
275280
reconnectRef = Napi::Persistent(obj);
276281
}
277282

@@ -282,14 +287,13 @@ Napi::Value osn::Streaming::GetNetwork(const Napi::CallbackInfo &info)
282287

283288
void osn::Streaming::SetNetwork(const Napi::CallbackInfo &info, const Napi::Value &value)
284289
{
285-
if (!networkRef.IsEmpty())
286-
networkRef.Reset();
287-
288290
auto conn = GetConnection(info);
289291
if (!conn)
290292
return;
291293

292294
if (value.IsNull() || value.IsUndefined()) {
295+
if (!networkRef.IsEmpty())
296+
networkRef.Reset();
293297
auto response = conn->call_synchronous_helper(className, "SetNetwork", {ipc::value(this->uid), ipc::value(UINT64_MAX)});
294298
ValidateResponse(info, response);
295299
return;
@@ -309,6 +313,8 @@ void osn::Streaming::SetNetwork(const Napi::CallbackInfo &info, const Napi::Valu
309313
if (!ValidateResponse(info, response))
310314
return;
311315

316+
if (!networkRef.IsEmpty())
317+
networkRef.Reset();
312318
networkRef = Napi::Persistent(obj);
313319
}
314320

0 commit comments

Comments
 (0)