diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-04-25 14:24:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-25 14:24:37 -0400 |
| commit | 859a8f95877725c2aeafda3eb95776ff25fcdd75 (patch) | |
| tree | 69ecd6779af4bb3c9884c71783ed5ab7bd270e95 /MediaBrowser.Model | |
| parent | a0dc26b88172f10efa6dbf0ff6c3dffd9733d097 (diff) | |
| parent | f13696868fd87924441a732e703350b56ae6ad7b (diff) | |
Merge pull request #2597 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/Session/GeneralCommandType.cs | 3 | ||||
| -rw-r--r-- | MediaBrowser.Model/Users/UserPolicy.cs | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/MediaBrowser.Model/Session/GeneralCommandType.cs b/MediaBrowser.Model/Session/GeneralCommandType.cs index 6cceb162a..1a9651559 100644 --- a/MediaBrowser.Model/Session/GeneralCommandType.cs +++ b/MediaBrowser.Model/Session/GeneralCommandType.cs @@ -37,6 +37,7 @@ SetRepeatMode = 29, ChannelUp = 30, ChannelDown = 31, - SetMaxStreamingBitrate = 31 + SetMaxStreamingBitrate = 31, + Guide = 32 } }
\ No newline at end of file diff --git a/MediaBrowser.Model/Users/UserPolicy.cs b/MediaBrowser.Model/Users/UserPolicy.cs index 3917b1662..2a987ceb1 100644 --- a/MediaBrowser.Model/Users/UserPolicy.cs +++ b/MediaBrowser.Model/Users/UserPolicy.cs @@ -50,7 +50,6 @@ namespace MediaBrowser.Model.Users /// Gets or sets a value indicating whether [enable synchronize]. /// </summary> /// <value><c>true</c> if [enable synchronize]; otherwise, <c>false</c>.</value> - public bool EnableSync { get; set; } public bool EnableSyncTranscoding { get; set; } public string[] EnabledDevices { get; set; } @@ -71,7 +70,6 @@ namespace MediaBrowser.Model.Users public UserPolicy() { - EnableSync = true; EnableSyncTranscoding = true; EnableMediaPlayback = true; |