diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-08-19 16:06:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-19 16:06:14 -0400 |
| commit | ff2f3108ee62fc8c943b1d83ec6312d6696990d8 (patch) | |
| tree | 80f1823f901bdadad6af4fce8d36d9b73f79c0fb /MediaBrowser.Controller | |
| parent | 6b077f3f8467caa26388a25e6acd1990d286b5d0 (diff) | |
| parent | c58db90c950c766321615eca236557d87b8d1b74 (diff) | |
Merge pull request #2832 from MediaBrowser/beta
Beta
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/Entities/BaseItem.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/Video.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs | 4 |
3 files changed, 1 insertions, 10 deletions
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index 8cc90db7d4..a6418418e1 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -1246,6 +1246,7 @@ namespace MediaBrowser.Controller.Entities /// Gets or sets the provider ids. /// </summary> /// <value>The provider ids.</value> + [IgnoreDataMember] public Dictionary<string, string> ProviderIds { get; set; } [IgnoreDataMember] diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs index fbeefbbd9c..3b166db922 100644 --- a/MediaBrowser.Controller/Entities/Video.cs +++ b/MediaBrowser.Controller/Entities/Video.cs @@ -53,12 +53,6 @@ namespace MediaBrowser.Controller.Entities } } - /// <summary> - /// Gets or sets the display type of the media. - /// </summary> - /// <value>The display type of the media.</value> - public string DisplayMediaType { get; set; } - [IgnoreDataMember] public override bool SupportsPositionTicksResume { diff --git a/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs b/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs index 27ff334ee2..43fc307f48 100644 --- a/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs +++ b/MediaBrowser.Controller/LiveTv/ILiveTvRecording.cs @@ -18,8 +18,6 @@ namespace MediaBrowser.Controller.LiveTv string Container { get; } - long? RunTimeTicks { get; set; } - string GetClientTypeName(); bool IsParentalAllowed(User user); @@ -36,8 +34,6 @@ namespace MediaBrowser.Controller.LiveTv string TimerId { get; set; } RecordingStatus Status { get; set; } DateTime? EndDate { get; set; } - DateTime DateLastSaved { get; set; } DateTime DateCreated { get; set; } - DateTime DateModified { get; set; } } } |