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

use stream id's to close streams

Browse source
This commit is contained in:
Luke Pulverenti 2015-03-19 12:16:33 -04:00
parent 8bf5fc899c
commit ad2a1b493d
4 changed files with 23 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
dashboard-ui/scripts/librarybrowser.js
View file

@ -1456,6 +1456,19 @@
} }
if (options.showProgramAirInfo) {
var date = parseISO8601Date(item.StartDate, { toLocal: true });
var text = item.StartDate ?
date.toLocaleString() :
'';
lines.push(text || ' ');
lines.push(item.ChannelName || ' ');
}
html += LibraryBrowser.getCardTextLines(lines, cssClass, !options.overlayText); html += LibraryBrowser.getCardTextLines(lines, cssClass, !options.overlayText);
if (options.overlayText) { if (options.overlayText) {

9
dashboard-ui/scripts/livetvitems.js
View file

@ -1,6 +1,6 @@
(function ($, document) { (function ($, document) {
var view = LibraryBrowser.getDefaultItemsView('Poster', 'Poster'); var view = LibraryBrowser.getDefaultItemsView('PosterCard', 'PosterCard');
var currentDate = new Date(); var currentDate = new Date();
currentDate.setHours(0, 0, 0, 0); currentDate.setHours(0, 0, 0, 0);
@ -69,7 +69,8 @@
showTitle: false, showTitle: false,
centerText: true, centerText: true,
lazy: true, lazy: true,
overlayText: false overlayText: false,
showProgramAirInfo: true
}); });
} }
else if (view == "PosterCard") { else if (view == "PosterCard") {
@ -78,9 +79,9 @@
shape: "portrait", shape: "portrait",
context: 'livetv', context: 'livetv',
showTitle: true, showTitle: true,
showYear: true,
lazy: true, lazy: true,
cardLayout: true cardLayout: true,
showProgramAirInfo: true
}); });
} }

6
dashboard-ui/scripts/mediaplayer-video.js
View file

@ -1075,7 +1075,7 @@
if (isStatic) { if (isStatic) {
mp4VideoUrl += seekParam; mp4VideoUrl += seekParam;
} else { } else {
mp4VideoUrl += "&ClientTime=" + new Date().getTime(); mp4VideoUrl += "&StreamId=" + new Date().getTime();
} }
var webmVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.webm', $.extend({}, baseParams, { var webmVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.webm', $.extend({}, baseParams, {
@ -1085,7 +1085,7 @@
videoBitrate: webmQuality.videoBitrate, videoBitrate: webmQuality.videoBitrate,
audioBitrate: webmQuality.audioBitrate, audioBitrate: webmQuality.audioBitrate,
EnableAutoStreamCopy: false, EnableAutoStreamCopy: false,
ClientTime: new Date().getTime() StreamId: new Date().getTime()
})); }));
var hlsVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/master.m3u8', $.extend({}, baseParams, { var hlsVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/master.m3u8', $.extend({}, baseParams, {
@ -1097,7 +1097,7 @@
profile: 'high', profile: 'high',
level: '41', level: '41',
StartTimeTicks: 0, StartTimeTicks: 0,
ClientTime: new Date().getTime() StreamId: new Date().getTime()
})) + seekParam; })) + seekParam;

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

@ -174,7 +174,7 @@
currentSrc = currentSrc.replace('.webm', '.mp4').replace('.m3u8', '.mp4'); currentSrc = currentSrc.replace('.webm', '.mp4').replace('.m3u8', '.mp4');
} else { } else {
currentSrc = currentSrc.replace('.mp4', transcodingExtension).replace('.m4v', transcodingExtension).replace('.mkv', transcodingExtension).replace('.webm', transcodingExtension); currentSrc = currentSrc.replace('.mp4', transcodingExtension).replace('.m4v', transcodingExtension).replace('.mkv', transcodingExtension).replace('.webm', transcodingExtension);
currentSrc = replaceQueryString(currentSrc, 'ClientTime', new Date().getTime()); currentSrc = replaceQueryString(currentSrc, 'StreamId', new Date().getTime());
} }
currentSrc = replaceQueryString(currentSrc, 'AudioBitrate', finalParams.audioBitrate); currentSrc = replaceQueryString(currentSrc, 'AudioBitrate', finalParams.audioBitrate);
@ -1422,7 +1422,7 @@
var seekParam = startPositionTicks ? '#t=' + (startPositionTicks / 10000000) : ''; var seekParam = startPositionTicks ? '#t=' + (startPositionTicks / 10000000) : '';
audioUrl += "&static=true" + seekParam; audioUrl += "&static=true" + seekParam;
} else { } else {
audioUrl += "&ClientTime=" + new Date().getTime(); audioUrl += "&StreamId=" + new Date().getTime();
} }
self.startTimeTicksOffset = isStatic ? 0 : startPositionTicks; self.startTimeTicksOffset = isStatic ? 0 : startPositionTicks;