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

convert programs and channels to new providers

Browse source
This commit is contained in:
Luke Pulverenti 2014-01-29 11:16:24 -05:00
parent 84347e8631
commit f83b2b662a
3 changed files with 5 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

19
dashboard-ui/scripts/mediaplayer.js
View file

@ -239,15 +239,14 @@
currentSrc = replaceQueryString(currentSrc, 'MaxWidth', finalParams.maxWidth);
currentSrc = replaceQueryString(currentSrc, 'VideoBitrate', finalParams.videoBitrate);
currentSrc = replaceQueryString(currentSrc, 'AudioBitrate', finalParams.audioBitrate);
currentSrc = replaceQueryString(currentSrc, 'Static', finalParams.isStatic);
if (finalParams.isStatic) {
currentSrc = currentSrc.replace('.webm', '.mp4').replace('.m3u8', '.mp4');
} else {
currentSrc = currentSrc.replace('.mp4', getTranscodingExtension());
currentSrc = currentSrc.replace('.mp4', transcodingExtension);
}
currentSrc = replaceQueryString(currentSrc, 'Static', finalParams.isStatic);
clearProgressInterval();
$(element).off('ended.playbackstopped').off('ended.playnext').on("play.onceafterseek", function () {
@ -1852,19 +1851,7 @@
var currentSrc = currentMediaElement.currentSrc.toLowerCase();
var isStatic = currentSrc.indexOf('static=true') != -1;
var transcodingExtension = isStatic ? getTranscodingExtension() : null;
if (!transcodingExtension) {
if (currentSrc.indexOf('.m3u8') != -1) {
transcodingExtension = '.m3u8';
}
else if (currentSrc.indexOf('.webm') != -1) {
transcodingExtension = '.webm';
}
else {
transcodingExtension = '.mp4';
}
}
var transcodingExtension = getTranscodingExtension();
var currentAudioStreamIndex = getParameterByName('AudioStreamIndex', currentMediaElement.currentSrc);