aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-03-01 14:14:56 +0100
committerChocobozzz <me@florianbigard.com>2018-03-01 14:14:56 +0100
commit1198a08cc76c9b25209e776a3cfc529584cbdd67 (patch)
tree886e9995cba7b7954cce4911f6388f7fc45fc248
parent901637bb87f5eb0518fb7ca69d98b53ed918339e (diff)
downloadPeerTube-1198a08cc76c9b25209e776a3cfc529584cbdd67.tar.gz
PeerTube-1198a08cc76c9b25209e776a3cfc529584cbdd67.tar.zst
PeerTube-1198a08cc76c9b25209e776a3cfc529584cbdd67.zip
Fix playback rate
-rw-r--r--client/src/app/videos/+video-watch/video-watch.component.ts2
-rw-r--r--client/src/assets/player/peertube-videojs-plugin.ts2
-rw-r--r--client/src/sass/video-js-custom.scss2
3 files changed, 4 insertions, 2 deletions
diff --git a/client/src/app/videos/+video-watch/video-watch.component.ts b/client/src/app/videos/+video-watch/video-watch.component.ts
index 66ef0399a..b1dd3d10b 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/videos/+video-watch/video-watch.component.ts
@@ -341,7 +341,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
341 const videojsOptions = { 341 const videojsOptions = {
342 controls: true, 342 controls: true,
343 autoplay: this.isAutoplay(), 343 autoplay: this.isAutoplay(),
344 playbackRates: [0.5, 1, 1.25, 1.5, 2], 344 playbackRates: [ 0.5, 1, 1.5, 2 ],
345 plugins: { 345 plugins: {
346 peertube: { 346 peertube: {
347 videoFiles: this.video.files, 347 videoFiles: this.video.files,
diff --git a/client/src/assets/player/peertube-videojs-plugin.ts b/client/src/assets/player/peertube-videojs-plugin.ts
index 618d77cbe..3b366ec9b 100644
--- a/client/src/assets/player/peertube-videojs-plugin.ts
+++ b/client/src/assets/player/peertube-videojs-plugin.ts
@@ -307,7 +307,9 @@ class PeerTubePlugin extends Plugin {
307 307
308 // Do not display error to user because we will have multiple fallbacks 308 // Do not display error to user because we will have multiple fallbacks
309 this.disableErrorDisplay() 309 this.disableErrorDisplay()
310
310 this.player.src = () => true 311 this.player.src = () => true
312 this.player.playbackRate(1)
311 313
312 const previousVideoFile = this.currentVideoFile 314 const previousVideoFile = this.currentVideoFile
313 this.currentVideoFile = videoFile 315 this.currentVideoFile = videoFile
diff --git a/client/src/sass/video-js-custom.scss b/client/src/sass/video-js-custom.scss
index f2251244a..3dfad5ff6 100644
--- a/client/src/sass/video-js-custom.scss
+++ b/client/src/sass/video-js-custom.scss
@@ -220,7 +220,7 @@ $control-bar-height: 34px;
220 220
221 .vjs-playback-rate { 221 .vjs-playback-rate {
222 font-size: 10px; 222 font-size: 10px;
223 margin-right: 48px; 223 margin-right: 50px;
224 224
225 .vjs-playback-rate-value { 225 .vjs-playback-rate-value {
226 font-size: 13px; 226 font-size: 13px;