diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-06-13 02:34:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-13 02:34:08 -0400 |
| commit | e93aed7b6c6b72156cf336948efc6a9ff35c530f (patch) | |
| tree | 7154c86150f4c723bce1d9bc81ccd95f47a42e41 /MediaBrowser.Model | |
| parent | d803b55f4dc40182dbe70f5742971f09eed59f13 (diff) | |
| parent | b615a2aeb16a527fe56a88a352574d76e77783e8 (diff) | |
Merge pull request #2708 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/LiveTv/LiveTvOptions.cs | 3 | ||||
| -rw-r--r-- | MediaBrowser.Model/Users/UserPolicy.cs | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs index 91ea977f7e..32153a11ca 100644 --- a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs +++ b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs @@ -1,13 +1,11 @@ using System.Collections.Generic; using MediaBrowser.Model.Dto; -using MediaBrowser.Model.Extensions; namespace MediaBrowser.Model.LiveTv { public class LiveTvOptions { public int? GuideDays { get; set; } - public bool EnableMovieProviders { get; set; } public string RecordingPath { get; set; } public string MovieRecordingPath { get; set; } public string SeriesRecordingPath { get; set; } @@ -30,7 +28,6 @@ namespace MediaBrowser.Model.LiveTv public LiveTvOptions() { - EnableMovieProviders = true; TunerHosts = new List<TunerHostInfo>(); ListingProviders = new List<ListingsProviderInfo>(); MediaLocationsCreated = new string[] { }; diff --git a/MediaBrowser.Model/Users/UserPolicy.cs b/MediaBrowser.Model/Users/UserPolicy.cs index 2a987ceb14..e2a75c56be 100644 --- a/MediaBrowser.Model/Users/UserPolicy.cs +++ b/MediaBrowser.Model/Users/UserPolicy.cs @@ -70,6 +70,8 @@ namespace MediaBrowser.Model.Users public UserPolicy() { + EnableContentDeletion = true; + EnableSyncTranscoding = true; EnableMediaPlayback = true; |