diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-06-18 13:29:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-18 13:29:46 -0400 |
| commit | f35a5e553f2e4749d2e9f633305d45a0b2a78a82 (patch) | |
| tree | 34b7271c9fd98c330bf0fc8bdf1eda78d41643f9 /MediaBrowser.Model | |
| parent | 549a571d16b3d38b3d78c64a684d8a6014e68f65 (diff) | |
| parent | 29d4305732ca1d9ef8e6d35c58639e9b9b0dc24b (diff) | |
Merge pull request #1859 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/Entities/MediaStream.cs | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs index 868f6b64f..af7a034fe 100644 --- a/MediaBrowser.Model/Entities/MediaStream.cs +++ b/MediaBrowser.Model/Entities/MediaStream.cs @@ -75,15 +75,12 @@ namespace MediaBrowser.Model.Entities { attributes.Add(StringHelper.ToStringCultureInvariant(Channels.Value) + " ch"); } - - string name = string.Join(" ", attributes.ToArray()); - if (IsDefault) { - name += " (D)"; + attributes.Add("Default"); } - return name; + return string.Join(" ", attributes.ToArray()); } if (Type == MediaStreamType.Subtitle) @@ -94,27 +91,17 @@ namespace MediaBrowser.Model.Entities { attributes.Add(StringHelper.FirstToUpper(Language)); } - if (!string.IsNullOrEmpty(Codec)) - { - attributes.Add(Codec); - } - - string name = string.Join(" ", attributes.ToArray()); - if (IsDefault) { - name += " (D)"; + attributes.Add("Default"); } if (IsForced) { - name += " (F)"; + attributes.Add("Forced"); } - if (IsExternal) - { - name += " (EXT)"; - } + string name = string.Join(" ", attributes.ToArray()); return name; } |