diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-03-18 19:37:29 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-03-18 19:37:29 -0400 |
| commit | 79f3eb3fe2b33a49ce43fe0c616671483e97efc3 (patch) | |
| tree | b80ec17fd0c0d2ffe69b7f4bb12621688fa345f4 | |
| parent | 3dcaeea20c3a7055dd8759e351d30c591ce1360d (diff) | |
update live tv osd
| -rw-r--r-- | Emby.Common.Implementations/IO/ManagedFileSystem.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Model/Dlna/StreamBuilder.cs | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/Emby.Common.Implementations/IO/ManagedFileSystem.cs b/Emby.Common.Implementations/IO/ManagedFileSystem.cs index 2c9388a41..0c1c02cd5 100644 --- a/Emby.Common.Implementations/IO/ManagedFileSystem.cs +++ b/Emby.Common.Implementations/IO/ManagedFileSystem.cs @@ -28,7 +28,11 @@ namespace Emby.Common.Implementations.IO Logger = logger; _supportsAsyncFileStreams = true; _tempPath = tempPath; - EnableFileSystemRequestConcat = false; + + // On Linux, this needs to be true or symbolic links are ignored + EnableFileSystemRequestConcat = environmentInfo.OperatingSystem != MediaBrowser.Model.System.OperatingSystem.Windows && + environmentInfo.OperatingSystem != MediaBrowser.Model.System.OperatingSystem.OSX; + SetInvalidFileNameChars(environmentInfo.OperatingSystem == MediaBrowser.Model.System.OperatingSystem.Windows); } diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs index bfb65ed42..1c7aa81e5 100644 --- a/MediaBrowser.Model/Dlna/StreamBuilder.cs +++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs @@ -1037,6 +1037,12 @@ namespace MediaBrowser.Model.Dlna private bool IsAudioEligibleForDirectPlay(MediaSourceInfo item, long? maxBitrate) { + // Don't restrict by bitrate if coming from an external domain + if (item.IsRemote) + { + return true; + } + if (!maxBitrate.HasValue) { _logger.Info("Cannot direct play due to unknown supported bitrate"); |