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 program display titles

Browse source
This commit is contained in:
Luke Pulverenti 2017-01-22 16:09:16 -05:00
parent befa669bc5
commit 2e4314a278
6 changed files with 25 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

16
dashboard-ui/bower_components/emby-webcomponents/playback/playbackmanager.js vendored
View file

@ -1554,7 +1554,7 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
}
}
function playInternal(item, playOptions, callback) {
function playInternal(item, playOptions, onPlaybackStartedFn) {
if (item.IsPlaceHolder) {
loading.hide();
@ -1578,16 +1578,16 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
appSettings.maxStreamingBitrate(bitrate);
return playAfterBitrateDetect(connectionManager, bitrate, item, playOptions).then(callback);
return playAfterBitrateDetect(connectionManager, bitrate, item, playOptions, onPlaybackStartedFn);
}, function () {
return playAfterBitrateDetect(connectionManager, appSettings.maxStreamingBitrate(), item, playOptions).then(callback);
return playAfterBitrateDetect(connectionManager, appSettings.maxStreamingBitrate(), item, playOptions, onPlaybackStartedFn);
});
} else {
return playAfterBitrateDetect(connectionManager, appSettings.maxStreamingBitrate(), item, playOptions).then(callback);
return playAfterBitrateDetect(connectionManager, appSettings.maxStreamingBitrate(), item, playOptions, onPlaybackStartedFn);
}
}, function () {
@ -1647,7 +1647,7 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
}, reject);
}
function playAfterBitrateDetect(connectionManager, maxBitrate, item, playOptions) {
function playAfterBitrateDetect(connectionManager, maxBitrate, item, playOptions, onPlaybackStartedFn) {
var startPosition = playOptions.startPositionTicks;
@ -1671,8 +1671,9 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
streamInfo.fullscreen = playOptions.fullscreen;
getPlayerData(player).isChangingStream = false;
return player.play(streamInfo).then(function () {
onPlaybackStarted(player, streamInfo);
loading.hide();
onPlaybackStartedFn();
onPlaybackStarted(player, streamInfo);
return Promise.resolve();
});
});
@ -1693,8 +1694,9 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
getPlayerData(player).maxStreamingBitrate = maxBitrate;
return player.play(streamInfo).then(function () {
onPlaybackStarted(player, streamInfo, mediaSource);
loading.hide();
onPlaybackStartedFn();
onPlaybackStarted(player, streamInfo, mediaSource);
return Promise.resolve();
});
});