diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-08-13 16:21:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-13 16:21:10 -0400 |
| commit | dc578f3742b474bd85d556299a6b2763f4d9acda (patch) | |
| tree | cc4a8d1de140ece77160349e51a64857656ab373 /MediaBrowser.Model/Entities | |
| parent | f6ed934a7e32bf10c3a141773d713bf3b19e784f (diff) | |
| parent | 7f200f057d33e3ef52b1b1b1bf1767577295317e (diff) | |
Merge pull request #2815 from MediaBrowser/beta
Beta
Diffstat (limited to 'MediaBrowser.Model/Entities')
| -rw-r--r-- | MediaBrowser.Model/Entities/MediaStream.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Model/Entities/MetadataFields.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Model/Entities/VideoType.cs | 6 |
3 files changed, 3 insertions, 11 deletions
diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs index 3cd3e7dde..747528cbf 100644 --- a/MediaBrowser.Model/Entities/MediaStream.cs +++ b/MediaBrowser.Model/Entities/MediaStream.cs @@ -81,7 +81,7 @@ namespace MediaBrowser.Model.Entities attributes.Add("Default"); } - return string.Join(" ", attributes.ToArray()); + return string.Join(" ", attributes.ToArray(attributes.Count)); } if (Type == MediaStreamType.Subtitle) @@ -107,7 +107,7 @@ namespace MediaBrowser.Model.Entities attributes.Add("Forced"); } - string name = string.Join(" ", attributes.ToArray()); + string name = string.Join(" ", attributes.ToArray(attributes.Count)); return name; } diff --git a/MediaBrowser.Model/Entities/MetadataFields.cs b/MediaBrowser.Model/Entities/MetadataFields.cs index a6c1388dc..a99fd0fe0 100644 --- a/MediaBrowser.Model/Entities/MetadataFields.cs +++ b/MediaBrowser.Model/Entities/MetadataFields.cs @@ -15,10 +15,6 @@ namespace MediaBrowser.Model.Entities /// </summary> Genres, /// <summary> - /// The keywords - /// </summary> - Keywords, - /// <summary> /// The production locations /// </summary> ProductionLocations, diff --git a/MediaBrowser.Model/Entities/VideoType.cs b/MediaBrowser.Model/Entities/VideoType.cs index aa9a3c55f..05c2fa32c 100644 --- a/MediaBrowser.Model/Entities/VideoType.cs +++ b/MediaBrowser.Model/Entities/VideoType.cs @@ -21,10 +21,6 @@ namespace MediaBrowser.Model.Entities /// <summary> /// The blu ray /// </summary> - BluRay, - /// <summary> - /// The hd DVD - /// </summary> - HdDvd + BluRay } } |