diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-10-19 02:32:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-19 02:32:34 -0400 |
| commit | b9c64d7e8d80feeaabf3e61dc3fbb43f576db8ff (patch) | |
| tree | afb41dd72c62c979a0e575a29c4afc720e8fc0b1 /MediaBrowser.Model | |
| parent | 5e8181e34a8359bb153cd90935bd64670b8f5409 (diff) | |
| parent | b7c6ffe0131db74ba50fb397d43279af8f616bce (diff) | |
Merge pull request #2244 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/LiveTv/LiveTvOptions.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Model/LiveTv/ProgramQuery.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Model/Net/MimeTypes.cs | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs index ee7dd8b98..e19bddeee 100644 --- a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs +++ b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs @@ -16,6 +16,7 @@ namespace MediaBrowser.Model.LiveTv public string RecordingEncodingFormat { get; set; } public bool EnableRecordingSubfolders { get; set; } public bool EnableOriginalAudioWithEncodedRecordings { get; set; } + public bool EnableOriginalVideoWithEncodedRecordings { get; set; } public List<TunerHostInfo> TunerHosts { get; set; } public List<ListingsProviderInfo> ListingProviders { get; set; } diff --git a/MediaBrowser.Model/LiveTv/ProgramQuery.cs b/MediaBrowser.Model/LiveTv/ProgramQuery.cs index ad57d1473..1fd995760 100644 --- a/MediaBrowser.Model/LiveTv/ProgramQuery.cs +++ b/MediaBrowser.Model/LiveTv/ProgramQuery.cs @@ -42,6 +42,7 @@ namespace MediaBrowser.Model.LiveTv /// <value>The user identifier.</value> public string UserId { get; set; } public string SeriesTimerId { get; set; } + public string Name { get; set; } /// <summary> /// The earliest date for which a program starts to return diff --git a/MediaBrowser.Model/Net/MimeTypes.cs b/MediaBrowser.Model/Net/MimeTypes.cs index 8bf0703be..2c059c860 100644 --- a/MediaBrowser.Model/Net/MimeTypes.cs +++ b/MediaBrowser.Model/Net/MimeTypes.cs @@ -100,6 +100,7 @@ namespace MediaBrowser.Model.Net .ToDictionary(x => x.Key, x => x.First().Key, StringComparer.OrdinalIgnoreCase); dict["image/jpg"] = ".jpg"; + dict["image/x-png"] = ".png"; return dict; } |