diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-01-19 14:54:07 -0500 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2016-01-19 14:54:07 -0500 |
| commit | 236b5caee2797d4a8af857cea2f3859bc94d3948 (patch) | |
| tree | 210242ec629d84baa9811dacdad3931a4e5c7b35 /MediaBrowser.Model | |
| parent | e951dd20d95c81da29d4f9d8a2cb927e7639518b (diff) | |
| parent | a5d54256ffb79dd1d0a06df0536f772bbeff9d3d (diff) | |
Merge pull request #1409 from MediaBrowser/beta
merge from beta
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/Dlna/DeviceProfile.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Model/Search/SearchHint.cs | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/MediaBrowser.Model/Dlna/DeviceProfile.cs b/MediaBrowser.Model/Dlna/DeviceProfile.cs index 5554c0623..778db8fb5 100644 --- a/MediaBrowser.Model/Dlna/DeviceProfile.cs +++ b/MediaBrowser.Model/Dlna/DeviceProfile.cs @@ -78,7 +78,6 @@ namespace MediaBrowser.Model.Dlna public bool EnableMSMediaReceiverRegistrar { get; set; } public bool IgnoreTranscodeByteRangeRequests { get; set; } - public bool EnableDlnaProtocol { get; set; } public XmlAttribute[] XmlRootAttributes { get; set; } diff --git a/MediaBrowser.Model/Search/SearchHint.cs b/MediaBrowser.Model/Search/SearchHint.cs index d51c0325d..3a1d45cc4 100644 --- a/MediaBrowser.Model/Search/SearchHint.cs +++ b/MediaBrowser.Model/Search/SearchHint.cs @@ -144,5 +144,11 @@ namespace MediaBrowser.Model.Search /// </summary> /// <value>The name of the channel.</value> public string ChannelName { get; set; } + + /// <summary> + /// Gets or sets the primary image aspect ratio. + /// </summary> + /// <value>The primary image aspect ratio.</value> + public double? PrimaryImageAspectRatio { get; set; } } } |