diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-11-19 19:20:12 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-11-19 19:20:12 -0500 |
| commit | 39418b4172fb36dc8f3a8d7f0dd23e3985e77657 (patch) | |
| tree | e5c508f4ec63fa831b7b4d78c815abfa964e3c96 | |
| parent | 9ca8238e9db6da58a5aaa2ba3d6e039a27e81109 (diff) | |
3.2.36.15
| -rw-r--r-- | Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs | 10 | ||||
| -rw-r--r-- | Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs | 10 | ||||
| -rw-r--r-- | SharedVersion.cs | 2 |
3 files changed, 18 insertions, 4 deletions
diff --git a/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs index 84b4492cc..d30aaa133 100644 --- a/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs +++ b/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs @@ -32,7 +32,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio /// <value>The priority.</value> public override ResolverPriority Priority { - get { return ResolverPriority.Last; } + get { return ResolverPriority.Fourth; } } public MultiItemResolverResult ResolveMultiple(Folder parent, @@ -220,13 +220,19 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio foreach (var resolvedItem in resolverResult) { + if (resolvedItem.Files.Count > 1) + { + // For now, until we sort out naming for multi-part books + continue; + } + var firstMedia = resolvedItem.Files.First(); var libraryItem = new T { Path = firstMedia.Path, IsInMixedFolder = isInMixedFolder, - //ProductionYear = resolvedItem.Year, + ProductionYear = resolvedItem.Year, Name = parseName ? resolvedItem.Name : Path.GetFileNameWithoutExtension(firstMedia.Path), diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs index fc9244f6a..cc2cb3e5e 100644 --- a/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs +++ b/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs @@ -67,7 +67,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts var contentType = response.ContentType ?? string.Empty; if (contentType.IndexOf("matroska", StringComparison.OrdinalIgnoreCase) != -1) { - extension = "mkv"; + requiresRemux = true; } else if (contentType.IndexOf("mp4", StringComparison.OrdinalIgnoreCase) != -1 || contentType.IndexOf("dash", StringComparison.OrdinalIgnoreCase) != -1 || @@ -97,6 +97,14 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts OpenedMediaSource.Path = _appHost.GetLocalApiUrl("127.0.0.1") + "/LiveTv/LiveStreamFiles/" + UniqueId + "/stream.ts"; OpenedMediaSource.Protocol = MediaProtocol.Http; + if (OpenedMediaSource.SupportsProbing) + { + await Task.Delay(3000).ConfigureAwait(false); + } + + //OpenedMediaSource.Path = TempFilePath; + //OpenedMediaSource.Protocol = MediaProtocol.File; + //OpenedMediaSource.Path = _tempFilePath; //OpenedMediaSource.Protocol = MediaProtocol.File; //OpenedMediaSource.SupportsDirectPlay = false; diff --git a/SharedVersion.cs b/SharedVersion.cs index c3989b333..16e0fbe3b 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,3 +1,3 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.36.14")] +[assembly: AssemblyVersion("3.2.36.15")] |