diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-10-16 13:12:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-16 13:12:31 -0400 |
| commit | fa0795b65b3208b28f8044081f0e9486d59dfb7b (patch) | |
| tree | 23a9cfd0479cbfe65793db40543bdc501b9a08a8 /MediaBrowser.Server.Implementations/LiveTv | |
| parent | f87f16b6a190f772cc31ed3c6e1a8bd413c329be (diff) | |
| parent | 55f47d21204bd166ab214256c7b8dd05c4d7ccd4 (diff) | |
Merge pull request #2238 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Server.Implementations/LiveTv')
| -rw-r--r-- | MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs index 2e58c6b30..9b69b84d3 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs @@ -764,7 +764,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV defaults.RecordNewOnly = !program.IsRepeat; } - defaults.SkipEpisodesInLibrary = true; + defaults.SkipEpisodesInLibrary = defaults.RecordNewOnly; defaults.KeepUntil = KeepUntil.UntilDeleted; return Task.FromResult(defaults); diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs index b03feefe4..cedaf7ad8 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs @@ -114,6 +114,10 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts { protocol = MediaProtocol.Rtsp; } + else if (path.StartsWith("udp", StringComparison.OrdinalIgnoreCase)) + { + protocol = MediaProtocol.Udp; + } var mediaSource = new MediaSourceInfo { |