Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev
This commit is contained in:
commit
c6ca821d25
|
@ -53,18 +53,22 @@ namespace MediaBrowser.Model.Entities
|
|||
|
||||
if (!string.IsNullOrEmpty(Language))
|
||||
{
|
||||
attributes.Add(Language);
|
||||
attributes.Add(Language.FirstToUpper());
|
||||
}
|
||||
if (!string.IsNullOrEmpty(Codec) && !StringHelper.EqualsIgnoreCase(Codec, "dca"))
|
||||
{
|
||||
attributes.Add(Codec);
|
||||
}
|
||||
if (!string.IsNullOrEmpty(Profile) && !StringHelper.EqualsIgnoreCase(Profile, "lc"))
|
||||
attributes.Add(CodecHelper.FriendlyName(Codec));
|
||||
}
|
||||
else if (!string.IsNullOrEmpty(Profile) && !StringHelper.EqualsIgnoreCase(Profile, "lc"))
|
||||
{
|
||||
attributes.Add(Profile);
|
||||
}
|
||||
|
||||
if (Channels.HasValue)
|
||||
if (!string.IsNullOrEmpty(ChannelLayout))
|
||||
{
|
||||
attributes.Add(ChannelLayout);
|
||||
}
|
||||
else if (Channels.HasValue)
|
||||
{
|
||||
attributes.Add(StringHelper.ToStringCultureInvariant(Channels.Value) + " ch");
|
||||
}
|
||||
|
|
28
MediaBrowser.Model/Extensions/CodecHelper.cs
Normal file
28
MediaBrowser.Model/Extensions/CodecHelper.cs
Normal file
|
@ -0,0 +1,28 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace MediaBrowser.Model.Extensions
|
||||
{
|
||||
public static class CodecHelper
|
||||
{
|
||||
public static string FriendlyName(string codec)
|
||||
{
|
||||
if (string.IsNullOrEmpty(codec)) return "";
|
||||
|
||||
switch (codec.ToLower())
|
||||
{
|
||||
case "ac3":
|
||||
return "Dolby Digital";
|
||||
case "eac3":
|
||||
return "Dolby Digital+";
|
||||
case "dca":
|
||||
return "DTS";
|
||||
default:
|
||||
return codec.ToUpper();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
|
@ -125,5 +125,10 @@ namespace MediaBrowser.Model.Extensions
|
|||
|
||||
return sb.ToString();
|
||||
}
|
||||
|
||||
public static string FirstToUpper(this string str)
|
||||
{
|
||||
return string.IsNullOrEmpty(str) ? "" : str.Substring(0, 1).ToUpper() + str.Substring(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -137,6 +137,7 @@
|
|||
<Compile Include="Dto\MetadataEditorInfo.cs" />
|
||||
<Compile Include="Dto\NameIdPair.cs" />
|
||||
<Compile Include="Dto\NameValuePair.cs" />
|
||||
<Compile Include="Extensions\CodecHelper.cs" />
|
||||
<Compile Include="FileOrganization\SmartMatchInfo.cs" />
|
||||
<Compile Include="MediaInfo\LiveStreamRequest.cs" />
|
||||
<Compile Include="MediaInfo\LiveStreamResponse.cs" />
|
||||
|
|
Loading…
Reference in New Issue
Block a user