aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app
diff options
context:
space:
mode:
Diffstat (limited to 'client/src/app')
-rw-r--r--client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html5
-rw-r--r--client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts4
-rw-r--r--client/src/app/core/server/server.service.ts3
3 files changed, 10 insertions, 2 deletions
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
index af8a4e18d..013784c6c 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
@@ -889,8 +889,9 @@
889 <ng-container i18n>Allow live streaming</ng-container> 889 <ng-container i18n>Allow live streaming</ng-container>
890 </ng-template> 890 </ng-template>
891 891
892 <ng-container ngProjectAs="description" i18n> 892 <ng-container ngProjectAs="description">
893 ⚠️ Enabling live streaming requires trust in your users and extra moderation work 893 <div i18n>⚠️ Enabling live streaming requires trust in your users and extra moderation work</div>
894 <div i18n>If enabled, your server needs to accept incoming TCP traffic on port {{ liveRTMPPort }}</div>
894 </ng-container> 895 </ng-container>
895 896
896 <ng-container ngProjectAs="extra"> 897 <ng-container ngProjectAs="extra">
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
index c3a833843..f74229af0 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
@@ -119,6 +119,10 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit, A
119 .map(t => t.name) 119 .map(t => t.name)
120 } 120 }
121 121
122 get liveRTMPPort () {
123 return this.serverConfig.live.rtmp.port
124 }
125
122 getTotalTranscodingThreads () { 126 getTotalTranscodingThreads () {
123 const transcodingEnabled = this.form.value['transcoding']['enabled'] 127 const transcodingEnabled = this.form.value['transcoding']['enabled']
124 const transcodingThreads = this.form.value['transcoding']['threads'] 128 const transcodingThreads = this.form.value['transcoding']['threads']
diff --git a/client/src/app/core/server/server.service.ts b/client/src/app/core/server/server.service.ts
index 1abf87118..b1d8fcf83 100644
--- a/client/src/app/core/server/server.service.ts
+++ b/client/src/app/core/server/server.service.ts
@@ -83,6 +83,9 @@ export class ServerService {
83 transcoding: { 83 transcoding: {
84 enabled: false, 84 enabled: false,
85 enabledResolutions: [] 85 enabledResolutions: []
86 },
87 rtmp: {
88 port: 1935
86 } 89 }
87 }, 90 },
88 avatar: { 91 avatar: {