mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
Merge d845c3a7e4
into 7d84185d0e
This commit is contained in:
commit
ce32a506be
1 changed files with 14 additions and 0 deletions
|
@ -1936,6 +1936,15 @@ export class PlaybackManager {
|
||||||
}, queryOptions));
|
}, queryOptions));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (promise) {
|
||||||
|
return promise.then(function (result) {
|
||||||
|
if (firstItem.Type === 'AudioBook') {
|
||||||
|
options.startIndex = result.StartIndex;
|
||||||
|
}
|
||||||
|
return result ? result.Items : items;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2319,6 +2328,10 @@ export class PlaybackManager {
|
||||||
}
|
}
|
||||||
|
|
||||||
function playInternal(item, playOptions, onPlaybackStartedFn, prevSource) {
|
function playInternal(item, playOptions, onPlaybackStartedFn, prevSource) {
|
||||||
|
if (item.Type === 'AudioBookFile') {
|
||||||
|
playOptions.startPositionTicks = item.UserData.PlaybackPositionTicks;
|
||||||
|
}
|
||||||
|
|
||||||
if (item.IsPlaceHolder) {
|
if (item.IsPlaceHolder) {
|
||||||
loading.hide();
|
loading.hide();
|
||||||
showPlaybackInfoErrorMessage(self, 'PlaybackErrorPlaceHolder');
|
showPlaybackInfoErrorMessage(self, 'PlaybackErrorPlaceHolder');
|
||||||
|
@ -3578,6 +3591,7 @@ export class PlaybackManager {
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Add a player to the list of players and associate callbacks
|
||||||
function initMediaPlayer(player) {
|
function initMediaPlayer(player) {
|
||||||
players.push(player);
|
players.push(player);
|
||||||
players.sort(function (a, b) {
|
players.sort(function (a, b) {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue