Merge pull request #2792 from MediaBrowser/dev

Dev

Emby.Server.Implementations/Localization/Ratings/us.txt

@@ -1,3 +1,4 @@
+APPROVED,1
 G,1
 E,1
 EC,1

MediaBrowser.Api/ItemUpdateService.cs

@@ -242,7 +242,6 @@ namespace MediaBrowser.Api
 
             item.CriticRating = request.CriticRating;
 
-            item.DisplayMediaType = request.DisplayMediaType;
             item.CommunityRating = request.CommunityRating;
             item.HomePageUrl = request.HomePageUrl;
             item.IndexNumber = request.IndexNumber;

MediaBrowser.Api/Playback/UniversalAudioService.cs

@@ -128,11 +128,21 @@ namespace MediaBrowser.Api.Playback
 
             var directPlayProfiles = new List<DirectPlayProfile>();
 
-            directPlayProfiles.Add(new DirectPlayProfile
+            var containers = (request.Container ?? string.Empty).Split(new [] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+
+            foreach (var container in containers)
             {
-                Type = DlnaProfileType.Audio,
+                var parts = container.Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries);
-                Container = request.Container
+
-            });
+                var audioCodecs = parts.Length == 1 ? null : string.Join(",", parts.Skip(1).ToArray());
+
+                directPlayProfiles.Add(new DirectPlayProfile
+                {
+                    Type = DlnaProfileType.Audio,
+                    Container = parts[0],
+                    AudioCodec = audioCodecs
+                });
+            }
 
             deviceProfile.DirectPlayProfiles = directPlayProfiles.ToArray();
 

MediaBrowser.Server.Mono/Program.cs

@@ -97,7 +97,7 @@ namespace MediaBrowser.Server.Mono
         private static void RunApplication(ServerApplicationPaths appPaths, ILogManager logManager, StartupOptions options)
         {
             // Allow all https requests
-            //ServicePointManager.ServerCertificateValidationCallback = new RemoteCertificateValidationCallback(delegate { return true; });
+            ServicePointManager.ServerCertificateValidationCallback = new RemoteCertificateValidationCallback(delegate { return true; });
 
             var environmentInfo = GetEnvironmentInfo();
 

SharedVersion.cs

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