From 79f3eb3fe2b33a49ce43fe0c616671483e97efc3 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 18 Mar 2017 19:37:29 -0400 Subject: [PATCH 1/2] update live tv osd --- Emby.Common.Implementations/IO/ManagedFileSystem.cs | 6 +++++- MediaBrowser.Model/Dlna/StreamBuilder.cs | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletion(-) 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"); From 41060c9a38cb7cf8875cb85fd3a4577ae8546f8a Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 18 Mar 2017 19:39:11 -0400 Subject: [PATCH 2/2] 3.2.8.4 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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")]