diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-11-22 15:08:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-22 15:08:36 -0500 |
| commit | 7edcda021632042d226523d46582c53881b744b6 (patch) | |
| tree | 38ea769bc72ad830a169c73ef24cfec848093f0f /MediaBrowser.Model | |
| parent | 69c771cd89c7352b94511e010e193d4abba1d9c8 (diff) | |
| parent | c418f94c98658413ebb078154b7041d3d809ba40 (diff) | |
Merge pull request #2303 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/Configuration/LibraryOptions.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Model/Configuration/UserConfiguration.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Model/LiveTv/LiveTvOptions.cs | 4 |
3 files changed, 6 insertions, 0 deletions
diff --git a/MediaBrowser.Model/Configuration/LibraryOptions.cs b/MediaBrowser.Model/Configuration/LibraryOptions.cs index 5f8c77ccd0..ffcb79cfb4 100644 --- a/MediaBrowser.Model/Configuration/LibraryOptions.cs +++ b/MediaBrowser.Model/Configuration/LibraryOptions.cs @@ -13,6 +13,7 @@ public bool SaveLocalMetadata { get; set; } public bool EnableInternetProviders { get; set; } + public bool ImportMissingEpisodes { get; set; } public LibraryOptions() { diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs index a6785a06a7..a4a88f169b 100644 --- a/MediaBrowser.Model/Configuration/UserConfiguration.cs +++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs @@ -57,6 +57,7 @@ namespace MediaBrowser.Model.Configuration HidePlayedInLatest = true; PlayDefaultAudioTrack = true; + DisplayMissingEpisodes = true; LatestItemsExcludes = new string[] { }; OrderedViews = new string[] { }; diff --git a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs index cc5148ba95..8f7e94cf02 100644 --- a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs +++ b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs @@ -26,6 +26,9 @@ namespace MediaBrowser.Model.LiveTv public string[] MediaLocationsCreated { get; set; } + public string RecordingPostProcessor { get; set; } + public string RecordingPostProcessorArguments { get; set; } + public LiveTvOptions() { EnableMovieProviders = true; @@ -34,6 +37,7 @@ namespace MediaBrowser.Model.LiveTv ListingProviders = new List<ListingsProviderInfo>(); MediaLocationsCreated = new string[] { }; RecordingEncodingFormat = "mp4"; + RecordingPostProcessorArguments = "\"{path}\""; } } |
