diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/client.js | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/res/client.js b/res/client.js index 0611166..6519d6c 100644 --- a/res/client.js +++ b/res/client.js @@ -1091,6 +1091,15 @@ client_Main.prototype = { this.onTimeGet.run(); break; case "GetTime": + if(data.getTime.paused == null) { + data.getTime.paused = false; + } + if(data.getTime.rate == null) { + data.getTime.rate = 1; + } + if(this.player.getPlaybackRate() != data.getTime.rate) { + this.player.setPlaybackRate(data.getTime.rate); + } var newTime = data.getTime.time; var time = this.player.getTime(); if((this.personal.group & 1 << ClientGroup.Leader._hx_index) != 0) { @@ -1175,6 +1184,12 @@ client_Main.prototype = { case "SetNextItem": this.player.setNextItem(data.setNextItem.pos); break; + case "SetRate": + if((this.personal.group & 1 << ClientGroup.Leader._hx_index) != 0) { + return; + } + this.player.setPlaybackRate(data.setRate.rate); + break; case "SetTime": var newTime1 = data.setTime.time; var time1 = this.player.getTime(); @@ -1543,6 +1558,7 @@ client_MobileView.init = function() { }; }; var client_Player = function(main) { + this.skipSetRate = false; this.skipSetTime = false; this.isLoaded = false; this.itemPos = 0; @@ -1653,6 +1669,16 @@ client_Player.prototype = { } this.main.send({ type : "SetTime", setTime : { time : this.getTime()}}); } + ,onRateChange: function() { + if(this.skipSetRate) { + this.skipSetRate = false; + return; + } + if((this.main.personal.group & 2) == 0) { + return; + } + this.main.send({ type : "SetRate", setRate : { rate : this.getPlaybackRate()}}); + } ,addVideoItem: function(item,atEnd) { var url = StringTools.htmlEscape(item.url,true); var itemEl = this.nodeFromString("<li class=\"queue_entry pluid-0\" title=\"" + Lang.get("addedBy") + ": " + item.author + "\">\n\t\t\t\t<a class=\"qe_title\" href=\"" + url + "\" target=\"_blank\">" + StringTools.htmlEscape(item.title) + "</a>\n\t\t\t\t<span class=\"qe_time\">" + this.duration(item.duration) + "</span>\n\t\t\t\t<div class=\"qe_clear\"></div>\n\t\t\t\t<div class=\"btn-group\">\n\t\t\t\t\t<button class=\"btn btn-xs btn-default qbtn-play\">\n\t\t\t\t\t\t<span class=\"glyphicon glyphicon-play\"></span>" + Lang.get("play") + "\n\t\t\t\t\t</button>\n\t\t\t\t\t<button class=\"btn btn-xs btn-default qbtn-next\">\n\t\t\t\t\t\t<span class=\"glyphicon glyphicon-share-alt\"></span>" + Lang.get("setNext") + "\n\t\t\t\t\t</button>\n\t\t\t\t\t<button class=\"btn btn-xs btn-default qbtn-tmp\">\n\t\t\t\t\t\t<span class=\"glyphicon glyphicon-flag\"></span>\n\t\t\t\t\t</button>\n\t\t\t\t\t<button class=\"btn btn-xs btn-default qbtn-delete\">\n\t\t\t\t\t\t<span class=\"glyphicon glyphicon-trash\"></span>" + Lang.get("delete") + "\n\t\t\t\t\t</button>\n\t\t\t\t</div>\n\t\t\t</li>"); @@ -1833,6 +1859,25 @@ client_Player.prototype = { this.skipSetTime = isLocal; this.player.setTime(time); } + ,getPlaybackRate: function() { + if(this.player == null) { + return 1; + } + return this.player.getPlaybackRate(); + } + ,setPlaybackRate: function(rate,isLocal) { + if(isLocal == null) { + isLocal = true; + } + if(!this.main.isSyncActive) { + return; + } + if(this.player == null) { + return; + } + this.skipSetRate = isLocal; + this.player.setPlaybackRate(rate); + } }; var client_Settings = function() { }; client_Settings.__name__ = true; @@ -1982,6 +2027,11 @@ client_players_Iframe.prototype = { } ,setTime: function(time) { } + ,getPlaybackRate: function() { + return 1; + } + ,setPlaybackRate: function(rate) { + } }; var client_players_Raw = function(main,player) { this.playAllowed = true; @@ -2047,6 +2097,7 @@ client_players_Raw.prototype = { return; }; this.video.onpause = ($_=this.player,$bind($_,$_.onPause)); + this.video.onratechange = ($_=this.player,$bind($_,$_.onRateChange)); this.playerEl.appendChild(this.video); } ,removeVideo: function() { @@ -2090,6 +2141,12 @@ client_players_Raw.prototype = { } this.video.currentTime = time; } + ,getPlaybackRate: function() { + return this.video.playbackRate; + } + ,setPlaybackRate: function(rate) { + this.video.playbackRate = rate; + } }; var client_players_Youtube = function(main,player) { this.matchSeconds = new EReg("([0-9]+)S",""); @@ -2282,6 +2339,9 @@ client_players_Youtube.prototype = { break; } return; + }, onPlaybackRateChange : function(e2) { + _gthis.player.onRateChange(); + return; }}}); } ,removeVideo: function() { @@ -2317,6 +2377,12 @@ client_players_Youtube.prototype = { } this.youtube.seekTo(time,true); } + ,getPlaybackRate: function() { + return this.youtube.getPlaybackRate(); + } + ,setPlaybackRate: function(rate) { + this.youtube.setPlaybackRate(rate); + } }; var haxe_Log = function() { }; haxe_Log.__name__ = true; |