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

rework transcoding settings

Browse source
This commit is contained in:
Luke Pulverenti 2015-07-30 21:52:11 -04:00
parent 5439ca56b6
commit a1890b0e4e
8 changed files with 60 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/scripts/encodingsettings.js
View file

@ -11,6 +11,7 @@
}).checkboxradio('refresh');
$('#selectThreadCount', page).val(config.EncodingThreadCount).selectmenu('refresh');
$('#txtDownMixAudioBoost', page).val(config.DownMixAudioBoost);
$('#txtTranscodingTempPath', page).val(config.TranscodingTempPath || '');
@ -29,6 +30,7 @@
config.DownMixAudioBoost = $('#txtDownMixAudioBoost', form).val();
config.TranscodingTempPath = $('#txtTranscodingTempPath', form).val();
config.EnableThrottling = $('#chkEnableThrottle', form).checked();
config.EncodingThreadCount = $('#selectThreadCount', form).val();
ApiClient.updateNamedConfiguration("encoding", config).done(Dashboard.processServerConfigurationUpdateResult);
});

6
dashboard-ui/scripts/librarymenu.js
View file

@ -333,12 +333,8 @@
html += '</div>';
html += '<div class="userMenuOptions">';
html += '<div class="sidebarDivider"></div>';
html += '<a class="sidebarLink lnkMediaFolder inboxSidebarLink" data-itemid="inbox" onclick="return LibraryMenu.onLinkClicked(event, this);" href="notificationlist.html"><iron-icon icon="inbox" class="sidebarLinkIcon"></iron-icon>';
html += Globalize.translate('ButtonInbox');
html += '<div class="btnNotifications"><div class="btnNotificationsInner">0</div></div>';
html += '</a>';
html += '<div class="sidebarDivider"></div>';
if (user.localUser && showUserAtTop()) {
html += '<a class="sidebarLink lnkMediaFolder lnkMySettings" onclick="return LibraryMenu.onLinkClicked(event, this);" data-itemid="mysync" href="mypreferencesmenu.html?userId=' + user.localUser.Id + '"><iron-icon icon="settings" class="sidebarLinkIcon"></iron-icon><span class="sidebarLinkText">' + Globalize.translate('ButtonSettings') + '</span></a>';

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

@ -972,8 +972,7 @@
self.playVideoInternal = function (item, mediaSource, startPosition, streamInfo, callback) {
var videoUrl = streamInfo.url;
var contentType = streamInfo.mimeType;
var startPositionInSeekParam = streamInfo.startPositionInSeekParam;
self.startTimeTicksOffset = streamInfo.startTimeTicksOffset;
var mediaStreams = mediaSource.MediaStreams || [];
@ -1137,25 +1136,7 @@
mediaRenderer.init().done(function () {
var textStreams = subtitleStreams.filter(function (s) {
return s.DeliveryMethod == 'External';
});
var tracks = [];
for (var i = 0, length = textStreams.length; i < length; i++) {
var textStream = textStreams[i];
var textStreamUrl = !textStream.IsExternalUrl ? ApiClient.getUrl(textStream.DeliveryUrl) : textStream.DeliveryUrl;
tracks.push({
url: textStreamUrl,
language: (textStream.Language || 'und'),
isDefault: textStream.Index == mediaSource.DefaultSubtitleStreamIndex
});
}
mediaRenderer.setCurrentSrc(videoUrl, item, mediaSource, tracks);
self.setSrcIntoRenderer(mediaRenderer, videoUrl, item, self.currentMediaSource);
if (callback) {
callback();

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

@ -640,7 +640,7 @@
ApiClient.stopActiveEncodings(playSessionId).done(function () {
//self.startTimeTicksOffset = newPositionTicks;
mediaRenderer.setCurrentSrc(url, self.currentItem, self.currentMediaSource);
self.setSrcIntoRenderer(mediaRenderer, url, self.currentItem, self.currentMediaSource);
});
@ -648,10 +648,37 @@
self.updateTextStreamUrls(newPositionTicks || 0);
} else {
self.startTimeTicksOffset = newPositionTicks || 0;
mediaRenderer.setCurrentSrc(url, self.currentItem, self.currentMediaSource);
self.setSrcIntoRenderer(mediaRenderer, url, self.currentItem, self.currentMediaSource);
}
}
self.setSrcIntoRenderer = function (mediaRenderer, url, item, mediaSource) {
var subtitleStreams = mediaSource.MediaStreams.filter(function (s) {
return s.Type == 'Subtitle';
});
var textStreams = subtitleStreams.filter(function (s) {
return s.DeliveryMethod == 'External';
});
var tracks = [];
for (var i = 0, length = textStreams.length; i < length; i++) {
var textStream = textStreams[i];
var textStreamUrl = !textStream.IsExternalUrl ? ApiClient.getUrl(textStream.DeliveryUrl) : textStream.DeliveryUrl;
tracks.push({
url: textStreamUrl,
language: (textStream.Language || 'und'),
isDefault: textStream.Index == mediaSource.DefaultSubtitleStreamIndex
});
}
mediaRenderer.setCurrentSrc(url, item, mediaSource, tracks);
};
self.setCurrentTime = function (ticks, positionSlider, currentTimeElement) {
// Convert to ticks