diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-06-03 03:37:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-03 03:37:25 -0400 |
| commit | 69f00aef741b27b352eab94b5a059f5fd92a6160 (patch) | |
| tree | acbd6cee9beb5f38a4c21e8cdd485cee2a5f6f7c /MediaBrowser.Model | |
| parent | b54b7871e39e197d4af19a6c502938fa6178c4fa (diff) | |
| parent | 7fbea5d96d9df7b5e487c534ad5c37d54d2105ea (diff) | |
Merge pull request #2687 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/Configuration/ServerConfiguration.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Model/Dto/BaseItemDto.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Model/MediaInfo/PlaybackInfoRequest.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Model/Querying/ItemFields.cs | 5 |
4 files changed, 1 insertions, 13 deletions
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs index e30364de9..4529de59a 100644 --- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs +++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs @@ -17,8 +17,6 @@ namespace MediaBrowser.Model.Configuration /// <value><c>true</c> if [enable u pn p]; otherwise, <c>false</c>.</value> public bool EnableUPnP { get; set; } - public bool EnableSimpleSortNameHandling { get; set; } - /// <summary> /// Gets or sets the public mapped port. /// </summary> diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs index d44659705..f53e3ae65 100644 --- a/MediaBrowser.Model/Dto/BaseItemDto.cs +++ b/MediaBrowser.Model/Dto/BaseItemDto.cs @@ -222,12 +222,6 @@ namespace MediaBrowser.Model.Dto public float? CommunityRating { get; set; } /// <summary> - /// Gets or sets the vote count. - /// </summary> - /// <value>The vote count.</value> - public int? VoteCount { get; set; } - - /// <summary> /// Gets or sets the cumulative run time ticks. /// </summary> /// <value>The cumulative run time ticks.</value> diff --git a/MediaBrowser.Model/MediaInfo/PlaybackInfoRequest.cs b/MediaBrowser.Model/MediaInfo/PlaybackInfoRequest.cs index 0518064c9..1843fb69a 100644 --- a/MediaBrowser.Model/MediaInfo/PlaybackInfoRequest.cs +++ b/MediaBrowser.Model/MediaInfo/PlaybackInfoRequest.cs @@ -30,6 +30,7 @@ namespace MediaBrowser.Model.MediaInfo public bool ForceDirectPlayRemoteMediaSource { get; set; } public bool AllowVideoStreamCopy { get; set; } public bool AllowAudioStreamCopy { get; set; } + public bool AutoOpenLiveStream { get; set; } public PlaybackInfoRequest() { diff --git a/MediaBrowser.Model/Querying/ItemFields.cs b/MediaBrowser.Model/Querying/ItemFields.cs index 9a7052089..85d0a0baf 100644 --- a/MediaBrowser.Model/Querying/ItemFields.cs +++ b/MediaBrowser.Model/Querying/ItemFields.cs @@ -207,11 +207,6 @@ Tags, /// <summary> - /// The vote count - /// </summary> - VoteCount, - - /// <summary> /// The trailer url of the item /// </summary> RemoteTrailers, |