diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-08-06 19:01:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-06 19:01:30 -0400 |
| commit | e9bf2e413222af14ca791d989bd0470d5e282ae0 (patch) | |
| tree | 326030dc1915f3c4e00f4f10eab5c171b7e87ca4 /MediaBrowser.Controller/Entities/BaseItem.cs | |
| parent | d8c2dd253277ba2ce7a5a7496b278db0e4e85106 (diff) | |
| parent | 6d78824c8e9fa9fe1e46944ca6901af724b8f7cd (diff) | |
Merge pull request #2796 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Controller/Entities/BaseItem.cs')
| -rw-r--r-- | MediaBrowser.Controller/Entities/BaseItem.cs | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index 14580a849..cb345439a 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -51,7 +51,6 @@ namespace MediaBrowser.Controller.Entities ProviderIds = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase); LockedFields = new List<MetadataFields>(); ImageInfos = new List<ItemImageInfo>(); - InheritedTags = new List<string>(); ProductionLocations = new List<string>(); } @@ -73,7 +72,9 @@ namespace MediaBrowser.Controller.Entities public static string ThemeSongFilename = "theme"; public static string ThemeVideosFolderName = "backdrops"; + [IgnoreDataMember] public List<Guid> ThemeSongIds { get; set; } + [IgnoreDataMember] public List<Guid> ThemeVideoIds { get; set; } [IgnoreDataMember] @@ -87,6 +88,7 @@ namespace MediaBrowser.Controller.Entities [IgnoreDataMember] public string Tagline { get; set; } + [IgnoreDataMember] public List<ItemImageInfo> ImageInfos { get; set; } [IgnoreDataMember] @@ -197,7 +199,9 @@ namespace MediaBrowser.Controller.Entities get { return PremiereDate.HasValue && PremiereDate.Value.ToLocalTime().Date >= DateTime.Now.Date; } } + [IgnoreDataMember] public int? TotalBitrate { get; set; } + [IgnoreDataMember] public ExtraType? ExtraType { get; set; } [IgnoreDataMember] @@ -803,13 +807,6 @@ namespace MediaBrowser.Controller.Entities public DateTime? EndDate { get; set; } /// <summary> - /// Gets or sets the display type of the media. - /// </summary> - /// <value>The display type of the media.</value> - [IgnoreDataMember] - public string DisplayMediaType { get; set; } - - /// <summary> /// Gets or sets the official rating. /// </summary> /// <value>The official rating.</value> @@ -819,9 +816,6 @@ namespace MediaBrowser.Controller.Entities [IgnoreDataMember] public int InheritedParentalRatingValue { get; set; } - [IgnoreDataMember] - public List<string> InheritedTags { get; set; } - /// <summary> /// Gets or sets the critic rating. /// </summary> @@ -864,6 +858,7 @@ namespace MediaBrowser.Controller.Entities [IgnoreDataMember] public List<string> Tags { get; set; } + [IgnoreDataMember] public List<string> ProductionLocations { get; set; } /// <summary> |