From 7841d9eb66cece2cc72307e9b9a078acd50943c7 Mon Sep 17 00:00:00 2001 From: Eric Reed Date: Wed, 18 May 2016 14:23:46 -0400 Subject: Friendly stream names --- MediaBrowser.Model/Extensions/CodecHelper.cs | 28 +++++++++++++++++++++++++++ MediaBrowser.Model/Extensions/StringHelper.cs | 5 +++++ 2 files changed, 33 insertions(+) create mode 100644 MediaBrowser.Model/Extensions/CodecHelper.cs (limited to 'MediaBrowser.Model/Extensions') diff --git a/MediaBrowser.Model/Extensions/CodecHelper.cs b/MediaBrowser.Model/Extensions/CodecHelper.cs new file mode 100644 index 000000000..8d037008e --- /dev/null +++ b/MediaBrowser.Model/Extensions/CodecHelper.cs @@ -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(); + } + } + } +} diff --git a/MediaBrowser.Model/Extensions/StringHelper.cs b/MediaBrowser.Model/Extensions/StringHelper.cs index 99bec68a7..9cde3bfa4 100644 --- a/MediaBrowser.Model/Extensions/StringHelper.cs +++ b/MediaBrowser.Model/Extensions/StringHelper.cs @@ -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); + } } } -- cgit v1.2.3 From 34d4e4317aa9cd3e354ada10defb1ac1f142bf9f Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 18 May 2016 17:46:56 -0400 Subject: update dialogs --- MediaBrowser.Model/Entities/MediaStream.cs | 8 ++++---- MediaBrowser.Model/Extensions/CodecHelper.cs | 28 ---------------------------- MediaBrowser.Model/MediaBrowser.Model.csproj | 1 - MediaBrowser.Model/MediaInfo/AudioCodec.cs | 17 +++++++++++++++++ 4 files changed, 21 insertions(+), 33 deletions(-) delete mode 100644 MediaBrowser.Model/Extensions/CodecHelper.cs (limited to 'MediaBrowser.Model/Extensions') diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs index d0d466906..64c7d9aa6 100644 --- a/MediaBrowser.Model/Entities/MediaStream.cs +++ b/MediaBrowser.Model/Entities/MediaStream.cs @@ -1,8 +1,8 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using MediaBrowser.Model.Dlna; using MediaBrowser.Model.Extensions; using System.Diagnostics; +using MediaBrowser.Model.MediaInfo; namespace MediaBrowser.Model.Entities { @@ -53,11 +53,11 @@ namespace MediaBrowser.Model.Entities if (!string.IsNullOrEmpty(Language)) { - attributes.Add(Language.FirstToUpper()); + attributes.Add(StringHelper.FirstToUpper(Language)); } if (!string.IsNullOrEmpty(Codec) && !StringHelper.EqualsIgnoreCase(Codec, "dca")) { - attributes.Add(CodecHelper.FriendlyName(Codec)); + attributes.Add(AudioCodec.GetFriendlyName(Codec)); } else if (!string.IsNullOrEmpty(Profile) && !StringHelper.EqualsIgnoreCase(Profile, "lc")) { diff --git a/MediaBrowser.Model/Extensions/CodecHelper.cs b/MediaBrowser.Model/Extensions/CodecHelper.cs deleted file mode 100644 index 8d037008e..000000000 --- a/MediaBrowser.Model/Extensions/CodecHelper.cs +++ /dev/null @@ -1,28 +0,0 @@ -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(); - } - } - } -} diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj index dc78bcf8e..7c469b9fb 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -137,7 +137,6 @@ - diff --git a/MediaBrowser.Model/MediaInfo/AudioCodec.cs b/MediaBrowser.Model/MediaInfo/AudioCodec.cs index 5353f2b3e..93aba2f43 100644 --- a/MediaBrowser.Model/MediaInfo/AudioCodec.cs +++ b/MediaBrowser.Model/MediaInfo/AudioCodec.cs @@ -5,5 +5,22 @@ public const string AAC = "aac"; public const string MP3 = "mp3"; public const string AC3 = "ac3"; + + public static string GetFriendlyName(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(); + } + } } } \ No newline at end of file -- cgit v1.2.3 From 78e6c638bcbd4781221804fb8eef4c34fb4cb881 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 15 Jul 2016 15:53:28 -0400 Subject: remove fody from build --- MediaBrowser.Model.Portable/FodyWeavers.xml | 3 +-- .../MediaBrowser.Model.Portable.csproj | 12 ++---------- MediaBrowser.Model.Portable/packages.config | 5 ----- MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj | 3 --- MediaBrowser.Model/Dto/BaseItemDto.cs | 7 +------ MediaBrowser.Model/Dto/BaseItemPerson.cs | 10 ++-------- MediaBrowser.Model/Dto/ChapterInfoDto.cs | 8 ++------ MediaBrowser.Model/Dto/UserDto.cs | 8 +------- MediaBrowser.Model/Dto/UserItemDataDto.cs | 7 ++----- MediaBrowser.Model/Entities/DisplayPreferences.cs | 9 +-------- MediaBrowser.Model/Extensions/IHasPropertyChangedEvent.cs | 8 -------- MediaBrowser.Model/LiveTv/BaseTimerInfoDto.cs | 9 +-------- MediaBrowser.Model/LiveTv/ChannelInfoDto.cs | 5 +---- MediaBrowser.Model/MediaBrowser.Model.csproj | 1 - MediaBrowser.Model/Session/SessionInfoDto.cs | 5 +---- 15 files changed, 15 insertions(+), 85 deletions(-) delete mode 100644 MediaBrowser.Model.Portable/packages.config delete mode 100644 MediaBrowser.Model/Extensions/IHasPropertyChangedEvent.cs (limited to 'MediaBrowser.Model/Extensions') diff --git a/MediaBrowser.Model.Portable/FodyWeavers.xml b/MediaBrowser.Model.Portable/FodyWeavers.xml index 736992810..6e2fa02e6 100644 --- a/MediaBrowser.Model.Portable/FodyWeavers.xml +++ b/MediaBrowser.Model.Portable/FodyWeavers.xml @@ -1,4 +1,3 @@ - + - \ No newline at end of file diff --git a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj index 0de9fb519..862d95f7e 100644 --- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj +++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj @@ -36,6 +36,8 @@ false true true + + true @@ -617,9 +619,6 @@ Extensions\FloatHelper.cs - - Extensions\IHasPropertyChangedEvent.cs - Extensions\IntHelper.cs @@ -1233,13 +1232,6 @@ - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - -