diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-08-05 15:05:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-05 15:05:30 -0400 |
| commit | d8c2dd253277ba2ce7a5a7496b278db0e4e85106 (patch) | |
| tree | 176e34705fb03d79d9302cf7f8f8aa3f88958cca /MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | |
| parent | e169eaee6cb2f91e4102f4fe7ac9075659feba95 (diff) | |
| parent | 804f19fc424e72ede16e66bc7809eab3450e528e (diff) | |
Merge pull request #2795 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs')
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index afbb99d39..190ccdd9c 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -4,6 +4,7 @@ using System.Globalization; using System.IO; using System.Linq; using System.Threading; +using MediaBrowser.Controller.Entities; using MediaBrowser.Model.Configuration; using MediaBrowser.Model.Dlna; using MediaBrowser.Model.Dto; @@ -1671,14 +1672,33 @@ namespace MediaBrowser.Controller.MediaEncoding state.RunTimeTicks = mediaSource.RunTimeTicks; state.RemoteHttpHeaders = mediaSource.RequiredHttpHeaders; + state.IsoType = mediaSource.IsoType; + if (mediaSource.VideoType.HasValue) { state.VideoType = mediaSource.VideoType.Value; - } - - state.IsoType = mediaSource.IsoType; - state.PlayableStreamFileNames = mediaSource.PlayableStreamFileNames.ToList(); + if (mediaSource.VideoType.Value == VideoType.BluRay || mediaSource.VideoType.Value == VideoType.Dvd) + { + state.PlayableStreamFileNames = Video.QueryPlayableStreamFiles(state.MediaPath, mediaSource.VideoType.Value); + } + else if (mediaSource.VideoType.Value == VideoType.Iso && state.IsoType == IsoType.BluRay) + { + state.PlayableStreamFileNames = Video.QueryPlayableStreamFiles(state.MediaPath, VideoType.BluRay); + } + else if (mediaSource.VideoType.Value == VideoType.Iso && state.IsoType == IsoType.Dvd) + { + state.PlayableStreamFileNames = Video.QueryPlayableStreamFiles(state.MediaPath, VideoType.Dvd); + } + else + { + state.PlayableStreamFileNames = new List<string>(); + } + } + else + { + state.PlayableStreamFileNames = new List<string>(); + } if (mediaSource.Timestamp.HasValue) { |