diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-02-18 13:23:48 -0500 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2016-02-18 13:23:48 -0500 |
| commit | 09e01d9aad1ec69dca8c564f00799c3dda3e102f (patch) | |
| tree | 524b17e20e38221425cab561eb515ba69c586b06 /MediaBrowser.Model | |
| parent | 32b200e5c5b73291c3dd84523432edcfffff7589 (diff) | |
| parent | f1745245bac82ad7a6e2b0a647f1ff9092610d9a (diff) | |
Merge pull request #1476 from MediaBrowser/dev
merge from dev
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/LiveTv/LiveTvOptions.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Model/MediaInfo/MediaInfo.cs | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs index 838325d68..095fa95e1 100644 --- a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs +++ b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs @@ -47,5 +47,6 @@ namespace MediaBrowser.Model.LiveTv public string ListingsId { get; set; } public string ZipCode { get; set; } public string Country { get; set; } + public string Path { get; set; } } }
\ No newline at end of file diff --git a/MediaBrowser.Model/MediaInfo/MediaInfo.cs b/MediaBrowser.Model/MediaInfo/MediaInfo.cs index 21f258693..126710197 100644 --- a/MediaBrowser.Model/MediaInfo/MediaInfo.cs +++ b/MediaBrowser.Model/MediaInfo/MediaInfo.cs @@ -10,11 +10,6 @@ namespace MediaBrowser.Model.MediaInfo public List<ChapterInfo> Chapters { get; set; } /// <summary> - /// Gets or sets the title. - /// </summary> - /// <value>The title.</value> - public string Title { get; set; } - /// <summary> /// Gets or sets the album. /// </summary> /// <value>The album.</value> @@ -47,6 +42,11 @@ namespace MediaBrowser.Model.MediaInfo /// <value>The official rating.</value> public string OfficialRating { get; set; } /// <summary> + /// Gets or sets the official rating description. + /// </summary> + /// <value>The official rating description.</value> + public string OfficialRatingDescription { get; set; } + /// <summary> /// Gets or sets the overview. /// </summary> /// <value>The overview.</value> |