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

resolve live tv with ios

Browse source
This commit is contained in:
Luke Pulverenti 2015-04-28 09:56:57 -04:00
parent 1ad8c6e955
commit 77fb2070f5
3 changed files with 33 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -379,36 +379,6 @@
return false;
};
self.getVideoTranscodingExtension = function (currentSrc) {
if (currentSrc) {
return self.getCurrentMediaExtension(currentSrc);
}
// safari
if (self.canPlayHls()) {
return '.m3u8';
}
// Chrome, Firefox or IE with plugin installed
// For some reason in chrome pausing mp4 is causing the video to fail.
// So for now it will have to prioritize webm
if (self.canPlayWebm()) {
if ($.browser.msie) {
return '.webm';
}
if ($.browser.chrome) {
return '.webm';
}
// Firefox suddenly having trouble with our webm
return '.webm';
}
return '.mp4';
};
self.changeStream = function (ticks, params) {
var element = self.currentMediaElement;
@ -895,10 +865,7 @@
if (item.MediaType === "Video") {
self.currentMediaElement = self.playVideo(item, self.currentMediaSource, startPosition);
self.currentDurationTicks = self.currentMediaSource.RunTimeTicks;
self.updateNowPlayingInfo(item);
self.playVideo(item, self.currentMediaSource, startPosition);
} else if (item.MediaType === "Audio") {