lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2533 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2017-03-18 19:39:32 -04:00 committed by GitHub
commit 796096976f
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Emby.Common.Implementations/IO/ManagedFileSystem.cs
View File

@ -28,7 +28,11 @@ namespace Emby.Common.Implementations.IO
Logger = logger; Logger = logger;
_supportsAsyncFileStreams = true; _supportsAsyncFileStreams = true;
_tempPath = tempPath; _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); SetInvalidFileNameChars(environmentInfo.OperatingSystem == MediaBrowser.Model.System.OperatingSystem.Windows);
} }

6
MediaBrowser.Model/Dlna/StreamBuilder.cs
View File

@ -1037,6 +1037,12 @@ namespace MediaBrowser.Model.Dlna
private bool IsAudioEligibleForDirectPlay(MediaSourceInfo item, long? maxBitrate) 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) if (!maxBitrate.HasValue)
{ {
_logger.Info("Cannot direct play due to unknown supported bitrate"); _logger.Info("Cannot direct play due to unknown supported bitrate");

2
SharedVersion.cs
View File

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