Skip to content

Commit 9f211b5

Browse files
avoitenko-logitechavoitenko-logitech
committed
Clang format
1 parent dabe446 commit 9f211b5

18 files changed

+254
-229
lines changed

‎obs-studio-client/source/enhanced-broadcasting-advanced-streaming.cpp‎

Lines changed: 30 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,31 +34,43 @@ Napi::Object osn::EnhancedBroadcastingAdvancedStreaming::Init(Napi::Env env, Nap
3434
{StaticMethod("create", &osn::EnhancedBroadcastingAdvancedStreaming::Create),
3535
StaticMethod("destroy", &osn::EnhancedBroadcastingAdvancedStreaming::Destroy),
3636

37-
InstanceAccessor("videoEncoder", &osn::EnhancedBroadcastingAdvancedStreaming::GetVideoEncoder, &osn::EnhancedBroadcastingAdvancedStreaming::SetVideoEncoder),
37+
InstanceAccessor("videoEncoder", &osn::EnhancedBroadcastingAdvancedStreaming::GetVideoEncoder,
38+
&osn::EnhancedBroadcastingAdvancedStreaming::SetVideoEncoder),
3839
InstanceAccessor("service", &osn::EnhancedBroadcastingAdvancedStreaming::GetService, &osn::EnhancedBroadcastingAdvancedStreaming::SetService),
39-
InstanceAccessor("enforceServiceBitrate", &osn::EnhancedBroadcastingAdvancedStreaming::GetEnforceServiceBirate, &osn::EnhancedBroadcastingAdvancedStreaming::SetEnforceServiceBirate),
40-
InstanceAccessor("enableTwitchVOD", &osn::EnhancedBroadcastingAdvancedStreaming::GetEnableTwitchVOD, &osn::EnhancedBroadcastingAdvancedStreaming::SetEnableTwitchVOD),
41-
InstanceAccessor("signalHandler", &osn::EnhancedBroadcastingAdvancedStreaming::GetSignalHandler, &osn::EnhancedBroadcastingAdvancedStreaming::SetSignalHandler),
40+
InstanceAccessor("enforceServiceBitrate", &osn::EnhancedBroadcastingAdvancedStreaming::GetEnforceServiceBirate,
41+
&osn::EnhancedBroadcastingAdvancedStreaming::SetEnforceServiceBirate),
42+
InstanceAccessor("enableTwitchVOD", &osn::EnhancedBroadcastingAdvancedStreaming::GetEnableTwitchVOD,
43+
&osn::EnhancedBroadcastingAdvancedStreaming::SetEnableTwitchVOD),
44+
InstanceAccessor("signalHandler", &osn::EnhancedBroadcastingAdvancedStreaming::GetSignalHandler,
45+
&osn::EnhancedBroadcastingAdvancedStreaming::SetSignalHandler),
4246
InstanceAccessor("delay", &osn::EnhancedBroadcastingAdvancedStreaming::GetDelay, &osn::EnhancedBroadcastingAdvancedStreaming::SetDelay),
43-
InstanceAccessor("reconnect", &osn::EnhancedBroadcastingAdvancedStreaming::GetReconnect, &osn::EnhancedBroadcastingAdvancedStreaming::SetReconnect),
47+
InstanceAccessor("reconnect", &osn::EnhancedBroadcastingAdvancedStreaming::GetReconnect,
48+
&osn::EnhancedBroadcastingAdvancedStreaming::SetReconnect),
4449
InstanceAccessor("network", &osn::EnhancedBroadcastingAdvancedStreaming::GetNetwork, &osn::EnhancedBroadcastingAdvancedStreaming::SetNetwork),
4550
InstanceAccessor("video", &osn::EnhancedBroadcastingAdvancedStreaming::GetCanvas, &osn::EnhancedBroadcastingAdvancedStreaming::SetCanvas),
46-
InstanceAccessor("additionalVideo", &osn::EnhancedBroadcastingAdvancedStreaming::GetAdditionalCanvas, &osn::EnhancedBroadcastingAdvancedStreaming::SetAdditionalCanvas),
51+
InstanceAccessor("additionalVideo", &osn::EnhancedBroadcastingAdvancedStreaming::GetAdditionalCanvas,
52+
&osn::EnhancedBroadcastingAdvancedStreaming::SetAdditionalCanvas),
4753
InstanceAccessor("droppedFrames", &osn::EnhancedBroadcastingAdvancedStreaming::GetDroppedFrames, nullptr),
4854
InstanceAccessor("totalFrames", &osn::EnhancedBroadcastingAdvancedStreaming::GetTotalFrames, nullptr),
4955
InstanceAccessor("kbitsPerSec", &osn::EnhancedBroadcastingAdvancedStreaming::GetKBitsPerSec, nullptr),
5056
InstanceAccessor("dataOutput", &osn::EnhancedBroadcastingAdvancedStreaming::GetDataOutput, nullptr),
5157

52-
InstanceAccessor("audioTrack", &osn::EnhancedBroadcastingAdvancedStreaming::GetAudioTrack, &osn::EnhancedBroadcastingAdvancedStreaming::SetAudioTrack),
53-
InstanceAccessor("twitchTrack", &osn::EnhancedBroadcastingAdvancedStreaming::GetTwitchTrack, &osn::EnhancedBroadcastingAdvancedStreaming::SetTwitchTrack),
54-
InstanceAccessor("rescaling", &osn::EnhancedBroadcastingAdvancedStreaming::GetRescaling, &osn::EnhancedBroadcastingAdvancedStreaming::SetRescaling),
55-
InstanceAccessor("outputWidth", &osn::EnhancedBroadcastingAdvancedStreaming::GetOutputWidth, &osn::EnhancedBroadcastingAdvancedStreaming::SetOutputWidth),
56-
InstanceAccessor("outputHeight", &osn::EnhancedBroadcastingAdvancedStreaming::GetOutputHeight, &osn::EnhancedBroadcastingAdvancedStreaming::SetOutputHeight),
58+
InstanceAccessor("audioTrack", &osn::EnhancedBroadcastingAdvancedStreaming::GetAudioTrack,
59+
&osn::EnhancedBroadcastingAdvancedStreaming::SetAudioTrack),
60+
InstanceAccessor("twitchTrack", &osn::EnhancedBroadcastingAdvancedStreaming::GetTwitchTrack,
61+
&osn::EnhancedBroadcastingAdvancedStreaming::SetTwitchTrack),
62+
InstanceAccessor("rescaling", &osn::EnhancedBroadcastingAdvancedStreaming::GetRescaling,
63+
&osn::EnhancedBroadcastingAdvancedStreaming::SetRescaling),
64+
InstanceAccessor("outputWidth", &osn::EnhancedBroadcastingAdvancedStreaming::GetOutputWidth,
65+
&osn::EnhancedBroadcastingAdvancedStreaming::SetOutputWidth),
66+
InstanceAccessor("outputHeight", &osn::EnhancedBroadcastingAdvancedStreaming::GetOutputHeight,
67+
&osn::EnhancedBroadcastingAdvancedStreaming::SetOutputHeight),
5768

5869
InstanceMethod("start", &osn::EnhancedBroadcastingAdvancedStreaming::Start),
5970
InstanceMethod("stop", &osn::EnhancedBroadcastingAdvancedStreaming::Stop),
6071

61-
StaticAccessor("legacySettings", &osn::EnhancedBroadcastingAdvancedStreaming::GetLegacySettings, &osn::EnhancedBroadcastingAdvancedStreaming::SetLegacySettings)});
72+
StaticAccessor("legacySettings", &osn::EnhancedBroadcastingAdvancedStreaming::GetLegacySettings,
73+
&osn::EnhancedBroadcastingAdvancedStreaming::SetLegacySettings)});
6274

