';
optionHtml += '';
@@ -845,85 +844,6 @@
return html;
}
- function getVideoQualityOptions(mediaStreams) {
-
- var videoStream = mediaStreams.filter(function (stream) {
- return stream.Type == "Video";
- })[0];
-
- var bitrateSetting = AppSettings.maxStreamingBitrate();
-
- var maxAllowedWidth = self.getMaxPlayableWidth();
-
- var options = [];
-
- // We have media info
- if (videoStream && videoStream.Width) {
-
- maxAllowedWidth = videoStream.Width;
- }
-
- // Some 1080- videos are reported as 1912?
- if (maxAllowedWidth >= 1900) {
- options.push({ name: '1080p - 30Mbps', maxWidth: 1920, bitrate: 30000000 });
- options.push({ name: '1080p - 25Mbps', maxWidth: 1920, bitrate: 25000000 });
- options.push({ name: '1080p - 20Mbps', maxWidth: 1920, bitrate: 20000000 });
- options.push({ name: '1080p - 15Mbps', maxWidth: 1920, bitrate: 15000000 });
- options.push({ name: '1080p - 10Mbps', maxWidth: 1920, bitrate: 10000000 });
- options.push({ name: '1080p - 8Mbps', maxWidth: 1920, bitrate: 8000000 });
- options.push({ name: '1080p - 6Mbps', maxWidth: 1920, bitrate: 6000000 });
- options.push({ name: '1080p - 5Mbps', maxWidth: 1920, bitrate: 5000000 });
- }
- else if (maxAllowedWidth >= 1260) {
- options.push({ name: '720p - 10Mbps', maxWidth: 1280, bitrate: 10000000 });
- options.push({ name: '720p - 8Mbps', maxWidth: 1280, bitrate: 8000000 });
- options.push({ name: '720p - 6Mbps', maxWidth: 1280, bitrate: 6000000 });
- options.push({ name: '720p - 5Mbps', maxWidth: 1280, bitrate: 5000000 });
- }
- else if (maxAllowedWidth >= 460) {
- options.push({ name: '480p - 4Mbps', maxWidth: 720, bitrate: 4000000 });
- options.push({ name: '480p - 3Mbps', maxWidth: 720, bitrate: 3000000 });
- options.push({ name: '480p - 2.5Mbps', maxWidth: 720, bitrate: 2500000 });
- options.push({ name: '480p - 2Mbps', maxWidth: 720, bitrate: 2000000 });
- options.push({ name: '480p - 1.5Mbps', maxWidth: 720, bitrate: 1500000 });
- }
-
- if (maxAllowedWidth >= 1260) {
- options.push({ name: '720p - 4Mbps', maxWidth: 1280, bitrate: 4000000 });
- options.push({ name: '720p - 3Mbps', maxWidth: 1280, bitrate: 3000000 });
- options.push({ name: '720p - 2Mbps', maxWidth: 1280, bitrate: 2000000 });
-
- // The extra 1 is because they're keyed off the bitrate value
- options.push({ name: '720p - 1Mbps', maxWidth: 1280, bitrate: 1000001 });
- }
-
- options.push({ name: '480p - 1.0Mbps', maxWidth: 720, bitrate: 1000000 });
- options.push({ name: '480p - 720kbps', maxWidth: 720, bitrate: 720000 });
- options.push({ name: '480p - 420kbps', maxWidth: 720, bitrate: 420000 });
- options.push({ name: '360p', maxWidth: 640, bitrate: 400000 });
- options.push({ name: '240p', maxWidth: 426, bitrate: 320000 });
-
- var i, length, option;
- var selectedIndex = -1;
- for (i = 0, length = options.length; i < length; i++) {
-
- option = options[i];
-
- if (selectedIndex == -1 && option.bitrate <= bitrateSetting) {
- selectedIndex = i;
- }
- }
-
- if (selectedIndex == -1) {
-
- selectedIndex = options.length - 1;
- }
-
- options[selectedIndex].selected = true;
-
- return options;
- }
-
function bindEventsForPlayback() {
var hideElementsOnIdle = !$.browser.mobile;
@@ -1007,101 +927,20 @@
}
};
- self.playVideo = function (playbackInfo, item, mediaSource, startPosition) {
+ self.playVideo = function (item, mediaSource, startPosition) {
+
+ var streamInfo = self.createStreamInfo('video', item, mediaSource, startPosition);
+
+ var videoUrl = streamInfo.url;
+ var contentType = streamInfo.contentType;
+ var startPositionInSeekParam = streamInfo.startPositionInSeekParam;
+ self.startTimeTicksOffset = streamInfo.startTimeTicksOffset;
var mediaStreams = mediaSource.MediaStreams || [];
-
var subtitleStreams = mediaStreams.filter(function (s) {
return s.Type == 'Subtitle';
});
- var selectedSubtitleStream = subtitleStreams.filter(function (s) {
- return s.Index == mediaSource.DefaultSubtitleStreamIndex;
-
- })[0];
-
- var baseParams = {
- audioChannels: 2,
- StartTimeTicks: startPosition,
- AudioStreamIndex: mediaSource.DefaultAudioStreamIndex,
- deviceId: ApiClient.deviceId(),
- Static: false,
- mediaSourceId: mediaSource.Id,
- api_key: ApiClient.accessToken(),
- StreamId: playbackInfo.StreamId
- };
-
- if (selectedSubtitleStream && (!self.supportsSubtitleStreamExternally(selectedSubtitleStream) || !self.supportsTextTracks())) {
- baseParams.SubtitleStreamIndex = mediaSource.DefaultSubtitleStreamIndex;
- }
-
- var mp4Quality = getVideoQualityOptions(mediaStreams).filter(function (opt) {
- return opt.selected;
- })[0];
- mp4Quality = $.extend(mp4Quality, self.getFinalVideoParams(mediaSource, mp4Quality.maxWidth, mp4Quality.bitrate, baseParams.AudioStreamIndex, baseParams.SubtitleStreamIndex, '.mp4'));
-
- var webmQuality = getVideoQualityOptions(mediaStreams).filter(function (opt) {
- return opt.selected;
- })[0];
- webmQuality = $.extend(webmQuality, self.getFinalVideoParams(mediaSource, webmQuality.maxWidth, webmQuality.bitrate, baseParams.AudioStreamIndex, baseParams.SubtitleStreamIndex, '.webm'));
-
- var m3U8Quality = getVideoQualityOptions(mediaStreams).filter(function (opt) {
- return opt.selected;
- })[0];
- m3U8Quality = $.extend(m3U8Quality, self.getFinalVideoParams(mediaSource, mp4Quality.maxWidth, mp4Quality.bitrate, baseParams.AudioStreamIndex, baseParams.SubtitleStreamIndex, '.mp4'));
-
- var isStatic = mp4Quality.isStatic;
-
- self.startTimeTicksOffset = isStatic ? 0 : startPosition || 0;
-
- var startPositionInSeekParam = startPosition ? (startPosition / 10000000) : 0;
- var seekParam = startPositionInSeekParam ? '#t=' + startPositionInSeekParam : '';
-
- var mp4VideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.mp4', $.extend({}, baseParams, {
- Static: isStatic,
- maxWidth: mp4Quality.maxWidth,
- videoBitrate: mp4Quality.videoBitrate,
- audioBitrate: mp4Quality.audioBitrate,
- VideoCodec: mp4Quality.videoCodec,
- AudioCodec: mp4Quality.audioCodec,
- profile: 'high',
- //EnableAutoStreamCopy: false,
- level: '41'
- }));
-
- if (isStatic && mediaSource.Protocol == 'Http' && !mediaSource.RequiredHttpHeaders.length) {
- mp4VideoUrl = mediaSource.Path;
- }
-
- if (isStatic) {
- mp4VideoUrl += seekParam;
- } else {
- mp4VideoUrl += "&StreamId=" + new Date().getTime();
- }
-
- var webmVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.webm', $.extend({}, baseParams, {
- VideoCodec: 'vpx',
- AudioCodec: 'Vorbis',
- maxWidth: webmQuality.maxWidth,
- videoBitrate: webmQuality.videoBitrate,
- audioBitrate: webmQuality.audioBitrate,
- EnableAutoStreamCopy: false,
- StreamId: new Date().getTime()
- }));
-
- var hlsVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/master.m3u8', $.extend({}, baseParams, {
- maxWidth: m3U8Quality.maxWidth,
- videoBitrate: m3U8Quality.videoBitrate,
- audioBitrate: m3U8Quality.audioBitrate,
- VideoCodec: m3U8Quality.videoCodec,
- AudioCodec: m3U8Quality.audioCodec,
- profile: 'high',
- level: '41',
- StartTimeTicks: 0,
- StreamId: new Date().getTime()
-
- })) + seekParam;
-
// Get Video Poster (Code from librarybrowser.js)
var screenWidth = Math.max(screen.height, screen.width),
posterCode = '';
@@ -1136,52 +975,26 @@
// Can't autoplay in these browsers so we need to use the full controls
if (requiresNativeControls) {
- html += '
";
}
- if (clientLowered == "media browser theater") {
+ if (clientLowered == "emby theater") {
return "
";
}
@@ -1288,7 +1282,7 @@ $(document).on('pagebeforeshow', "#dashboardPage", DashboardPage.onPageShow)
$('.tourButtonText', elem).html(Globalize.translate('ButtonTakeTheTourToSeeWhatsNew'));
} else {
-
+
$('.tourHeader', elem).html(Globalize.translate('HeaderWelcomeToProjectServerDashboard'));
$('.tourButtonText', elem).html(Globalize.translate('ButtonTakeTheTour'));
}
@@ -1338,4 +1332,26 @@ $(document).on('pagebeforeshow', "#dashboardPage", DashboardPage.onPageShow)
});
-})(jQuery, document, window);
\ No newline at end of file
+})(jQuery, document, window);
+
+(function () {
+
+ $(document).on('pagebeforeshow', ".type-interior", function () {
+
+ var page = this;
+
+ Dashboard.getPluginSecurityInfo().done(function (pluginSecurityInfo) {
+
+ if (!$('.staticSupporterPromotion', page).length) {
+ $('.supporterPromotion', page).remove();
+
+ if (!pluginSecurityInfo.IsMBSupporter) {
+ $('.content-primary', page).append('');
+ }
+ }
+
+ });
+
+ });
+
+})();
\ No newline at end of file
diff --git a/dashboard-ui/scripts/encodingsettings.js b/dashboard-ui/scripts/encodingsettings.js
index 80b1063d5..fcd254884 100644
--- a/dashboard-ui/scripts/encodingsettings.js
+++ b/dashboard-ui/scripts/encodingsettings.js
@@ -3,7 +3,8 @@
function loadPage(page, config) {
$('#chkEnableDebugEncodingLogging', page).checked(config.EnableDebugLogging).checkboxradio('refresh');
-
+ $('#chkEnableThrottle', page).checked(config.EnableThrottling).checkboxradio('refresh');
+
$('.radioEncodingQuality', page).each(function() {
this.checked = config.EncodingQuality == this.value;
@@ -67,6 +68,7 @@
config.EncodingQuality = $('.radioEncodingQuality:checked', form).val();
config.DownMixAudioBoost = $('#txtDownMixAudioBoost', form).val();
config.TranscodingTempPath = $('#txtTranscodingTempPath', form).val();
+ config.EnableThrottling = $('#chkEnableThrottle', form).checked();
ApiClient.updateNamedConfiguration("encoding", config).done(Dashboard.processServerConfigurationUpdateResult);
});
diff --git a/dashboard-ui/scripts/gamegenrepage.js b/dashboard-ui/scripts/gamegenrepage.js
index 909d16735..4167efe54 100644
--- a/dashboard-ui/scripts/gamegenrepage.js
+++ b/dashboard-ui/scripts/gamegenrepage.js
@@ -6,7 +6,7 @@
SortBy: "SortName",
SortOrder: "Ascending",
Recursive: true,
- Fields: "DateCreated",
+ Fields: "DateCreated,ItemCounts",
StartIndex: 0
};
diff --git a/dashboard-ui/scripts/gamestudiospage.js b/dashboard-ui/scripts/gamestudiospage.js
index 31f39a2ba..e7bc72318 100644
--- a/dashboard-ui/scripts/gamestudiospage.js
+++ b/dashboard-ui/scripts/gamestudiospage.js
@@ -7,7 +7,7 @@
SortOrder: "Ascending",
MediaTypes: "Game",
Recursive: true,
- Fields: "UserData",
+ Fields: "ItemCounts",
StartIndex: 0
};
diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js
index 0d2bccb64..8e5664657 100644
--- a/dashboard-ui/scripts/indexpage.js
+++ b/dashboard-ui/scripts/indexpage.js
@@ -125,7 +125,6 @@
Limit: 24,
Fields: "PrimaryImageAspectRatio,SyncInfo",
- IsPlayed: false,
ImageTypeLimit: 1,
EnableImageTypes: "Primary,Backdrop,Banner,Thumb"
};
@@ -470,7 +469,7 @@
switch (index) {
case 0:
- return 'smalllibrarytiles-automobile';
+ return 'librarytiles-automobile';
case 1:
return 'resume';
case 2:
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 417922fc7..48aa421ca 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -477,7 +477,7 @@
if (context != 'folders') {
if (item.CollectionType == 'movies') {
- return 'movieslatest.html?topParentId=' + item.Id;
+ return 'moviesrecommended.html?topParentId=' + item.Id;
}
if (item.CollectionType == 'boxsets') {
@@ -1257,10 +1257,6 @@
if (options.showChildCountIndicator && item.ChildCount) {
cssClass += ' groupedCard';
-
- if (item.Type == 'Series') {
- cssClass += ' unplayedGroupings';
- }
}
if (options.showTitle && !options.overlayText) {
diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js
index 28fe0ab5e..577ef9df9 100644
--- a/dashboard-ui/scripts/librarylist.js
+++ b/dashboard-ui/scripts/librarylist.js
@@ -512,10 +512,6 @@
GroupItems: false
};
- if ($(card).hasClass('unplayedGroupings')) {
- options.IsPlayed = false;
- }
-
var promise2 = ApiClient.getJSON(ApiClient.getUrl('Users/' + userId + '/Items/Latest', options));
$.when(promise1, promise2).done(function (response1, response2) {
diff --git a/dashboard-ui/scripts/livetvitems.js b/dashboard-ui/scripts/livetvitems.js
index 4dfbec203..6639d3735 100644
--- a/dashboard-ui/scripts/livetvitems.js
+++ b/dashboard-ui/scripts/livetvitems.js
@@ -8,7 +8,7 @@
// The base query options
var query = {
UserId: Dashboard.getCurrentUserId(),
- SortBy: "PremiereDate,SortName",
+ SortBy: "StartDate,SortName",
SortOrder: "Ascending",
StartIndex: 0
};
@@ -19,19 +19,6 @@
function updateFilterControls(page) {
- // Reset form values using the last used query
- $('.radioSortBy', page).each(function () {
-
- this.checked = (query.SortBy || '').toLowerCase() == this.getAttribute('data-sortby').toLowerCase();
-
- }).checkboxradio('refresh');
-
- $('.radioSortOrder', page).each(function () {
-
- this.checked = (query.SortOrder || '').toLowerCase() == this.getAttribute('data-sortorder').toLowerCase();
-
- }).checkboxradio('refresh');
-
$('#selectView', page).val(view).selectmenu('refresh');
$('.alphabetPicker', page).alphaValue(query.NameStartsWithOrGreater);
$('#selectPageSize', page).val(query.Limit).selectmenu('refresh');
@@ -58,7 +45,6 @@
$('.listTopPaging', page).html(pagingHtml).trigger('create');
updateFilterControls(page);
- var trigger = false;
if (view == "Poster") {
html = LibraryBrowser.getPosterViewHtml({
@@ -112,18 +98,6 @@
var page = this;
- $('.radioSortBy', this).on('click', function () {
- query.StartIndex = 0;
- query.SortBy = this.getAttribute('data-sortby');
- reloadItems(page);
- });
-
- $('.radioSortOrder', this).on('click', function () {
- query.StartIndex = 0;
- query.SortOrder = this.getAttribute('data-sortorder');
- reloadItems(page);
- });
-
$('#selectView', this).on('change', function () {
view = this.value;
@@ -179,6 +153,7 @@
}
query.IsMovie = getParameterByName('type') == 'movies' ? true : null;
+ query.IsSports = getParameterByName('type') == 'sports' ? true : null;
var viewkey = getSavedQueryKey();
diff --git a/dashboard-ui/scripts/livetvsuggested.js b/dashboard-ui/scripts/livetvsuggested.js
index 827b2f04a..bacf8dd0a 100644
--- a/dashboard-ui/scripts/livetvsuggested.js
+++ b/dashboard-ui/scripts/livetvsuggested.js
@@ -33,7 +33,8 @@
IsAiring: false,
HasAired: false,
limit: 10,
- IsMovie: false
+ IsMovie: false,
+ IsSports: false
}).done(function (result) {
@@ -73,6 +74,28 @@
$('.upcomingTvMovieItems', page).html(html).lazyChildren();
});
+
+ ApiClient.getLiveTvRecommendedPrograms({
+
+ userId: Dashboard.getCurrentUserId(),
+ IsAiring: false,
+ HasAired: false,
+ limit: 10,
+ IsSports: true
+
+ }).done(function (result) {
+
+ var html = LibraryBrowser.getPosterViewHtml({
+ items: result.Items,
+ shape: "auto",
+ showTitle: true,
+ coverImage: true,
+ overlayText: false,
+ lazy: true
+ });
+
+ $('.upcomingSportsItems', page).html(html).lazyChildren();
+ });
}
$(document).on('pagebeforeshow', "#liveTvSuggestedPage", function () {
diff --git a/dashboard-ui/scripts/mediacontroller.js b/dashboard-ui/scripts/mediacontroller.js
index ab70725f5..0143a1b6c 100644
--- a/dashboard-ui/scripts/mediacontroller.js
+++ b/dashboard-ui/scripts/mediacontroller.js
@@ -53,13 +53,21 @@
}).on('playbackstop.mediacontroller', function (e, state) {
- ApiClient.reportPlaybackStopped({
-
+ var stopInfo = {
itemId: state.NowPlayingItem.Id,
mediaSourceId: state.PlayState.MediaSourceId,
positionTicks: state.PlayState.PositionTicks
+ };
- });
+ if (state.PlayState.LiveStreamId) {
+ stopInfo.LiveStreamId = state.PlayState.LiveStreamId;
+ }
+
+ if (state.PlayState.PlaySessionId) {
+ stopInfo.PlaySessionId = state.PlayState.PlaySessionId;
+ }
+
+ ApiClient.reportPlaybackStopped(stopInfo);
}).on('positionchange.mediacontroller', function (e, state) {
diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js
index 1404aed3d..41fe8e53f 100644
--- a/dashboard-ui/scripts/mediaplayer-video.js
+++ b/dashboard-ui/scripts/mediaplayer-video.js
@@ -143,10 +143,6 @@
self.changeStream(self.getCurrentTicks(), { AudioStreamIndex: index });
};
- self.supportsSubtitleStreamExternally = function (stream) {
- return stream.Type == 'Subtitle' && stream.IsTextSubtitleStream && stream.SupportsExternalStream;
- }
-
self.setSubtitleStreamIndex = function (index) {
if (!self.supportsTextTracks()) {
@@ -166,7 +162,7 @@
if (currentStream && !newStream) {
- if (!self.supportsSubtitleStreamExternally(currentStream)) {
+ if (currentStream.DeliveryMethod != 'External') {
// Need to change the transcoded stream to remove subs
self.changeStream(self.getCurrentTicks(), { SubtitleStreamIndex: -1 });
@@ -174,7 +170,7 @@
}
else if (!currentStream && newStream) {
- if (self.supportsSubtitleStreamExternally(newStream)) {
+ if (newStream.DeliveryMethod == 'External') {
selectedTrackElementIndex = index;
} else {
@@ -184,10 +180,10 @@
}
else if (currentStream && newStream) {
- if (self.supportsSubtitleStreamExternally(newStream)) {
+ if (newStream.DeliveryMethod == 'External') {
selectedTrackElementIndex = index;
- if (!self.supportsSubtitleStreamExternally(currentStream)) {
+ if (currentStream.DeliveryMethod != 'External') {
self.changeStream(self.getCurrentTicks(), { SubtitleStreamIndex: -1 });
}
} else {
@@ -207,7 +203,7 @@
var modes = ['disabled', 'showing', 'hidden'];
var textStreams = self.currentMediaSource.MediaStreams.filter(function (s) {
- return self.supportsSubtitleStreamExternally(s);
+ return s.DeliveryMethod == 'External';
});
var newStream = textStreams.filter(function (s) {
@@ -428,14 +424,12 @@
if (!$(this).hasClass('selectedMediaPopupOption')) {
- var maxWidth = parseInt(this.getAttribute('data-maxwidth'));
var bitrate = parseInt(this.getAttribute('data-bitrate'));
AppSettings.maxStreamingBitrate(bitrate);
self.changeStream(self.getCurrentTicks(), {
- MaxWidth: maxWidth,
Bitrate: bitrate
});
}
@@ -796,7 +790,12 @@
var currentSrc = self.getCurrentSrc(self.currentMediaElement).toLowerCase();
var isStatic = currentSrc.indexOf('static=true') != -1;
- var options = getVideoQualityOptions(self.currentMediaSource.MediaStreams);
+ var videoStream = self.currentMediaSource.MediaStreams.filter(function (stream) {
+ return stream.Type == "Video";
+ })[0];
+ var videoWidth = videoStream ? videoStream.Width : null;
+
+ var options = self.getVideoQualityOptions(videoWidth);
if (isStatic) {
options[0].name = "Direct";
@@ -819,7 +818,7 @@
cssClass += ' selectedMediaPopupOption';
}
- var optionHtml = '