cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-17 02:48:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2940 from thornbill/fix-direct-play

Browse Source
This commit is contained in:
Bill Thornton 2021-09-09 13:55:17 -04:00 committed by GitHub
commit 247d3f23e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/components/playback/playbackmanager.js
View File

@ -618,21 +618,6 @@ function supportsDirectPlay(apiClient, item, mediaSource) {
} else { } else {
return isHostReachable(mediaSource, apiClient); return isHostReachable(mediaSource, apiClient);
} }
} else if (mediaSource.Protocol === 'File') {
return new Promise(function (resolve) {
// Determine if the file can be accessed directly
import('../../scripts/filesystem').then((filesystem) => {
const method = isFolderRip ?
'directoryExists' :
'fileExists';
filesystem[method](mediaSource.Path).then(function () {
resolve(true);
}, function () {
resolve(false);
});
});
});
} }
} }
@ -2481,7 +2466,7 @@ class PlaybackManager {
// Only used for audio // Only used for audio
playMethod = 'Transcode'; playMethod = 'Transcode';
mediaUrl = mediaSource.StreamUrl; mediaUrl = mediaSource.StreamUrl;
} else if (mediaSource.SupportsDirectStream) { } else if (mediaSource.SupportsDirectPlay || mediaSource.SupportsDirectStream) {
directOptions = { directOptions = {
Static: true, Static: true,
mediaSourceId: mediaSource.Id, mediaSourceId: mediaSource.Id,
@ -2500,7 +2485,7 @@ class PlaybackManager {
const prefix = type === 'Video' ? 'Videos' : 'Audio'; const prefix = type === 'Video' ? 'Videos' : 'Audio';
mediaUrl = apiClient.getUrl(prefix + '/' + item.Id + '/stream.' + mediaSourceContainer, directOptions); mediaUrl = apiClient.getUrl(prefix + '/' + item.Id + '/stream.' + mediaSourceContainer, directOptions);
playMethod = 'DirectStream'; playMethod = mediaSource.SupportsDirectPlay ? 'DirectPlay' : 'DirectStream';
} else if (mediaSource.SupportsTranscoding) { } else if (mediaSource.SupportsTranscoding) {
mediaUrl = apiClient.getUrl(mediaSource.TranscodingUrl); mediaUrl = apiClient.getUrl(mediaSource.TranscodingUrl);

13
src/scripts/filesystem.js
View File

@ -1,13 +0,0 @@
export function fileExists(path) {
if (window.NativeShell && window.NativeShell.FileSystem) {
return window.NativeShell.FileSystem.fileExists(path);
}
return Promise.reject();
}
export function directoryExists(path) {
if (window.NativeShell && window.NativeShell.FileSystem) {
return window.NativeShell.FileSystem.directoryExists(path);
}
return Promise.reject();
}