6375
exports.Set("EnhancedBroadcastingAdvancedStreaming", func);
6476
osn::EnhancedBroadcastingAdvancedStreaming::constructor = Napi::Persistent(func);
@@ -67,7 +79,8 @@ Napi::Object osn::EnhancedBroadcastingAdvancedStreaming::Init(Napi::Env env, Nap
6779
return exports;
6880
}
6981

70-
osn::EnhancedBroadcastingAdvancedStreaming::EnhancedBroadcastingAdvancedStreaming(const Napi::CallbackInfo &info) : Napi::ObjectWrap<osn::EnhancedBroadcastingAdvancedStreaming>(info)
82+
osn::EnhancedBroadcastingAdvancedStreaming::EnhancedBroadcastingAdvancedStreaming(const Napi::CallbackInfo &info)
83+
: Napi::ObjectWrap<osn::EnhancedBroadcastingAdvancedStreaming>(info)
7184
{
7285
Napi::Env env = info.Env();
7386
Napi::HandleScope scope(env);
@@ -93,7 +106,8 @@ Napi::Value osn::EnhancedBroadcastingAdvancedStreaming::Create(const Napi::Callb
93106
if (!ValidateResponse(info, response))
94107
return info.Env().Undefined();
95108

96-
auto instance = osn::EnhancedBroadcastingAdvancedStreaming::constructor.New({Napi::Number::New(info.Env(), static_cast<double>(response[1].value_union.ui64))});
109+
auto instance =
110+
osn::EnhancedBroadcastingAdvancedStreaming::constructor.New({Napi::Number::New(info.Env(), static_cast<double>(response[1].value_union.ui64))});
97111

98112
return instance;
99113
}
@@ -161,7 +175,8 @@ Napi::Value osn::EnhancedBroadcastingAdvancedStreaming::GetLegacySettings(const
161175
if (!ValidateResponse(info, response))
162176
return info.Env().Undefined();
163177

164-
auto instance = osn::EnhancedBroadcastingAdvancedStreaming::constructor.New({Napi::Number::New(info.Env(), static_cast<double>(response[1].value_union.ui64))});
178+
auto instance =
179+
osn::EnhancedBroadcastingAdvancedStreaming::constructor.New({Napi::Number::New(info.Env(), static_cast<double>(response[1].value_union.ui64))});
165180

166181
return instance;
167182
}

‎obs-studio-client/source/enhanced-broadcasting-advanced-streaming.hpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
#include "advanced-streaming.hpp"
2222

2323
namespace osn {
24-
class EnhancedBroadcastingAdvancedStreaming : public Napi::ObjectWrap<osn::EnhancedBroadcastingAdvancedStreaming>,
25-
public osn::AdvancedStreamingBase {
24+
class EnhancedBroadcastingAdvancedStreaming : public Napi::ObjectWrap<osn::EnhancedBroadcastingAdvancedStreaming>, public osn::AdvancedStreamingBase {
2625
public:
2726
static Napi::FunctionReference constructor;
2827
static Napi::Object Init(Napi::Env env, Napi::Object exports);

‎obs-studio-client/source/enhanced-broadcasting-simple-streaming.cpp‎

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,30 @@ Napi::Object osn::EnhancedBroadcastingSimpleStreaming::Init(Napi::Env env, Napi:
3434
{StaticMethod("create", &osn::EnhancedBroadcastingSimpleStreaming::Create),
3535
StaticMethod("destroy", &osn::EnhancedBroadcastingSimpleStreaming::Destroy),
3636

37-
InstanceAccessor("videoEncoder", &osn::EnhancedBroadcastingSimpleStreaming::GetVideoEncoder, &osn::EnhancedBroadcastingSimpleStreaming::SetVideoEncoder),
38-
InstanceAccessor("audioEncoder", &osn::EnhancedBroadcastingSimpleStreaming::GetAudioEncoder, &osn::EnhancedBroadcastingSimpleStreaming::SetAudioEncoder),
37+
InstanceAccessor("videoEncoder", &osn::EnhancedBroadcastingSimpleStreaming::GetVideoEncoder,
38+
&osn::EnhancedBroadcastingSimpleStreaming::SetVideoEncoder),
39+
InstanceAccessor("audioEncoder", &osn::EnhancedBroadcastingSimpleStreaming::GetAudioEncoder,
40+
&osn::EnhancedBroadcastingSimpleStreaming::SetAudioEncoder),
3941
InstanceAccessor("service", &osn::EnhancedBroadcastingSimpleStreaming::GetService, &osn::EnhancedBroadcastingSimpleStreaming::SetService),
40-
InstanceAccessor("enforceServiceBitrate", &osn::EnhancedBroadcastingSimpleStreaming::GetEnforceServiceBirate, &osn::EnhancedBroadcastingSimpleStreaming::SetEnforceServiceBirate),
41-
InstanceAccessor("enableTwitchVOD", &osn::EnhancedBroadcastingSimpleStreaming::GetEnableTwitchVOD, &osn::EnhancedBroadcastingSimpleStreaming::SetEnableTwitchVOD),
42-
InstanceAccessor("audioEncoder", &osn::EnhancedBroadcastingSimpleStreaming::GetAudioEncoder, &osn::EnhancedBroadcastingSimpleStreaming::SetAudioEncoder),
43-
InstanceAccessor("useAdvanced", &osn::EnhancedBroadcastingSimpleStreaming::GetUseAdvanced, &osn::EnhancedBroadcastingSimpleStreaming::SetUseAdvanced),
44-
InstanceAccessor("customEncSettings", &osn::EnhancedBroadcastingSimpleStreaming::GetCustomEncSettings, &osn::EnhancedBroadcastingSimpleStreaming::SetCustomEncSettings),
45-
InstanceAccessor("signalHandler", &osn::EnhancedBroadcastingSimpleStreaming::GetSignalHandler, &osn::EnhancedBroadcastingSimpleStreaming::SetSignalHandler),
42+
InstanceAccessor("enforceServiceBitrate", &osn::EnhancedBroadcastingSimpleStreaming::GetEnforceServiceBirate,
43+
&osn::EnhancedBroadcastingSimpleStreaming::SetEnforceServiceBirate),
44+
InstanceAccessor("enableTwitchVOD", &osn::EnhancedBroadcastingSimpleStreaming::GetEnableTwitchVOD,
45+
&osn::EnhancedBroadcastingSimpleStreaming::SetEnableTwitchVOD),
46+
InstanceAccessor("audioEncoder", &osn::EnhancedBroadcastingSimpleStreaming::GetAudioEncoder,
47+
&osn::EnhancedBroadcastingSimpleStreaming::SetAudioEncoder),
48+
InstanceAccessor("useAdvanced", &osn::EnhancedBroadcastingSimpleStreaming::GetUseAdvanced,
49+
&osn::EnhancedBroadcastingSimpleStreaming::SetUseAdvanced),
50+
InstanceAccessor("customEncSettings", &osn::EnhancedBroadcastingSimpleStreaming::GetCustomEncSettings,
51+
&osn::EnhancedBroadcastingSimpleStreaming::SetCustomEncSettings),
52+
InstanceAccessor("signalHandler", &osn::EnhancedBroadcastingSimpleStreaming::GetSignalHandler,
53+
&osn::EnhancedBroadcastingSimpleStreaming::SetSignalHandler),
4654
InstanceAccessor("delay", &osn::EnhancedBroadcastingSimpleStreaming::GetDelay, &osn::EnhancedBroadcastingSimpleStreaming::SetDelay),
47-
InstanceAccessor("reconnect", &osn::EnhancedBroadcastingSimpleStreaming::GetReconnect, &osn::EnhancedBroadcastingSimpleStreaming::SetReconnect),
55+
InstanceAccessor("reconnect", &osn::EnhancedBroadcastingSimpleStreaming::GetReconnect,
56+
&osn::EnhancedBroadcastingSimpleStreaming::SetReconnect),
4857
InstanceAccessor("network", &osn::EnhancedBroadcastingSimpleStreaming::GetNetwork, &osn::EnhancedBroadcastingSimpleStreaming::SetNetwork),
4958
InstanceAccessor("video", &osn::EnhancedBroadcastingSimpleStreaming::GetCanvas, &osn::EnhancedBroadcastingSimpleStreaming::SetCanvas),
50-
InstanceAccessor("additionalVideo", &osn::EnhancedBroadcastingSimpleStreaming::GetAdditionalCanvas, &osn::EnhancedBroadcastingSimpleStreaming::SetAdditionalCanvas),
59+
InstanceAccessor("additionalVideo", &osn::EnhancedBroadcastingSimpleStreaming::GetAdditionalCanvas,
60+
&osn::EnhancedBroadcastingSimpleStreaming::SetAdditionalCanvas),
5161
InstanceAccessor("droppedFrames", &osn::EnhancedBroadcastingSimpleStreaming::GetDroppedFrames, nullptr),
5262
InstanceAccessor("totalFrames", &osn::EnhancedBroadcastingSimpleStreaming::GetTotalFrames, nullptr),
5363
InstanceAccessor("kbitsPerSec", &osn::EnhancedBroadcastingSimpleStreaming::GetKBitsPerSec, nullptr),
@@ -56,7 +66,8 @@ Napi::Object osn::EnhancedBroadcastingSimpleStreaming::Init(Napi::Env env, Napi:
5666
InstanceMethod("start", &osn::EnhancedBroadcastingSimpleStreaming::Start),
5767
InstanceMethod("stop", &osn::EnhancedBroadcastingSimpleStreaming::Stop),
5868

59-
StaticAccessor("legacySettings", &osn::EnhancedBroadcastingSimpleStreaming::GetLegacySettings, &osn::EnhancedBroadcastingSimpleStreaming::SetLegacySettings)});
69+
StaticAccessor("legacySettings", &osn::EnhancedBroadcastingSimpleStreaming::GetLegacySettings,
70+
&osn::EnhancedBroadcastingSimpleStreaming::SetLegacySettings)});
6071

6172
exports.Set("EnhancedBroadcastingSimpleStreaming", func);
6273
osn::EnhancedBroadcastingSimpleStreaming::constructor = Napi::Persistent(func);
@@ -65,7 +76,8 @@ Napi::Object osn::EnhancedBroadcastingSimpleStreaming::Init(Napi::Env env, Napi:
6576
return exports;
6677
}
6778

68-
osn::EnhancedBroadcastingSimpleStreaming::EnhancedBroadcastingSimpleStreaming(const Napi::CallbackInfo &info) : Napi::ObjectWrap<osn::EnhancedBroadcastingSimpleStreaming>(info)
79+
osn::EnhancedBroadcastingSimpleStreaming::EnhancedBroadcastingSimpleStreaming(const Napi::CallbackInfo &info)
80+
: Napi::ObjectWrap<osn::EnhancedBroadcastingSimpleStreaming>(info)
6981
{
7082
Napi::Env env = info.Env();
7183
Napi::HandleScope scope(env);
@@ -91,7 +103,8 @@ Napi::Value osn::EnhancedBroadcastingSimpleStreaming::Create(const Napi::Callbac
91103
if (!ValidateResponse(info, response))
92104
return info.Env().Undefined();
93105

94-
auto instance = osn::EnhancedBroadcastingSimpleStreaming::constructor.New({Napi::Number::New(info.Env(), static_cast<double>(response[1].value_union.ui64))});
106+
auto instance =
107+
osn::EnhancedBroadcastingSimpleStreaming::constructor.New({Napi::Number::New(info.Env(), static_cast<double>(response[1].value_union.ui64))});
95108

96109
return instance;
97110
}
@@ -159,7 +172,8 @@ Napi::Value osn::EnhancedBroadcastingSimpleStreaming::GetLegacySettings(const Na
159172
if (!ValidateResponse(info, response))
160173
return info.Env().Undefined();
161174

162-
auto instance = osn::EnhancedBroadcastingSimpleStreaming::constructor.New({Napi::Number::New(info.Env(), static_cast<double>(response[1].value_union.ui64))});
175+
auto instance =
176+
osn::EnhancedBroadcastingSimpleStreaming::constructor.New({Napi::Number::New(info.Env(), static_cast<double>(response[1].value_union.ui64))});
163177

164178
return instance;
165179
}

‎obs-studio-client/source/enhanced-broadcasting-simple-streaming.hpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
#include "simple-streaming.hpp"
2222

2323
namespace osn {
24-
class EnhancedBroadcastingSimpleStreaming : public Napi::ObjectWrap<osn::EnhancedBroadcastingSimpleStreaming>,
25-
public osn::SimpleStreamingBase {
24+
class EnhancedBroadcastingSimpleStreaming : public Napi::ObjectWrap<osn::EnhancedBroadcastingSimpleStreaming>, public osn::SimpleStreamingBase {
2625
public:
2726
static Napi::FunctionReference constructor;
2827
static Napi::Object Init(Napi::Env env, Napi::Object exports);

‎obs-studio-server/source/nodeobs_service.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1373,7 +1373,7 @@ bool OBS_service::startMultiTrackStreaming(StreamServiceId serviceId, bool dualS
13731373

13741374
auto vod_track_mixer = IsVodTrackEnabled(services[serviceId]) ? std::optional{vodTrackIndex} : std::nullopt;
13751375

1376-
std::vector<obs_video_info*> canvases;
1376+
std::vector<obs_video_info *> canvases;
13771377
canvases.push_back(videoInfo[serviceId]);
13781378
if (dualStreamingMode) {
13791379
if (serviceId == StreamServiceId::Main) {

0 commit comments

Comments
 (0)