mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Merge pull request #1810 from iwalton3/currenttime-is-ms

Browse source 
Change all instances of currentTime to be in ms.
This commit is contained in:
dkanada 2020-08-30 12:41:20 +09:00 • committed by GitHub
commit d0cd58e9cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 12 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/nowPlayingBar/nowPlayingBar.js
View file

@ -701,7 +701,7 @@ import 'emby-ratingbutton';
const player = this; const player = this;
currentRuntimeTicks = playbackManager.duration(player); currentRuntimeTicks = playbackManager.duration(player);
updateTimeDisplay(playbackManager.currentTime(player), currentRuntimeTicks, playbackManager.getBufferedRanges(player)); updateTimeDisplay(playbackManager.currentTime(player) * 10000, currentRuntimeTicks, playbackManager.getBufferedRanges(player));
} }
function releaseCurrentPlayer() { function releaseCurrentPlayer() {

14
src/components/playback/playbackmanager.js
View file

@ -1618,11 +1618,7 @@ class PlaybackManager {
player = player || self._currentPlayer; player = player || self._currentPlayer;
if (player && !enableLocalPlaylistManagement(player)) { if (player && !enableLocalPlaylistManagement(player)) {
if (player.isLocalPlayer) { return player.seek(ticks);
return player.seek((ticks || 0) / 10000);
} else {
return player.seek(ticks);
}
} }
changeStream(player, ticks); changeStream(player, ticks);
@ -1631,11 +1627,7 @@ class PlaybackManager {
self.seekRelative = function (offsetTicks, player) { self.seekRelative = function (offsetTicks, player) {
player = player || self._currentPlayer; player = player || self._currentPlayer;
if (player && !enableLocalPlaylistManagement(player) && player.seekRelative) { if (player && !enableLocalPlaylistManagement(player) && player.seekRelative) {
if (player.isLocalPlayer) { return player.seekRelative(ticks);
return player.seekRelative((ticks || 0) / 10000);
} else {
return player.seekRelative(ticks);
}
} }
const ticks = getCurrentTicks(player) + offsetTicks; const ticks = getCurrentTicks(player) + offsetTicks;
@ -3219,7 +3211,7 @@ class PlaybackManager {
return player.currentTime(); return player.currentTime();
} }
return this.getCurrentTicks(player); return this.getCurrentTicks(player) / 10000;
} }
nextItem(player = this._currentPlayer) { nextItem(player = this._currentPlayer) {

2
src/components/remotecontrol/remotecontrol.js
View file

@ -619,7 +619,7 @@ export default function () {
lastUpdateTime = now; lastUpdateTime = now;
const player = this; const player = this;
currentRuntimeTicks = playbackManager.duration(player); currentRuntimeTicks = playbackManager.duration(player);
updateTimeDisplay(playbackManager.currentTime(player), currentRuntimeTicks); updateTimeDisplay(playbackManager.currentTime(player) * 10000, currentRuntimeTicks);
} }
} }

2
src/components/syncPlay/syncPlayManager.js
View file

@ -741,7 +741,7 @@ class SyncPlayManager {
const playAtTime = this.lastCommand.When; const playAtTime = this.lastCommand.When;
const currentPositionTicks = playbackManager.currentTime(); const currentPositionTicks = playbackManager.currentTime() * 10000;
// Estimate PositionTicks on server // Estimate PositionTicks on server
const serverPositionTicks = this.lastCommand.PositionTicks + ((currentTime - playAtTime) + this.timeOffsetWithServer) * 10000; const serverPositionTicks = this.lastCommand.PositionTicks + ((currentTime - playAtTime) + this.timeOffsetWithServer) * 10000;
// Measure delay that needs to be recovered // Measure delay that needs to be recovered

2
src/components/upnextdialog/upnextdialog.js
View file

@ -256,7 +256,7 @@ import 'flexStyles';
const runtimeTicks = playbackManager.duration(options.player); const runtimeTicks = playbackManager.duration(options.player);
if (runtimeTicks) { if (runtimeTicks) {
const timeRemainingTicks = runtimeTicks - playbackManager.currentTime(options.player); const timeRemainingTicks = runtimeTicks - playbackManager.currentTime(options.player) * 10000;
return Math.round(timeRemainingTicks / 10000); return Math.round(timeRemainingTicks / 10000);
} }

2
src/controllers/playback/video/index.js
View file

@ -693,7 +693,7 @@ import 'css!assets/css/videoosd';
lastUpdateTime = now; lastUpdateTime = now;
const player = this; const player = this;
currentRuntimeTicks = playbackManager.duration(player); currentRuntimeTicks = playbackManager.duration(player);
const currentTime = playbackManager.currentTime(player); const currentTime = playbackManager.currentTime(player) * 10000;
updateTimeDisplay(currentTime, currentRuntimeTicks, playbackManager.playbackStartTime(player), playbackManager.getBufferedRanges(player)); updateTimeDisplay(currentTime, currentRuntimeTicks, playbackManager.playbackStartTime(player), playbackManager.getBufferedRanges(player));
const item = currentItem; const item = currentItem;
refreshProgramInfoIfNeeded(player, item); refreshProgramInfoIfNeeded(player, item);

4
src/plugins/chromecastPlayer/plugin.js
View file

@ -950,12 +950,12 @@ class ChromecastPlayer {
currentTime(val) { currentTime(val) {
if (val != null) { if (val != null) {
return this.seek(val); return this.seek(val * 10000);
} }
let state = this.lastPlayerData || {}; let state = this.lastPlayerData || {};
state = state.PlayState || {}; state = state.PlayState || {};
return state.PositionTicks; return state.PositionTicks / 10000;
} }
duration() { duration() {

4
src/plugins/sessionPlayer/plugin.js
View file

@ -322,12 +322,12 @@ class SessionPlayer {
currentTime(val) { currentTime(val) {
if (val != null) { if (val != null) {
return this.seek(val); return this.seek(val * 10000);
} }
let state = this.lastPlayerData || {}; let state = this.lastPlayerData || {};
state = state.PlayState || {}; state = state.PlayState || {};
return state.PositionTicks; return state.PositionTicks / 10000;
} }
duration() { duration() {