Browse Source

Merge pull request #2533 from MediaBrowser/dev

Dev
Luke 8 years ago
parent
commit
796096976f

+ 5 - 1
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);
         }
 

+ 6 - 0
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");

+ 1 - 1
SharedVersion.cs

@@ -1,3 +1,3 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.2.8.3")]
+[assembly: AssemblyVersion("3.2.8.4")]