diff options
| -rw-r--r-- | res/client.js | 9 | ||||
| -rw-r--r-- | src/client/Main.hx | 1 | ||||
| -rw-r--r-- | src/client/Player.hx | 5 |
3 files changed, 15 insertions, 0 deletions
diff --git a/res/client.js b/res/client.js index a6dae56..9637f8a 100644 --- a/res/client.js +++ b/res/client.js @@ -1131,6 +1131,9 @@ client_Main.prototype = { this.player.setTime(time,false); return; } + if(this.player.getDuration() < this.player.getTime()) { + return; + } if(!data.getTime.paused) { this.player.play(); } else { @@ -1868,6 +1871,12 @@ client_Player.prototype = { } this.player.pause(); } + ,getDuration: function() { + if(this.itemPos >= this.items.length) { + return 0; + } + return this.items[this.itemPos].duration; + } ,getTime: function() { if(this.player == null) { return 0; diff --git a/src/client/Main.hx b/src/client/Main.hx index 5e114ca..99f49b3 100644 --- a/src/client/Main.hx +++ b/src/client/Main.hx @@ -386,6 +386,7 @@ class Main { player.setTime(time, false); return; } + if (player.getDuration() < player.getTime()) return; if (!data.getTime.paused) player.play(); else player.pause(); if (Math.abs(time - newTime) < synchThreshold) return; diff --git a/src/client/Player.hx b/src/client/Player.hx index 53a1168..8979db8 100644 --- a/src/client/Player.hx +++ b/src/client/Player.hx @@ -324,6 +324,11 @@ class Player { player.pause(); } + public function getDuration():Float { + if (itemPos >= items.length) return 0; + return items[itemPos].duration; + } + public function getTime():Float { if (player == null) return 0; return player.getTime(); |