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

update client sync

Browse source
This commit is contained in:
Luke Pulverenti 2015-09-15 14:09:44 -04:00
parent 4ed9e6d637
commit 39d4daa2fb
10 changed files with 78 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

5
dashboard-ui/scripts/htmlmediarenderer.js
View file

@ -331,7 +331,7 @@
};
var currentSrc;
self.setCurrentSrc = function (val, item, mediaSource, tracks) {
self.setCurrentSrc = function (streamInfo, item, mediaSource, tracks) {
var elem = mediaElement;
@ -340,7 +340,7 @@
return;
}
if (!val) {
if (!streamInfo) {
currentSrc = null;
elem.src = null;
elem.src = "";
@ -354,6 +354,7 @@
return;
}
var val = streamInfo.url;
requiresSettingStartTimeOnStart = false;
var startTime = getStartTime(val);
var playNow = false;

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

@ -755,28 +755,35 @@
var serverInfo = ApiClient.serverInfo();
if (serverInfo.Id) {
var localMediaSource = window.LocalAssetManager.getLocalMediaSource(serverInfo.Id, itemId);
LocalAssetManager.getLocalMediaSource(serverInfo.Id, itemId).done(function (localMediaSource) {
// Use the local media source if a specific one wasn't requested, or the smae one was requested
if (localMediaSource && (!mediaSource || mediaSource.Id == localMediaSource.Id)) {
// Use the local media source if a specific one wasn't requested, or the smae one was requested
if (localMediaSource && (!mediaSource || mediaSource.Id == localMediaSource.Id)) {
var playbackInfo = getPlaybackInfoFromLocalMediaSource(itemId, deviceProfile, startPosition, localMediaSource);
var playbackInfo = getPlaybackInfoFromLocalMediaSource(itemId, deviceProfile, startPosition, localMediaSource);
deferred.resolveWith(null, [playbackInfo]);
return;
}
deferred.resolveWith(null, [playbackInfo]);
return;
}
getPlaybackInfoWithoutLocalMediaSource(itemId, deviceProfile, startPosition, mediaSource, audioStreamIndex, subtitleStreamIndex, liveStreamId, deferred);
});
return;
}
self.getPlaybackInfoInternal(itemId, deviceProfile, startPosition, mediaSource, audioStreamIndex, subtitleStreamIndex, liveStreamId).done(function (result) {
deferred.resolveWith(null, [result]);
}).fail(function () {
deferred.reject();
});
getPlaybackInfoWithoutLocalMediaSource(itemId, deviceProfile, startPosition, mediaSource, audioStreamIndex, subtitleStreamIndex, liveStreamId, deferred);
});
return deferred.promise();
}
function getPlaybackInfoWithoutLocalMediaSource(itemId, deviceProfile, startPosition, mediaSource, audioStreamIndex, subtitleStreamIndex, liveStreamId, deferred) {
self.getPlaybackInfoInternal(itemId, deviceProfile, startPosition, mediaSource, audioStreamIndex, subtitleStreamIndex, liveStreamId).done(function (result) {
deferred.resolveWith(null, [result]);
}).fail(function () {
deferred.reject();
});
}
self.getPlaybackInfoInternal = function (itemId, deviceProfile, startPosition, mediaSource, audioStreamIndex, subtitleStreamIndex, liveStreamId) {
var postData = {
@ -859,7 +866,9 @@
if (mediaSource.Protocol == 'File') {
return FileSystemBridge.fileExists(mediaSource.Path);
var exists = FileSystemBridge.fileExists(mediaSource.Path);
Logger.log('FileSystemBridge.fileExists: path: ' + mediaSource.Path + ' result: ' + exists);
return exists;
}
}

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

@ -918,8 +918,6 @@
self.playVideoInternal = function (item, mediaSource, startPosition, streamInfo, callback) {
var videoUrl = streamInfo.url;
self.startTimeTicksOffset = streamInfo.startTimeTicksOffset;
var mediaStreams = mediaSource.MediaStreams || [];
@ -928,8 +926,8 @@
});
// Reports of stuttering with h264 stream copy in IE
if (streamInfo.playMethod == 'Transcode' && videoUrl.indexOf('.m3u8') == -1) {
videoUrl += '&EnableAutoStreamCopy=false';
if (streamInfo.playMethod == 'Transcode' && streamInfo.url.indexOf('.m3u8') == -1) {
streamInfo.url += '&EnableAutoStreamCopy=false';
}
// Create video player
@ -1079,7 +1077,8 @@
mediaRenderer.init().done(function () {
self.setSrcIntoRenderer(mediaRenderer, videoUrl, item, self.currentMediaSource);
self.setSrcIntoRenderer(mediaRenderer, streamInfo, item, self.currentMediaSource);
self.streamInfo = streamInfo;
if (callback) {
callback();

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

@ -19,6 +19,7 @@
self.isLocalPlayer = true;
self.isDefaultPlayer = true;
self.streamInfo = {};
self.name = 'Html5 Player';
@ -649,13 +650,12 @@
self.currentSubtitleStreamIndex = subtitleStreamIndex;
currentSrc = streamInfo.url;
changeStreamToUrl(mediaRenderer, playSessionId, currentSrc, streamInfo.startTimeTicksOffset || 0);
changeStreamToUrl(mediaRenderer, playSessionId, streamInfo, streamInfo.startTimeTicksOffset || 0);
}
});
};
function changeStreamToUrl(mediaRenderer, playSessionId, url, newPositionTicks) {
function changeStreamToUrl(mediaRenderer, playSessionId, streamInfo, newPositionTicks) {
clearProgressInterval();
@ -679,7 +679,7 @@
ApiClient.stopActiveEncodings(playSessionId).done(function () {
//self.startTimeTicksOffset = newPositionTicks;
self.setSrcIntoRenderer(mediaRenderer, url, self.currentItem, self.currentMediaSource);
self.setSrcIntoRenderer(mediaRenderer, streamInfo, self.currentItem, self.currentMediaSource);
});
@ -687,11 +687,11 @@
self.updateTextStreamUrls(newPositionTicks || 0);
} else {
self.startTimeTicksOffset = newPositionTicks || 0;
self.setSrcIntoRenderer(mediaRenderer, url, self.currentItem, self.currentMediaSource);
self.setSrcIntoRenderer(mediaRenderer, streamInfo, self.currentItem, self.currentMediaSource);
}
}
self.setSrcIntoRenderer = function (mediaRenderer, url, item, mediaSource) {
self.setSrcIntoRenderer = function (mediaRenderer, streamInfo, item, mediaSource) {
var subtitleStreams = mediaSource.MediaStreams.filter(function (s) {
return s.Type == 'Subtitle';
@ -715,7 +715,8 @@
});
}
mediaRenderer.setCurrentSrc(url, item, mediaSource, tracks);
mediaRenderer.setCurrentSrc(streamInfo, item, mediaSource, tracks);
self.streamInfo = streamInfo;
};
self.setCurrentTime = function (ticks, positionSlider, currentTimeElement) {
@ -1523,6 +1524,8 @@
self.currentMediaRenderer = null;
self.currentItem = null;
self.currentMediaSource = null;
self.currentSubtitleStreamIndex = null;
self.streamInfo = {};
});
@ -1532,6 +1535,8 @@
self.currentMediaRenderer = null;
self.currentItem = null;
self.currentMediaSource = null;
self.currentSubtitleStreamIndex = null;
self.streamInfo = {};
}
if (self.isFullScreen()) {
@ -1561,8 +1566,6 @@
PlayState: {}
};
var currentSrc = mediaRenderer ? mediaRenderer.currentSrc() : null;
if (mediaRenderer) {
state.PlayState.VolumeLevel = mediaRenderer.volume() * 100;
@ -1571,6 +1574,8 @@
state.PlayState.PositionTicks = self.getCurrentTicks(mediaRenderer);
state.PlayState.RepeatMode = self.getRepeatMode();
var currentSrc = mediaRenderer.currentSrc();
if (currentSrc) {
var audioStreamIndex = getParameterByName('AudioStreamIndex', currentSrc);
@ -1580,11 +1585,9 @@
}
state.PlayState.SubtitleStreamIndex = self.currentSubtitleStreamIndex;
state.PlayState.PlayMethod = getParameterByName('static', currentSrc) == 'true' ?
'DirectStream' :
'Transcode';
state.PlayState.PlayMethod = self.streamInfo.playMethod;
state.PlayState.LiveStreamId = getParameterByName('LiveStreamId', currentSrc);
state.PlayState.LiveStreamId = mediaSource.LiveStreamId;
state.PlayState.PlaySessionId = getParameterByName('PlaySessionId', currentSrc);
}
}
@ -1911,7 +1914,8 @@
// Set volume first to avoid an audible change
mediaRenderer.volume(initialVolume);
mediaRenderer.setCurrentSrc(audioUrl, item, mediaSource);
mediaRenderer.setCurrentSrc(streamInfo, item, mediaSource);
self.streamInfo = streamInfo;
});
}

7
dashboard-ui/scripts/mypreferenceshome.js
View file

@ -5,7 +5,7 @@
var folderHtml = '';
folderHtml += '<div class="paperCheckboxList">';
folderHtml += result.Items.map(function (i) {
folderHtml += result.map(function (i) {
var currentHtml = '';
@ -141,10 +141,11 @@
});
var promise2 = ApiClient.getUserViews({}, user.Id);
var promise3 = ApiClient.getJSON(ApiClient.getUrl("Users/" + user.Id + "/SpecialViewOptions"));
var promise4 = ApiClient.getJSON(ApiClient.getUrl("Users/" + user.Id + "/GroupingOptions"));
$.when(promise1, promise2, promise3).done(function (r1, r2, r3) {
$.when(promise1, promise2, promise3, promise4).done(function (r1, r2, r3, r4) {
renderViews(page, user, r1[0]);
renderViews(page, user, r4[0]);
renderLatestItems(page, user, r1[0]);
renderViewOrder(page, user, r2[0]);
renderViewStyles(page, user, r3[0]);