diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-10-09 03:20:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-09 03:20:21 -0400 |
| commit | dbf1e2c27e83c0be4130c719616d9e5c16e71262 (patch) | |
| tree | 6e25285049d5568b09ba2ba6f2acff8090281ac4 /MediaBrowser.Model/Configuration | |
| parent | ce6cbf81df4436ca37064bbace753f0edd792e71 (diff) | |
| parent | daaae69df575f1d7692ba29d6f5ddd4c59516f82 (diff) | |
Merge pull request #2216 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Model/Configuration')
| -rw-r--r-- | MediaBrowser.Model/Configuration/DlnaOptions.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Model/Configuration/ServerConfiguration.cs | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/MediaBrowser.Model/Configuration/DlnaOptions.cs b/MediaBrowser.Model/Configuration/DlnaOptions.cs index 6eaf01c4a..71a24d707 100644 --- a/MediaBrowser.Model/Configuration/DlnaOptions.cs +++ b/MediaBrowser.Model/Configuration/DlnaOptions.cs @@ -10,7 +10,6 @@ namespace MediaBrowser.Model.Configuration public int ClientDiscoveryIntervalSeconds { get; set; } public int BlastAliveMessageIntervalSeconds { get; set; } public string DefaultUserId { get; set; } - public bool EnableMovieFolders { get; set; } public DlnaOptions() { diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs index 2cdd88775..a1e5637a4 100644 --- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs +++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs @@ -435,7 +435,8 @@ namespace MediaBrowser.Model.Configuration Limit = 0, Type = ImageType.Disc } - } + }, + DisabledMetadataFetchers = new []{ "TheAudioDB" } }, new MetadataOptions(1, 1280) @@ -473,7 +474,8 @@ namespace MediaBrowser.Model.Configuration Limit = 0, Type = ImageType.Logo } - } + }, + DisabledMetadataFetchers = new []{ "TheAudioDB" } }, new MetadataOptions(1, 1280) |