diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-03-18 19:39:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-18 19:39:32 -0400 |
| commit | 796096976f4af5b96b76812457faa2be5e657e18 (patch) | |
| tree | 381e97d63bf0d36ba409023665cb3cfd8f9f72e7 | |
| parent | 66a886adeffe40f41b1353d14fe8559ea134b83f (diff) | |
| parent | 41060c9a38cb7cf8875cb85fd3a4577ae8546f8a (diff) | |
Merge pull request #2533 from MediaBrowser/dev
Dev
| -rw-r--r-- | Emby.Common.Implementations/IO/ManagedFileSystem.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Model/Dlna/StreamBuilder.cs | 6 | ||||
| -rw-r--r-- | SharedVersion.cs | 2 |
3 files changed, 12 insertions, 2 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"); diff --git a/SharedVersion.cs b/SharedVersion.cs index 0374cd9c0..f818da847 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,3 +1,3 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.8.3")] +[assembly: AssemblyVersion("3.2.8.4")] |