michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2792 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2017-08-03 12:27:00 -04:00 committed by GitHub
commit db9176521c
5 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Emby.Server.Implementations/Localization/Ratings/us.txt
View File

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

1
MediaBrowser.Api/ItemUpdateService.cs
View File

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

12
MediaBrowser.Api/Playback/UniversalAudioService.cs
View File

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

2
MediaBrowser.Server.Mono/Program.cs
View File

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

2
SharedVersion.cs
View File

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