milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update video osd

Browse source
This commit is contained in:
Luke Pulverenti 2017-01-03 14:37:10 -05:00
parent afb01571ff
commit f80fcc874a
16 changed files with 513 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

17
dashboard-ui/bower_components/emby-webcomponents/playback/playbackmanager.js vendored
View file

@ -997,7 +997,8 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
Name: t.Name || (item.Name + ' Trailer'),
Url: t.Url,
MediaType: 'Video',
Type: 'Trailer'
Type: 'Trailer',
ServerId: apiClient.serverId()
};
})
});
@ -1212,7 +1213,19 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
return player.duration();
}
return getPlayerData(player).streamInfo.mediaSource.RunTimeTicks || ((player.duration() || 0) * 10000);
var streamInfo = getPlayerData(player).streamInfo;
if (streamInfo && streamInfo.mediaSource && streamInfo.mediaSource.RunTimeTicks) {
return streamInfo.mediaSource.RunTimeTicks;
}
var playerDuration = player.duration();
if (playerDuration) {
playerDuration *= 10000;
}
return playerDuration;
};
function getCurrentTicks(player) {