diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-08-03 12:26:01 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-08-03 12:26:01 -0400 |
| commit | d50ffcbfb22e1b22c80c033606601f22b1de66d2 (patch) | |
| tree | 9dddf56a20bc3a743596c7689148cfcaee6c79ee | |
| parent | 0ba267f8e26471b4b831b926027c76798f88bef4 (diff) | |
3.2.26.13
| -rw-r--r-- | Emby.Server.Implementations/Localization/Ratings/us.txt | 1 | ||||
| -rw-r--r-- | MediaBrowser.Api/ItemUpdateService.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Api/Playback/UniversalAudioService.cs | 18 | ||||
| -rw-r--r-- | MediaBrowser.Server.Mono/Program.cs | 2 | ||||
| -rw-r--r-- | SharedVersion.cs | 2 |
5 files changed, 17 insertions, 7 deletions
diff --git a/Emby.Server.Implementations/Localization/Ratings/us.txt b/Emby.Server.Implementations/Localization/Ratings/us.txt index 3f5311e0e..9bd78c72b 100644 --- a/Emby.Server.Implementations/Localization/Ratings/us.txt +++ b/Emby.Server.Implementations/Localization/Ratings/us.txt @@ -1,3 +1,4 @@ +APPROVED,1 G,1 E,1 EC,1 diff --git a/MediaBrowser.Api/ItemUpdateService.cs b/MediaBrowser.Api/ItemUpdateService.cs index 5325df325..19220cdec 100644 --- a/MediaBrowser.Api/ItemUpdateService.cs +++ b/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; diff --git a/MediaBrowser.Api/Playback/UniversalAudioService.cs b/MediaBrowser.Api/Playback/UniversalAudioService.cs index 118bf5246..0211fe75e 100644 --- a/MediaBrowser.Api/Playback/UniversalAudioService.cs +++ b/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, - Container = request.Container - }); + var parts = container.Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries); + + 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(); diff --git a/MediaBrowser.Server.Mono/Program.cs b/MediaBrowser.Server.Mono/Program.cs index 2d5bf85e5..0a70c446f 100644 --- a/MediaBrowser.Server.Mono/Program.cs +++ b/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(); diff --git a/SharedVersion.cs b/SharedVersion.cs index d0e3bdd02..bbaac5d90 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,3 +1,3 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.26.12")] +[assembly: AssemblyVersion("3.2.26.13")] |