aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/+admin
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-11-21 17:01:24 +0100
committerChocobozzz <me@florianbigard.com>2019-11-25 10:59:46 +0100
commit5a71acd2547c098657ae6e0e31e0862094585088 (patch)
treeb7d9792bc99f01ef4d1f4c9dc7822a50a48f7d5f /client/src/app/+admin
parentd441f2ed78c004e62766394b2437f6089f2b4ca5 (diff)
downloadPeerTube-5a71acd2547c098657ae6e0e31e0862094585088.tar.gz
PeerTube-5a71acd2547c098657ae6e0e31e0862094585088.tar.zst
PeerTube-5a71acd2547c098657ae6e0e31e0862094585088.zip
Disable webtorrent support in client
Diffstat (limited to 'client/src/app/+admin')
-rw-r--r--client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html21
-rw-r--r--client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts3
2 files changed, 23 insertions, 1 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 e057e394e..82f467e16 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
@@ -491,6 +491,23 @@
491 </my-peertube-checkbox> 491 </my-peertube-checkbox>
492 </div> 492 </div>
493 493
494 <ng-container formGroupName="webtorrent">
495 <div class="form-group" >
496 <my-peertube-checkbox
497 inputName="transcodingWebTorrentEnabled" formControlName="enabled"
498 i18n-labelText labelText="WebTorrent support enabled"
499 >
500 <ng-template ptTemplate="help">
501 <ng-container i18n>
502 <strong>Experimental, we suggest you to not disable webtorrent support for now</strong>
503
504 <p>If you also enabled HLS support, it will multiply videos storage by 2</p>
505 </ng-container>
506 </ng-template>
507 </my-peertube-checkbox>
508 </div>
509 </ng-container>
510
494 <ng-container formGroupName="hls"> 511 <ng-container formGroupName="hls">
495 <div class="form-group" > 512 <div class="form-group" >
496 <my-peertube-checkbox 513 <my-peertube-checkbox
@@ -499,7 +516,7 @@
499 > 516 >
500 <ng-template ptTemplate="help"> 517 <ng-template ptTemplate="help">
501 <ng-container i18n> 518 <ng-container i18n>
502 <strong>Requires ffmpeg >= 4.1 and multiplies videos storage by 2!</strong> 519 <strong>Requires ffmpeg >= 4.1</strong>
503 520
504 <p>Generate HLS playlists and fragmented MP4 files resulting in a better playback than with the current default player:</p> 521 <p>Generate HLS playlists and fragmented MP4 files resulting in a better playback than with the current default player:</p>
505 <ul> 522 <ul>
@@ -507,6 +524,8 @@
507 <li>Faster playback in particular with long videos</li> 524 <li>Faster playback in particular with long videos</li>
508 <li>More stable playback (less bugs/infinite loading)</li> 525 <li>More stable playback (less bugs/infinite loading)</li>
509 </ul> 526 </ul>
527
528 <p>If you also enabled WebTorrent support, it will multiply videos storage by 2</p>
510 </ng-container> 529 </ng-container>
511 </ng-template> 530 </ng-template>
512 </my-peertube-checkbox> 531 </my-peertube-checkbox>
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 f3fb849bb..8411c4f4f 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
@@ -169,6 +169,9 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
169 resolutions: {}, 169 resolutions: {},
170 hls: { 170 hls: {
171 enabled: null 171 enabled: null
172 },
173 webtorrent: {
174 enabled: null
172 } 175 }
173 }, 176 },
174 autoBlacklist: { 177 autoBlacklist: {