diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-08-17 01:48:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-17 01:48:55 -0400 |
| commit | bd47c8bd17cfabfd643591c1c310c75d0957b17d (patch) | |
| tree | 212e507bb5ca11c2a47dd1d21d09f2a6e63e45bc /MediaBrowser.Server.Implementations | |
| parent | c8299b4cee166f4c4bb40ddba8679c36fac747dc (diff) | |
| parent | a69f8ecb3dd9267d9b94d8b6ab60e7193c21cf7c (diff) | |
Merge pull request #2066 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Server.Implementations')
| -rw-r--r-- | MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs | 3 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs b/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs index dea0a978b..ea9e58ee4 100644 --- a/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs +++ b/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs @@ -52,7 +52,8 @@ namespace MediaBrowser.Server.Implementations.IO ".db", // bts sync files - ".bts" + ".bts", + ".sync" }; /// <summary> diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs index 5b83e7cbe..5c508aacd 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs @@ -136,7 +136,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts RequiresOpening = false, RequiresClosing = false, - ReadAtNativeFramerate = true + ReadAtNativeFramerate = false }; return new List<MediaSourceInfo> { mediaSource }; |