Skip to content

Commit

Permalink
Merge branch 'hotfix/5.2.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
ferserc1 committed Sep 27, 2017
2 parents e7c9abc + 5a14555 commit 4614ee3
Show file tree
Hide file tree
Showing 10 changed files with 320 additions and 253 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
CHANGELOG
=========

* Paella 5.2.4

* Bug fixed in zoom plugin, in Safari 11 for macOS 10.13
* Autoplay settings updated to take account of the upcoming browser restrictions in Safari 11 and Chrome 64
* Bug fixed in zoom plugin, when some parameters in settings.json are missing.
* Bug fixed in captions plugin, that prevents to change the captions language in firefox.

* Paella 5.2.3

* Now the video zoom button in toolbar shows the current zoom level.
Expand Down
7 changes: 0 additions & 7 deletions config/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@
"audioMethods":[
{ "factory":"MultiformatAudioFactory", "enabled":true }
],
"audio": {
"master": 1.0,
"slave": 0.0
},
"rtmpSettings":{
"bufferTime":5,
"requiresSubscription": false
Expand All @@ -44,9 +40,6 @@
"color":"gray"
}
},
"editor":{
"enabled":true
},
"defaultProfile":"slide_professor",
"data":{
"enabled":true,
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "paellaplayer",
"version": "5.2.3",
"version": "5.2.4",
"description": "Paella Player",
"license": "GPL-3.0",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion plugins/es.upv.paella.captionsPlugin/captionsPlugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Class ("paella.plugins.CaptionsPlugin", paella.ButtonPlugin,{
getDefaultToolTip:function() { return base.dictionary.translate("Subtitles"); },
getIndex:function() {return 509;},

closeOnMouseOut:function() { return true; },
closeOnMouseOut:function() { return false; },

checkEnabled:function(onSuccess) {
onSuccess(true);
Expand Down
4 changes: 4 additions & 0 deletions plugins/es.upv.paella.hlsPlayer/hls-player.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,10 @@ Class ("paella.HLSPlayer", paella.Html5Video,{
});
}
},

supportAutoplay:function() {
return true;
},

getQualities:function() {
if (base.userAgent.system.iOS) {
Expand Down
4 changes: 4 additions & 0 deletions plugins/es.upv.paella.mpegDashPlayer/mpeg-dash-player.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ Class ("paella.MpegDashVideo", paella.Html5Video,{
});
},

supportAutoplay:function() {
return true;
},

getQualities:function() {
return new Promise((resolve) => {
this._deferredAction(() => {
Expand Down
6 changes: 4 additions & 2 deletions plugins/es.upv.paella.videoZoom/video_zoom.js
Original file line number Diff line number Diff line change
Expand Up @@ -191,13 +191,15 @@
let pluginData = paella.player.config.plugins.list["es.upv.paella.videoZoomToolbarPlugin"];
let playerIndex = pluginData.targetStreamIndex;
this.targetPlayer = players.length>playerIndex ? players[playerIndex] : null;
onSuccess(this.targetPlayer && this.targetPlayer.allowZoom());
onSuccess(paella.player.config.player.videoZoom.enabled &&
this.targetPlayer &&
this.targetPlayer.allowZoom());
});
}

buildContent(domElement) {
paella.events.bind(paella.events.videoZoomChanged, (evt,target) => {
this.setText(target.video.zoom + "%");
this.setText(Math.round(target.video.zoom) + "%");
});

this.setText("100%");
Expand Down
2 changes: 2 additions & 0 deletions src/03_audio_nodes.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
setPlaybackRate(rate) { return Promise.reject(new Error("no such compatible video player")); }
playbackRate() { return Promise.reject(new Error("no such compatible video player")); }
unload() { return Promise.reject(new Error("no such compatible video player")); }

supportAutoplay() { return false;}
};

paella.AudioElementBase = AudioElementBase;
Expand Down
Loading

0 comments on commit 4614ee3

Please sign in to comment.