diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-06-13 10:24:34 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-06-13 10:24:34 -0400 |
| commit | ffc4db41282be2d0762cbd198f14bbe0c9bd1540 (patch) | |
| tree | 6267717daada8d8c6f4b84fffc3e23ed516cfd8a /MediaBrowser.Controller/Entities/BaseItem.cs | |
| parent | 6186618f3ef6739f2cb0ff05f10ec17935b14d99 (diff) | |
| parent | f0d8dbefdbe49361563ec9d56cba5fbae542b015 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Conflicts:
MediaBrowser.MediaEncoding/Subtitles/VttWriter.cs
Diffstat (limited to 'MediaBrowser.Controller/Entities/BaseItem.cs')
| -rw-r--r-- | MediaBrowser.Controller/Entities/BaseItem.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index b7edbfc60..a2ff1b4fd 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -32,6 +32,7 @@ namespace MediaBrowser.Controller.Entities ProviderIds = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase); LockedFields = new List<MetadataFields>(); ImageInfos = new List<ItemImageInfo>(); + Identities = new List<IItemIdentity>(); } /// <summary> @@ -244,6 +245,9 @@ namespace MediaBrowser.Controller.Entities public bool IsUnidentified { get; set; } + [IgnoreDataMember] + public List<IItemIdentity> Identities { get; set; } + /// <summary> /// Gets or sets the locked fields. /// </summary> |