Merge pull request #3028 from MediaBrowser/dev

3.2.36.15

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),

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;

SharedVersion.cs

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